Merge pull request #976 from QualiSystems/bug/autodiscovery_should_identify_resource_pool_under_host_system

autodiscovery should now correctly identify resource pool when it is …

Author: nahumtimerman

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()
@@ -54,7 +63,6 @@ def validate_and_discover(self, context):
         """
         :type context: models.QualiDriverModels.AutoLoadCommandContext
         """
-
         logger = self._get_logger(context)
         logger.info('Autodiscovery started')
         si = None
@@ -77,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
@@ -247,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

@@ -448,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')
@@ -539,7 +539,7 @@ 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):
 
         obj_name = '{0}/{1}/{2}'.format(datacenter_name,
                                         clone_params.cluster_name,

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',