Merge remote-tracking branch 'origin/bugfix_173764' into bugfix_173764

Author: noChamp

package/cloudshell/cp/vcenter/common/vcenter/model_auto_discovery.py

@@ -16,6 +16,7 @@
 
 from cloudshell.cp.vcenter.common.utilites.common_utils import back_slash_to_front_converter
 
+
 DOMAIN = 'Global'
 ADDRESS = 'address'
 USER = 'User'
@@ -36,8 +37,16 @@
                                                      VM_RESOURCE_POOL, VM_CLUSTER]
 
 
+class ResourcePoolParams(object):
+    def __init__(self):
+        self.cluster_name = ''
+        self.resource_pool = ''
+        self.si = None
+
+
 class VCenterAutoModelDiscovery(object):
     def __init__(self):
+        self.dc = None
         self.parser = ResourceModelParser()
         self.pv_service = pyVmomiService(SmartConnect, Disconnect, SynchronousTaskWaiter())
         self.context_based_logger_factory = ContextBasedLoggerFactory()
@@ -76,6 +85,7 @@ def validate_and_discover(self, context):
         try:
             all_dc = self.pv_service.get_all_items_in_vcenter(si, vim.Datacenter)
             dc = self._validate_datacenter(si, all_dc, auto_attr, resource.attributes)
+            self.dc = dc
 
             all_items_in_dc = self.pv_service.get_all_items_in_vcenter(si, None, dc)
             dc_name = dc.name
