diff --git a/config/miq_expression.yml b/config/miq_expression.yml index 0cff6e6cabc..f7579197f21 100644 --- 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 index 9f701dbfad0..b388cc9c03e 100644 --- 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 index ce7b11fca4e..566072b1e07 100644 --- 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 index 85aa9143a4b..d5ab3090af7 100644 --- 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