Merge pull request #16647 from mzazrivec/there_is_no_cloud_instance

Rename "Cloud Instance" back to "Instance"
ManageIQ · Dec 14, 2017 · d5064ab · d5064ab
2 parents c35091f + 450a9be
commit d5064ab
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/config/miq_expression.yml b/config/miq_expression.yml
@@ -68,7 +68,6 @@
 - User
 - VimPerformanceTrend
 - Vm
-- VmCloud
 - ManageIQ::Providers::CloudManager::Vm
 - ManageIQ::Providers::InfraManager::Vm
 - VmPerformance

diff --git a/locale/en.yml b/locale/en.yml
@@ -926,7 +926,7 @@ en:
       User:                     EVM User
       VimPerformanceTrend:      Performance Trend
       Vm:                       VM and Instance
-      VmCloud:                  Cloud Instance
+      VmCloud:                  Instance
       VmdbIndex:                Index
       VmdbTable:                VMDB Table
       VmOrTemplate:             VM or Template

diff --git a/product/reports/180_Configuration Management - Instances/010 Amazon - Active VMs.yaml b/product/reports/180_Configuration Management - Instances/010 Amazon - Active VMs.yaml
@@ -3,7 +3,7 @@ title: Amazon - Active VMs
 rpt_group: Custom
 rpt_type: Custom
 priority: 20
-db: VmCloud
+db: ManageIQ::Providers::CloudManager::Vm
 cols:
 - name
 - power_state

diff --git a/spec/models/generic_object_definition_spec.rb b/spec/models/generic_object_definition_spec.rb
@@ -204,8 +204,8 @@
     end
 
     it 'updates the association with different class' do
-      definition.add_property_association(:vms, 'vm_cloud')
-      expect(definition.properties[:associations]).to include('vms' => 'VmCloud')
+      definition.add_property_association(:vms, 'zone')
+      expect(definition.properties[:associations]).to include('vms' => 'Zone')
     end
 
     it 'accepts GenericObject as the association' do