Merge pull request #233 from aufi/bz_1546109_fix_targeted_refresh_cle…

…aring_vm_cloud_tenant_for_v2 Bz 1546109 fix targeted refresh clearing vm cloud tenant for v2
ManageIQ · Feb 19, 2018 · 7bb8ea9 · 7bb8ea9
2 parents efa5865 + 918bbff
commit 7bb8ea9
Show file tree

Hide file tree

Showing 23 changed files with 24,706 additions and 24,721 deletions.
diff --git a/app/models/manageiq/providers/openstack/inventory/collector/target_collection.rb b/app/models/manageiq/providers/openstack/inventory/collector/target_collection.rb
@@ -123,9 +123,7 @@ def tenants
 
   def memoized_get_tenant(tenant_id)
     return nil if tenant_id.blank?
-    @tenant_memo ||= Hash.new do |h, key|
-      h[key] = safe_get { identity_service.respond_to?(:projects) ? identity_service.projects_get_by_id(key) : identity_service.tenants.find_by_id(key) }
-    end
+    @tenant_memo ||= identity_service.visible_tenants.index_by(&:id)
     @tenant_memo[tenant_id]
   end
 

diff --git a/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse.yml b/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse.yml
diff --git a/...ettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse_fast_refresh.yml b/...ettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse_fast_refresh.yml
diff --git a/...anageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse_legacy_fast_refresh.yml b/...anageiq/providers/openstack/cloud_manager/refresher_rhos_icehouse_legacy_fast_refresh.yml
diff --git a/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno.yml b/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno.yml
diff --git a/...cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno_fast_refresh.yml b/...cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno_fast_refresh.yml
diff --git a/...es/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno_legacy_fast_refresh.yml b/...es/manageiq/providers/openstack/cloud_manager/refresher_rhos_juno_legacy_fast_refresh.yml
diff --git a/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo.yml b/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo.yml
diff --git a/...cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_fast_refresh.yml b/...cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_fast_refresh.yml
diff --git a/..._cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3.yml b/..._cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3.yml
diff --git a/...nageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3_fast_refresh.yml b/...nageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3_fast_refresh.yml
diff --git a/...providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3_legacy_fast_refresh.yml b/...providers/openstack/cloud_manager/refresher_rhos_kilo_keystone_v3_legacy_fast_refresh.yml
diff --git a/...es/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_legacy_fast_refresh.yml b/...es/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_legacy_fast_refresh.yml
diff --git a/..._cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_with_errors.yml b/..._cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_kilo_with_errors.yml
diff --git a/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty.yml b/spec/vcr_cassettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty.yml
diff --git a/...settes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_fast_refresh.yml b/...settes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_fast_refresh.yml
diff --git a/...ssettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3.yml b/...ssettes/manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3.yml
diff --git a/...eiq/providers/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3_fast_refresh.yml b/...eiq/providers/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3_fast_refresh.yml
diff --git a/...viders/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3_legacy_fast_refresh.yml b/...viders/openstack/cloud_manager/refresher_rhos_liberty_keystone_v3_legacy_fast_refresh.yml
diff --git a/...manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_legacy_fast_refresh.yml b/...manageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_legacy_fast_refresh.yml
diff --git a/...ageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_stack_targeted_refresh.yml b/...ageiq/providers/openstack/cloud_manager/refresher_rhos_liberty_stack_targeted_refresh.yml
diff --git a/...geiq/providers/openstack/cloud_manager/refresher_rhos_liberty_tenant_targeted_refresh.yml b/...geiq/providers/openstack/cloud_manager/refresher_rhos_liberty_tenant_targeted_refresh.yml