Merge pull request #113 from QualiSystems/feature/alex_59_app_orchestration

fixed bug in appTemplates xml

Author: alexazarh

vCenterShell/bootstrap.py

@@ -70,8 +70,8 @@ def __init__(self):
         # Virtual Switch Revoke
         virtual_switch_disconnect_command = \
             VirtualSwitchToMachineDisconnectCommand(py_vmomi_service,
-                                                    cloudshell_data_retriever_service,
-                                                    synchronous_task_waiter,
+                                                    resource_connection_details_retriever,
+                                                    virtual_machine_port_group_configurer,
                                                     vc_data_model.default_network)
 
         destroy_virtual_machine_command = DestroyVirtualMachineCommand(py_vmomi_service,

vCenterShell/command_executer.py

@@ -81,7 +81,7 @@ def disconnect(self):
     def destroy(self):
         # get command parameters from the environment
         uuid = self.qualipy_helpers.get_user_param('VM_UUID')
-        resource = self.qualipy_helpers.get_resource_context_details()
+        resource_fullname = self.qualipy_helpers.get_user_param('RESOURCE_FULLNAME')
 
         # prepare for execute command
         connection_details = self.connection_retriever.connection_details()
@@ -91,7 +91,7 @@ def destroy(self):
                 connection_details,
                 self.destroyVirtualMachineCommand.destroy,
                 uuid,
-                resource.fullname)
+                resource_fullname)
 
     def deploy_from_template(self):
         # get command parameters from the environment

vCenterShell/commands/destroy_vm.py

@@ -16,16 +16,17 @@ def __init__(self, pv_service, resource_remover, disconnector):
         self.resource_remover = resource_remover
         self.disconnector = disconnector
 
-    def destroy(self, si, uuid, resource_full_name):
+    def destroy(self, si, vm_uuid, resource_full_name):
         # find vm
-        vm = self.pv_service.find_by_uuid(si, uuid)
+        vm = self.pv_service.find_by_uuid(si, vm_uuid)
 
         # todo: change it with the function form SergaiiT Branch
-        #disconnect all vnics
-        self.disconnector.disconnect_all(vm)
+        # todo: alexa: check if I can refactor the disconnector so it will not request the vCenter resource name
+        # disconnect all vnics before destroy
+        self.disconnector.disconnect_all("", vm_uuid, vm)
 
         # destroy vm
-        result = self.pv_service.destory_mv(si, vm)
+        result = self.pv_service.destroy_vm(vm)
 
         # delete resources
         self.resource_remover.remove_resource(resource_full_name)

vCenterShell/commands/disconnect_dvswitch.py

@@ -31,17 +31,16 @@ def __init__(self,
         self.port_group_configurer = port_group_configurer
         self.default_network = default_network
 
-    def get_service_instance(self, vcenter_name):
+    def _get_service_instance(self, vcenter_name):
         """
         Get vCenter connection
-        :param vcenter_name:
         :return: VmWare SI (Service Instance)
         """
-        connection_details = self.connection_retriever.connection_details(vcenter_name)
+        connection_details = self.connection_retriever.connection_details()
         si = self.pyvmomi_service.connect(connection_details.host,
-                                  connection_details.username,
-                                  connection_details.password,
-                                  connection_details.port)
+                                          connection_details.username,
+                                          connection_details.password,
+                                          connection_details.port)
         return si
 
     def remove_vnic(self, vcenter_name, vm_uuid, network_name=None):
@@ -53,27 +52,30 @@ def remove_vnic(self, vcenter_name, vm_uuid, network_name=None):
         :return:
         """
         _logger.debug(u"Revoking ALL Interfaces from VM '{}'...".format(vm_uuid))
-        si = self.get_service_instance(vcenter_name)
+        si = self._get_service_instance(vcenter_name)
         vm = self.pyvmomi_service.find_by_uuid(si, vm_uuid)
 
-        condition = lambda device: VNicService.device_is_attached_to_network(device, network_name) if network_name else lambda \
-            x: True
+        condition = lambda device: VNicService.device_is_attached_to_network(device,
+                                                                             network_name) if network_name else lambda \
+                x: True
         return self.remove_interfaces_from_vm_task(vm, condition)
 
-    def disconnect_all(self, vcenter_name, vm_uuid):
+    def disconnect_all(self, vcenter_name, vm_uuid, vm=None):
         return self.disconnect(vcenter_name, vm_uuid, None)
 
-    def disconnect(self, vcenter_name, vm_uuid, network_name=None):
+    def disconnect(self, vcenter_name, vm_uuid, network_name=None, vm=None):
         """
         disconnect network adapter of the vm. If 'network_name' = None - disconnect ALL interfaces
         :param <str> vcenter_name: the name of the vCenter to connect to
         :param <str> vm_uuid: the uuid of the vm
         :param <str | None> network_name: the name of the specific network to disconnect
+        :param <pyvmomi vm object> vm: If the vm obj is None will use vm_uuid to fetch the object
         :return: Started Task
         """
         _logger.debug(u"Disconnect Interface VM: '{}' Network: '{}' ...".format(vm_uuid, network_name or "ALL"))
-        si = self.get_service_instance(vcenter_name)
-        vm = self.pyvmomi_service.find_by_uuid(si, vm_uuid)
+        si = self._get_service_instance(vcenter_name)
+        if vm is None:
+            vm = self.pyvmomi_service.find_by_uuid(si, vm_uuid)
 
         if network_name:
             network = self.pyvmomi_service.vm_get_network_by_name(vm, network_name)

vCenterShellPackage/App Templates/VM Deployment.xml

@@ -4,8 +4,8 @@
     <AppResources>
       <AppResource ModelName="Generic Deployed App" Driver="">
         <Attributes>
-          <Attribute Name="UUID" Value="" />
-          <Attribute Name="vCenter Inventory Path" Value="" />
+          <Attribute Name="VM_UUID" Value="" />
+          <Attribute Name="Cloud Provider" Value="" />
         </Attributes>
       </AppResource>
     </AppResources>