Upgraded environment and machine plugins to Abiquo 2.4

Author: Ignasi Barrera

kahuna/plugins/environment/cloud/compute.py

@@ -8,7 +8,8 @@
 from org.jclouds.abiquo.domain.cloud import VirtualMachine
 from org.jclouds.abiquo.domain.network import PrivateNetwork
 from org.jclouds.abiquo.predicates.enterprise import EnterprisePredicates
-from org.jclouds.abiquo.predicates.cloud import VirtualMachineTemplatePredicates
+from org.jclouds.abiquo.predicates.cloud \
+        import VirtualMachineTemplatePredicates
 
 log = logging.getLogger('kahuna')
 

kahuna/plugins/environment/infrastructure/compute.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env jython
 
 import logging
-from kahuna.plugins.environment.infrastructure.network import cleanup_infrastructure_network
-from kahuna.plugins.environment.infrastructure.storage import cleanup_infrastructure_storage
+from kahuna.plugins.environment.infrastructure.network \
+        import cleanup_infrastructure_network
+from kahuna.plugins.environment.infrastructure.storage \
+        import cleanup_infrastructure_storage
 from com.abiquo.model.enumerator import HypervisorType
 from org.jclouds.abiquo.config import AbiquoEdition
 from org.jclouds.abiquo.domain.infrastructure import Datacenter
@@ -56,10 +58,11 @@ def create_machine(self, rack, hyp, address, user, password,
 
         # Verify that the desired datastore and virtual switch exist
         datastore = machine.findDatastore(datastore)
+        nst = datacenter.defaultNetworkServiceType()
         vswitch = machine.findAvailableVirtualSwitch(vswitch)
 
         datastore.setEnabled(True)
-        machine.setVirtualSwitch(vswitch)
+        vswitch.setNetworkServiceType(nst)
         machine.setRack(rack)
 
         machine.save()

kahuna/plugins/environment/infrastructure/storage.py

@@ -3,7 +3,8 @@
 import logging
 from ConfigParser import NoOptionError
 from org.jclouds.abiquo.domain.infrastructure import StorageDevice
-from org.jclouds.abiquo.predicates.infrastructure import StorageDeviceMetadataPredicates
+from org.jclouds.abiquo.predicates.infrastructure \
+        import StorageDeviceMetadataPredicates
 from org.jclouds.abiquo.predicates.infrastructure import StoragePoolPredicates
 
 log = logging.getLogger('kahuna')

kahuna/plugins/machine.py

@@ -186,10 +186,11 @@ def create(self, args):
             if not vs:
                 print "Missing virtual switch %s in machine" % vswitch
                 return
+            nst = dc.defaultNetworkServiceType()
+            vs.setNetworkServiceType(nst)
 
             # saving machine
             machine.setRack(rack)
-            machine.setVirtualSwitch(vs)
             machine.save()
             log.debug("Machine saved")
             pprint_machines([machine])

kahuna/plugins/storage/helper.py

@@ -32,4 +32,5 @@ def get_attached_vm(context, volume):
     if link:
         name = link.getTitle()
         cloud = context.getCloudService()
-        return cloud.findVirtualMachine(VirtualMachinePredicates.internalName(name))
+        return cloud.findVirtualMachine(
+                VirtualMachinePredicates.internalName(name))

kahuna/plugins/template.py

@@ -3,7 +3,8 @@
 from optparse import OptionParser
 from kahuna.abstract import AbsPlugin
 from kahuna.utils.prettyprint import pprint_templates
-from org.jclouds.abiquo.predicates.cloud import VirtualMachineTemplatePredicates
+from org.jclouds.abiquo.predicates.cloud \
+        import VirtualMachineTemplatePredicates
 from org.jclouds.abiquo.domain.exception import AbiquoException
 from org.jclouds.rest import AuthorizationException
 

kahuna/plugins/virtualmachine/helper.py

@@ -5,7 +5,8 @@
 from org.jclouds.abiquo.domain.cloud import VirtualDatacenter
 from org.jclouds.abiquo.domain.network import PrivateNetwork
 from org.jclouds.abiquo.predicates.cloud import VirtualDatacenterPredicates
-from org.jclouds.abiquo.predicates.cloud import VirtualMachineTemplatePredicates
+from org.jclouds.abiquo.predicates.cloud \
+        import VirtualMachineTemplatePredicates
 from org.jclouds.abiquo.domain.exception import AbiquoException
 
 log = logging.getLogger('kahuna')

kahuna/plugins/vm.py

@@ -84,7 +84,8 @@ def deploy(self, args):
         # Once user input has been read, find the VM
         try:
             cloud = self._context.getCloudService()
-            vm = cloud.findVirtualMachine(VirtualMachinePredicates.internalName(name))
+            vm = cloud.findVirtualMachine(
+                    VirtualMachinePredicates.internalName(name))
             if vm:
                 vm = helper.deploy_vm(self._context, vm)
                 pprint_vms([vm])
@@ -108,7 +109,8 @@ def undeploy(self, args):
         # Once user input has been read, find the virtual machine
         try:
             cloud = self._context.getCloudService()
-            vm = cloud.findVirtualMachine(VirtualMachinePredicates.internalName(name))
+            vm = cloud.findVirtualMachine(
+                    VirtualMachinePredicates.internalName(name))
             if vm:
                 vm = helper.undeploy_vm(self._context, vm)
                 pprint_vms([vm])
@@ -195,7 +197,8 @@ def delete(self, args):
 
         try:
             cloud = self._context.getCloudService()
-            vm = cloud.findVirtualMachine(VirtualMachinePredicates.internalName(name))
+            vm = cloud.findVirtualMachine(
+                    VirtualMachinePredicates.internalName(name))
             if vm:
                 state = vm.getState()
                 if not options.undeploy and state.existsInHypervisor():
@@ -236,7 +239,8 @@ def __change_state(self, state_name, new_state, args):
 
         try:
             cloud = self._context.getCloudService()
-            vm = cloud.findVirtualMachine(VirtualMachinePredicates.internalName(name))
+            vm = cloud.findVirtualMachine(
+                    VirtualMachinePredicates.internalName(name))
             if vm:
                 helper.change_state_vm(self._context, vm, new_state)
                 pprint_vms([vm])

pom.xml

@@ -7,7 +7,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jclouds.version>1.5.2</jclouds.version>
+        <jclouds.version>1.6.0-SNAPSHOT</jclouds.version>
     </properties>
 
     <repositories>