@@ -136,9 +146,7 @@ def _validate_default_dvswitch(self, si, all_items_in_vc, auto_att, dc_name, att
 
     def _validate_attribute(self, si, attributes, vim_type, name, prefix=''):
         if name in attributes and attributes[name]:
-            att_value = attributes[name]
-            if prefix:
-                att_value = '{0}/{1}'.format(prefix, att_value)
+            att_value = self._get_attribute_value(attributes, name, prefix)
 
             obj = self.pv_service.get_folder(si, att_value)
             if not obj or isinstance(obj, str):
@@ -148,6 +156,12 @@ def _validate_attribute(self, si, attributes, vim_type, name, prefix=''):
             return obj
         return False
 
+    def _get_attribute_value(self, attributes, name, prefix):
+        att_value = attributes[name]
+        if prefix:
+            att_value = '{0}/{1}'.format(prefix, att_value)
+        return att_value
+
     def _get_default(self, all_item_in_vc, vim_type, key):
         obj = self._get_default_from_vc_by_type_and_name(all_item_in_vc, vim_type)
         if isinstance(obj, str):
@@ -218,8 +232,19 @@ def _validate_vm_location(self, si, all_items_in_vc, auto_att, dc_name, attribut
         auto_att.append(AutoLoadAttribute('', key, f_name))
 
     def _validate_vm_cluster(self, si, all_items_in_vc, auto_att, dc_name, attributes, key):
-        accepted_types = (vim.ClusterComputeResource, vim.HostSystem)
-        cluster = self._validate_attribute(si, attributes, accepted_types, key, dc_name)
+        """
+
+        :param si:
+        :param all_items_in_vc:
+        :param auto_att:
+        :param dc_name:
+        :param attributes:
+        :param key:
+        :return:
+        """
+        accepted_types = [[vim.ClusterComputeResource], [vim.HostSystem]]
+        cluster_name = attributes[key]
+        cluster = self.pv_service.get_obj(si.content, accepted_types, cluster_name)
         if not cluster:
             cluster = self._get_default(all_items_in_vc, accepted_types, key)
             c_name = self.get_full_name(dc_name, cluster)
@@ -231,12 +256,19 @@ def _validate_vm_cluster(self, si, all_items_in_vc, auto_att, dc_name, attribute
         return cluster
 
     def _validate_vm_resource_pool(self, si, all_items_in_vc, auto_att, dc_name, attributes, key):
-        cluster = self._validate_vm_cluster(si, all_items_in_vc, auto_att, dc_name, attributes, VM_CLUSTER)
-
         if key not in attributes or not attributes[key]:
             return
+
+        cluster = self._validate_vm_cluster(si, all_items_in_vc, auto_att, dc_name, attributes, VM_CLUSTER)
+
         pool_name = attributes[key]
-        pool = self._find_resource_pool_by_path(pool_name, cluster)
+
+        rp_params = ResourcePoolParams()
+        rp_params.cluster_name = cluster.name
+        rp_params.resource_pool = pool_name
+        rp_params.si = si
+
+        pool = self.pv_service.get_resource_pool(self.dc, rp_params)
         if pool:
             auto_att.append(AutoLoadAttribute('', key, pool_name))
             return

package/cloudshell/cp/vcenter/common/vcenter/vmomi_service.py

@@ -227,7 +227,7 @@ def find_obj_by_path(self, si, path, name, type_name):
         '#searches for the specific vm in the folder'
         return search_index.FindChild(look_in, name)
 
-    def find_dvs_by_path(self,si ,path):
+    def find_dvs_by_path(self, si, path):
         """
         Finds vm in the vCenter or returns "None"
         :param si:         pyvmomi 'ServiceInstance'
@@ -312,35 +312,36 @@ def get_network_by_full_name(self, si, default_network_full_name):
         path, name = get_path_and_name(default_network_full_name)
         return self.find_network_by_name(si, path, name) if name else None
 
-    def get_obj(self, content, vimtype, name):
+    def get_obj(self, content, vimtypes, name):
         """
         Return an object by name for a specific type, if name is None the
         first found object is returned
 
         :param content:    pyvmomi content object
-        :param vimtype:    the type of object too search
+        :param vimtypes:    the types of object to search
         :param name:       the object name to return
         """
         obj = None
 
-        container = self._get_all_objects_by_type(content, vimtype)
+        for vim_type in vimtypes:
+            container = self._get_all_objects_by_type(content, vim_type)
 
-        # If no name was given will return the first object from list of a objects matching the given vimtype type
-        for c in container.view:
-            if name:
-                if  c.name == name:
+            # If no name was given will return the first object from list of a objects matching the given vimtype type
+            for c in container.view:
+                if name:
+                    if c.name == name:
+                        obj = c
+                        break
+                else:
                     obj = c
                     break
-            else:
-                obj = c
-                break
 
         return obj
 
     @staticmethod
     def _get_all_objects_by_type(content, vimtype):
         container = content.viewManager.CreateContainerView(
-                content.rootFolder, vimtype, True)
+            content.rootFolder, vimtype, True)
         return container
 
     @staticmethod
@@ -418,6 +419,7 @@ def clone_vm(self, clone_params, logger, cancellation_context):
         :param clone_params: CloneVmParameters =
         :param logger:
         """
+
         result = self.CloneVmResult()
 
         if not isinstance(clone_params.si, self.vim.ServiceInstance):
@@ -446,7 +448,7 @@ def clone_vm(self, clone_params, logger, cancellation_context):
 
         snapshot = self._get_snapshot(clone_params, template)
 
-        resource_pool, host = self._get_resource_pool(datacenter.name, clone_params)
+        resource_pool, host = self.get_resource_pool(datacenter.name, clone_params)
 
         if not resource_pool and not host:
             raise ValueError('The specifed host, cluster or resource pool could not be found')
@@ -522,11 +524,11 @@ def _get_datastore(self, clone_params):
         name = parts[len(parts) - 1]
         if name:
             datastore = self.get_obj(clone_params.si.content,
-                                     [self.vim.Datastore],
+                                     [[self.vim.Datastore]],
                                      name)
         if not datastore:
             datastore = self.get_obj(clone_params.si.content,
-                                     [self.vim.StoragePod],
+                                     [[self.vim.StoragePod]],
                                      name)
             if datastore:
                 datastore = sorted(datastore.childEntity,
@@ -537,12 +539,14 @@ def _get_datastore(self, clone_params):
             raise ValueError('Could not find Datastore: "{0}"'.format(clone_params.datastore_name))
         return datastore
 
-    def _get_resource_pool(self, datacenter_name, clone_params):
+    def get_resource_pool(self, datacenter_name, clone_params):
 
-        resource_full_path = '{0}/{1}/{2}'.format(datacenter_name,
-                                                  clone_params.cluster_name,
-                                                  clone_params.resource_pool)
-        obj = self.get_folder(clone_params.si, resource_full_path)
+        obj_name = '{0}/{1}/{2}'.format(datacenter_name,
+                                        clone_params.cluster_name,
+                                        clone_params.resource_pool).rstrip('/').split('/')[-1]
+        # obj = self.get_folder(clone_params.si, resource_full_path)
+        accepted_types = [[vim.ResourcePool], [vim.ClusterComputeResource], [vim.HostSystem]]
+        obj = self.get_obj(clone_params.si.content, accepted_types, obj_name)
 
         resource_pool = None
         host = None
@@ -738,7 +742,8 @@ def get_vm_full_path(self, si, vm):
             folder_name = folder.name
             folder_parent = folder.parent
 
-            while folder_parent and folder_parent.name and folder_parent != si.content.rootFolder and not isinstance(folder_parent, vim.Datacenter):
+            while folder_parent and folder_parent.name and folder_parent != si.content.rootFolder and not isinstance(
+                    folder_parent, vim.Datacenter):
                 folder_name = folder_parent.name + '/' + folder_name
                 try:
                     folder_parent = folder_parent.parent
@@ -754,4 +759,4 @@ def get_vm_full_path(self, si, vm):
 def vm_has_no_vnics(vm):
     # Is there any network device on vm
     return next((False for device in vm.config.hardware.device
-                if isinstance(device, vim.vm.device.VirtualEthernetCard) and hasattr(device, 'macAddress')), True)
+                 if isinstance(device, vim.vm.device.VirtualEthernetCard) and hasattr(device, 'macAddress')), True)

package/cloudshell/tests/test_common/test_vcenter/test_vmomi_service.py

@@ -69,7 +69,7 @@ def test_clone_vm_power_on_false(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=datacenter)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
+        pv_service.get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',
@@ -111,7 +111,7 @@ def test_clone_vm_resource_pool_is_not_empty(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=datacenter)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
+        pv_service.get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',
@@ -153,7 +153,7 @@ def test_clone_vm_datastore_name_is_not_none(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=datacenter)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
+        pv_service.get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',
@@ -195,7 +195,7 @@ def test_clone_vm_destenation_folder_is_unsupported(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=folder)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=Mock(spec=vim.ResourcePool))
+        pv_service.get_resource_pool = Mock(return_value=Mock(spec=vim.ResourcePool))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',
@@ -233,7 +233,7 @@ def test_clone_vm_destenation_folder_is_folder_type(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=folder)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
+        pv_service.get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',
@@ -273,7 +273,7 @@ def test_clone_vm_datastore_name_is_none(self):
         pv_service.get_obj = Mock()
         pv_service.get_folder = Mock(return_value=datacenter)
         pv_service._get_datastore = Mock(return_value=Mock(spec=vim.Datastore))
-        pv_service._get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
+        pv_service.get_resource_pool = Mock(return_value=(Mock(spec=vim.ResourcePool), None))
 
         params = pv_service.CloneVmParameters(si=si,
                                               template_name='my_temp',

package/cloudshell/tests/utils/helpers.py

@@ -16,6 +16,6 @@ def get_uuid(virtual_machine_name):
 
 
 def get_vm_uuid(py_vmomi_service, si, virtual_machine_name):
-    vm = py_vmomi_service.get_obj(si.content, [vim.VirtualMachine], virtual_machine_name)
+    vm = py_vmomi_service.get_obj(si.content, [[vim.VirtualMachine]], virtual_machine_name)
     vm_uuid = vm.config.uuid
     return vm_uuid

vcentershell_driver/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.14.0">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.14.1">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />

version.txt

@@ -1 +1 @@
-1.14.0
+1.14.1