Merge pull request #184 from lpichler/return_empty_for_cloud_tenants

Return empty AR relation instead of nil for ::InfraManager#cloud_tenants
(cherry picked from commit 37acd49)

app/models/manageiq/providers/openstack/infra_manager.rb

@@ -31,6 +31,7 @@ def availability_zones
   end
 
   def cloud_tenants
+    self.class.none
   end
 
   def host_aggregates

spec/models/manageiq/providers/openstack/infra_manager_spec.rb

@@ -149,4 +149,10 @@
       expect(ems.supported_catalog_types).to eq(%w(openstack))
     end
   end
+
+  let(:openstack_infra_manager) { FactoryGirl.create(:ems_openstack_infra_with_authentication) }
+
+  it 'returns empty relation instead of nil when cloud_tenants are requested on infra provider' do
+    expect(openstack_infra_manager.cloud_tenants).to eq(ManageIQ::Providers::Openstack::InfraManager.none)
+  end
 end