Merge pull request #1134 from MirantisWorkloadMobility/devel

Release 2016-08-17
MirantisWorkloadMobility · Aug 17, 2016 · d334423 · d334423
2 parents ad417e3 + 860dde3
commit d334423
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/cloudferry/actions/filter/get_filter.py b/cloudferry/actions/filter/get_filter.py
@@ -35,6 +35,12 @@ def run(self, **kwargs):
             if utils.TENANTS_TYPE in filter_config:
                 search_opts_tenant = filter_config[utils.TENANTS_TYPE]
 
+        filtered_tenant = search_opts_tenant.get('tenant_id', ['INVALID'])[0]
+
+        for r in self.src_cloud.resources.values():
+            if hasattr(r, 'filter_tenant_id') and filtered_tenant != 'INVALID':
+                r.filter_tenant_id = filtered_tenant
+
         return {
             'search_opts': search_opts,
             'search_opts_img': search_opts_img,

diff --git a/cloudferry/lib/os/compute/nova_compute.py b/cloudferry/lib/os/compute/nova_compute.py
@@ -156,20 +156,20 @@ def _read_info_quotas(self):
 
         for tenant_id in tenant_ids:
             project_quota = self.get_quotas(tenant_id=tenant_id)
-            project_quota_info = self.convert_resources(project_quota,
-                                                        None)
+            project_quota_info = self.convert_resources(project_quota, None)
             project_quota_info['tenant_id'] = tenant_id
             project_quotas.append(project_quota_info)
             if self.config.migrate.migrate_user_quotas:
                 for user_id in user_ids:
-                    if self.identity.roles_for_user(user_id, tenant_id):
-                        user_quota = self.get_quotas(tenant_id=tenant_id,
-                                                     user_id=user_id)
-                        user_quota_info = self.convert_resources(
-                            user_quota, None)
-                        user_quota_info['tenant_id'] = tenant_id
-                        user_quota_info['user_id'] = user_id
-                        user_quotas.append(user_quota_info)
+                    LOG.debug("Get quotas for tenant '%s' and user '%s'",
+                              tenant_id, user_id)
+                    user_quota = self.get_quotas(tenant_id=tenant_id,
+                                                 user_id=user_id)
+                    user_quota_info = self.convert_resources(
+                        user_quota, None)
+                    user_quota_info['tenant_id'] = tenant_id
+                    user_quota_info['user_id'] = user_id
+                    user_quotas.append(user_quota_info)
 
         return project_quotas, user_quotas
 
@@ -431,9 +431,7 @@ def _deploy_resources(self, info, **kwargs):
             self._deploy_quotas(info['project_quotas'], tenant_map)
             self._deploy_quotas(info['user_quotas'], tenant_map, user_map)
 
-        new_info = self.read_info(target='resources')
-
-        return new_info
+        return info
 
     def deploy(self, info, target='instances', **kwargs):
         """

diff --git a/cloudferry_devlab/requirements.txt b/cloudferry_devlab/requirements.txt
@@ -14,4 +14,4 @@ nose==1.3.7
 nose-testconfig==0.9.1
 sqlalchemy==1.0.12
 PyMySQL==0.6.7
--e git+https://github.com/kevinastone/generator.git@nose-attribs#egg=test-generator
+test-generator==0.1.2