From 0a483726b5491d82b04e97877c5a33b022c6978f Mon Sep 17 00:00:00 2001 From: Lucy Fu Date: Fri, 8 Jun 2018 10:36:56 -0400 Subject: [PATCH] Add EmsFolder class to VMware provider. Add EmsFolder class to VMware provider for move_into_folder method. https://bugzilla.redhat.com/show_bug.cgi?id=1090957 --- .../providers/vmware/infra_manager.rb | 1 + .../vmware/infra_manager/ems_folder.rb | 13 + .../vmware/infra_manager/event_parser.rb | 2 +- .../vmware/infra_manager/inventory/parser.rb | 2 +- .../vmware/infra_manager/refresh_parser.rb | 2 +- .../vmware/infra_manager/ems_folder_spec.rb | 15 + .../vmware/infra_manager/refresher_spec.rb | 285 +++++++++--------- .../miq_vim_broker_worker/runner_spec.rb | 2 +- 8 files changed, 174 insertions(+), 148 deletions(-) create mode 100644 app/models/manageiq/providers/vmware/infra_manager/ems_folder.rb create mode 100644 spec/models/manageiq/providers/vmware/infra_manager/ems_folder_spec.rb diff --git a/app/models/manageiq/providers/vmware/infra_manager.rb b/app/models/manageiq/providers/vmware/infra_manager.rb index 1bf9c5b15..018e99887 100644 --- a/app/models/manageiq/providers/vmware/infra_manager.rb +++ b/app/models/manageiq/providers/vmware/infra_manager.rb @@ -1,6 +1,7 @@ module ManageIQ::Providers class Vmware::InfraManager < InfraManager require_nested :DistributedVirtualSwitch + require_nested :EmsFolder require_nested :EventCatcher require_nested :EventParser require_nested :RefreshWorker diff --git a/app/models/manageiq/providers/vmware/infra_manager/ems_folder.rb b/app/models/manageiq/providers/vmware/infra_manager/ems_folder.rb new file mode 100644 index 000000000..74d3919ec --- /dev/null +++ b/app/models/manageiq/providers/vmware/infra_manager/ems_folder.rb @@ -0,0 +1,13 @@ +class ManageIQ::Providers::Vmware::InfraManager::EmsFolder < EmsFolder + def move_into_folder(vm) + raise _("Vm cannot be nil") if vm.nil? + vm_mor = vm.ems_ref_obj + log_header = "EmsFolder: [#{name}] Vm: id [#{vm.id}], name [#{vm.name}], ems_ref [#{vm_mor}]" + + with_provider_object do |vim_folder| + _log.info("#{log_header} Invoking moveIntoFolder...") + vim_folder.send(:moveIntoFolder, vm_mor) + _log.info("#{log_header} Invoking moveIntoFolder...Complete") + end + end +end diff --git a/app/models/manageiq/providers/vmware/infra_manager/event_parser.rb b/app/models/manageiq/providers/vmware/infra_manager/event_parser.rb index e9271b61e..f9517019f 100644 --- a/app/models/manageiq/providers/vmware/infra_manager/event_parser.rb +++ b/app/models/manageiq/providers/vmware/infra_manager/event_parser.rb @@ -136,7 +136,7 @@ def self.parse_new_target(event) def self.folder_update_to_hash(event) mor = event[:mor] - klass = 'EmsFolder' + klass = 'ManageIQ::Providers::Vmware::InfraManager::EmsFolder' hash = { :folders => [ { diff --git a/app/models/manageiq/providers/vmware/infra_manager/inventory/parser.rb b/app/models/manageiq/providers/vmware/infra_manager/inventory/parser.rb index c4b327b15..ab83f69b9 100644 --- a/app/models/manageiq/providers/vmware/infra_manager/inventory/parser.rb +++ b/app/models/manageiq/providers/vmware/infra_manager/inventory/parser.rb @@ -114,7 +114,7 @@ def parse_folder(object, kind, props) :ems_ref => object._ref, :ems_ref_obj => managed_object_to_vim_string(object), :uid_ems => object._ref, - :type => "EmsFolder", + :type => "ManageIQ::Providers::Vmware::InfraManager::EmsFolder", :name => CGI.unescape(props[:name]), :parent => lazy_find_managed_object(props[:parent]), :hidden => hidden, diff --git a/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb b/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb index ab42d8ec9..c5514e4a9 100644 --- a/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb +++ b/app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb @@ -1239,7 +1239,7 @@ def self.folder_inv_to_hashes(inv, result, result_uids) child_mors = get_mors(data, 'childEntity') new_result = { - :type => EmsFolder.name, + :type => ManageIQ::Providers::Vmware::InfraManager::EmsFolder.name, :ems_ref => mor, :ems_ref_obj => mor, :uid_ems => mor, diff --git a/spec/models/manageiq/providers/vmware/infra_manager/ems_folder_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/ems_folder_spec.rb new file mode 100644 index 000000000..42fa409d7 --- /dev/null +++ b/spec/models/manageiq/providers/vmware/infra_manager/ems_folder_spec.rb @@ -0,0 +1,15 @@ +describe ManageIQ::Providers::Vmware::InfraManager::EmsFolder do + describe "#move_into_folder" do + let(:folder) { FactoryGirl.create(:vmware_folder_vm) } + let(:vm) { FactoryGirl.create(:vm_vmware, :ems_ref_obj => "vm-1120") } + let(:provider_object) do + double("vm_vmware_provider_object", :destroy => nil).as_null_object + end + + it "calls provider's method" do + expect(folder).to receive(:with_provider_object).and_yield(provider_object) + expect(provider_object).to receive(:send).with(:moveIntoFolder, vm.ems_ref_obj) + folder.move_into_folder(vm) + end + end +end diff --git a/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb index c3d346226..34d5db363 100644 --- a/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb +++ b/spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb @@ -763,8 +763,7 @@ def assert_specific_vm :ems_ref_obj => VimString.new("group-d1", :Folder, :ManagedObjectReference), :uid_ems => "group-d1", :name => "Datacenters", - :type => nil, - + :type => "ManageIQ::Providers::Vmware::InfraManager::EmsFolder", :folder_path => "Datacenters" ) @@ -773,8 +772,7 @@ def assert_specific_vm :ems_ref_obj => VimString.new("group-v11341", :Folder, :ManagedObjectReference), :uid_ems => "group-v11341", :name => "JFitzgerald", - :type => nil, - + :type => "ManageIQ::Providers::Vmware::InfraManager::EmsFolder", :folder_path => "Datacenters/Prod/vm/JFitzgerald" ) end @@ -810,9 +808,9 @@ def assert_specific_vm_missing_uuid def assert_relationship_tree expect(@ems.descendants_arranged).to match_relationship_tree( - [EmsFolder, "Datacenters", {:hidden => true}] => { - [Datacenter, "Dev"] => { - [EmsFolder, "host", {:hidden => true}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Datacenters", {:hidden => true}] => { + [Datacenter, "Dev"] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "host", {:hidden => true}] => { [ManageIQ::Providers::Vmware::InfraManager::HostEsx, "vi4esxm3.manageiq.com"] => { [ResourcePool, "Default for Host / Node vi4esxm3.manageiq.com", {:is_default => true}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "Dev Cucumber Nightly Appl 2011-05-19"] => {}, @@ -853,24 +851,24 @@ def assert_relationship_tree } } }, - [EmsFolder, "vm", {:hidden => true}] => { - [EmsFolder, "Discovered virtual machine", {:hidden => false}] => {}, - [EmsFolder, "GreggT", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "vm", {:hidden => true}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Discovered virtual machine", {:hidden => false}] => {}, + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "GreggT", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-GreggT"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "GT Nightly Appl 2011-02-19"] => {} }, - [EmsFolder, "GregM", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "GregM", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-GregM"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "GM Nightly Appl 2011-05-19"] => {} }, - [EmsFolder, "Harpreet", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Harpreet", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-HarpreetK"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "HK-Dev Cucumber Nightly Appl 2011-05-19"] => {} }, - [EmsFolder, "Jason", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Jason", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "Jason Nightly Appl 2011-02-19"] => {} }, - [EmsFolder, "JoeR", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "JoeR", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-JoeR"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "JR- Dev Cucumber Nightly Appl 2011-05-19 - backup"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "JR-cruisecontrol-sandback-testing-April14_backup"] => {}, @@ -895,137 +893,136 @@ def assert_relationship_tree [ManageIQ::Providers::Vmware::InfraManager::Vm, "JR-SQL2005-CLONE"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "JR-svn-nightly-25707-2010-12-26"] => {} }, - [ManageIQ::Providers::Vmware::InfraManager::Template, "RcuCloneTestTemplate"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Template, "XavTmpl"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Template, "xyz"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Template, "xyz1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Dev Cucumber Nightly Appl 2011-05-19"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-Oleg"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-RichO"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Hennessy ReiserFS ubuntu server"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "test3"] => {} + [ManageIQ::Providers::Vmware::InfraManager::Template, "RcuCloneTestTemplate"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Template, "XavTmpl"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Template, "xyz"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Template, "xyz1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Dev Cucumber Nightly Appl 2011-05-19"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-Oleg"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-RichO"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Hennessy ReiserFS ubuntu server"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "test3"] => {} } }, [Datacenter, "New / Datacenter"] => { - [EmsFolder, "host", {:hidden => true}] => {}, - [EmsFolder, "vm", {:hidden => true}] => { - [EmsFolder, "Test / Folder", {:hidden => false}] => {}, + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "host", {:hidden => true}] => {}, + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "vm", {:hidden => true}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Test / Folder", {:hidden => false}] => {}, } }, - [Datacenter, "Prod"] => { - [EmsFolder, "host", {:hidden => true}] => { - [EmsCluster, "Testing/Production Cluster"] => { - [ResourcePool, "Default for Cluster / Deployment Role Testing/Production Cluster", - {:is_default => true}] => { - [ResourcePool, "Citrix", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix 5"] => {} - }, - [ResourcePool, "Citrix VDI VM's", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah2"] => {} - }, - [ResourcePool, "Production Test environment", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "M-TestDC1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test-Prod"] => {} - }, - [ResourcePool, "Testing", {:is_default => false}] => { - [ResourcePool, "Brandon", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-4.0.1.15"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-Nightly 28939-svn"] => {} - }, - [ResourcePool, "Joe", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "JoeF 4.0.1"] => {} - }, - [ResourcePool, "Marianne", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_3_3_2_34"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_40115_svn_formigrate"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "MGF_Branch_332_svn"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_branch_40115_svn"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_branch_4015_svn"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_332_31"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_40116"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_40116_formigrate"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_nightly_trunk_svn"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_trunk_nightly_v4"] => {} - }, - [ResourcePool, "Rich", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "ESX-TESTVCINTEGRATION"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host2"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host3"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host4"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host5"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent2"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent3"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetappDsTest2"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest4"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest5"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest6"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest7"] => {} - }, - [ResourcePool, "Tina", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-TinaF"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "TF-Appliance 4.0.1.14"] => {} - }, - [ResourcePool, "TomH", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-nightly-26322"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64_19GB_restore_"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-V4_import_tes"] => {} - }, - [ResourcePool, "Xav", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4014"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4018"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav Master"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav RH 40114"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav RH 4012"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "xavsmall"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL Trunk svn2"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL V4 svn"] => {} - }, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "3.3.2.22"] => {} - }, - [ResourcePool, "Training", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Master DB"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 UI"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 Worker"] => {} - }, - [ResourcePool, "VMware View VM's", {:is_default => false}] => { - [ResourcePool, "Linked Clones", {:is_default => false}] => { - [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Windows 7 Parent x64"] => {} - }, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Broker"] => {} - }, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "KPupgrade"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "RM-4.0.1.12C"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav COS 40114"] => {} - } + [Datacenter, "Prod"] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "host", {:hidden => true}] => { + [EmsCluster, "Testing/Production Cluster"] => { + [ResourcePool, "Default for Cluster / Deployment Role Testing/Production Cluster", {:is_default => true}] => { + [ResourcePool, "Citrix", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix 5"] => {} + }, + [ResourcePool, "Citrix VDI VM's", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah2"] => {} + }, + [ResourcePool, "Production Test environment", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "M-TestDC1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test-Prod"] => {} + }, + [ResourcePool, "Testing", {:is_default => false}] => { + [ResourcePool, "Brandon", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-4.0.1.15"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-Nightly 28939-svn"] => {} + }, + [ResourcePool, "Joe", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "JoeF 4.0.1"] => {} + }, + [ResourcePool, "Marianne", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_3_3_2_34"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_40115_svn_formigrate"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "MGF_Branch_332_svn"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_branch_40115_svn"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_branch_4015_svn"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_332_31"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_40116"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_build_40116_formigrate"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_nightly_trunk_svn"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_trunk_nightly_v4"] => {} + }, + [ResourcePool, "Rich", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "ESX-TESTVCINTEGRATION"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host2"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host3"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host4"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-sim-host5"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent2"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp-smis-agent3"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetappDsTest2"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest4"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest5"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest6"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest7"] => {} + }, + [ResourcePool, "Tina", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-TinaF"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "TF-Appliance 4.0.1.14"] => {} + }, + [ResourcePool, "TomH", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-nightly-26322"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64_19GB_restore_"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-V4_import_tes"] => {} + }, + [ResourcePool, "Xav", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4014"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4018"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav Master"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav RH 40114"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav RH 4012"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "xavsmall"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL Trunk svn2"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL V4 svn"] => {} + }, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "3.3.2.22"] => {} + }, + [ResourcePool, "Training", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Master DB"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 UI"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 Worker"] => {} + }, + [ResourcePool, "VMware View VM's", {:is_default => false}] => { + [ResourcePool, "Linked Clones", {:is_default => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Windows 7 Parent x64"] => {} + }, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Broker"] => {} + }, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "KPupgrade"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "RM-4.0.1.12C"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav COS 40114"] => {} + } }, - [EmsFolder, "Test", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Test", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::HostEsx, "localhost"] => { [ResourcePool, "Default for Host / Node localhost", {:is_default => true}] => {} } } }, - [EmsFolder, "vm", {:hidden => true}] => { - [EmsFolder, "BHelgeson", {:hidden => false}] => {}, - [EmsFolder, "Brandon", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "vm", {:hidden => true}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "BHelgeson", {:hidden => false}] => {}, + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Brandon", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-Nightly 28939-svn"] => {} }, - [EmsFolder, "Discovered virtual machine", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Discovered virtual machine", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "3.3.2.22"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-nightly-26322"] => {} }, - [EmsFolder, "Infra", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Infra", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "M-TestDC1"] => {} }, - [EmsFolder, "JFitzgerald", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "JFitzgerald", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "JoeF 4.0.1"] => {} }, - [EmsFolder, "MFeifer", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "MFeifer", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_3_3_2_34"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_40115_svn_formigrate"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "MGF_Branch_332_svn"] => {}, @@ -1037,7 +1034,7 @@ def assert_relationship_tree [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_nightly_trunk_svn"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "mgf_trunk_nightly_v4"] => {} }, - [EmsFolder, "Rich", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Rich", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Template, "netapp-sim-host-template"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Template, "netapp-smis-agent-template"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "ESX-TESTVCINTEGRATION"] => {}, @@ -1055,27 +1052,27 @@ def assert_relationship_tree [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest6"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "NetAppDsTest7"] => {} }, - [EmsFolder, "RMoore", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "RMoore", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "RM-4.0.1.12C"] => {} }, - [EmsFolder, "THennessy", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "THennessy", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64_19GB_restore_"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "tch-cos64-V4_import_tes"] => {} }, - [EmsFolder, "Training", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Training", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Master DB"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 UI"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "Training Region 10 Worker"] => {} }, - [EmsFolder, "VCs", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "VCs", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "VC41Test-Prod"] => {} }, - [EmsFolder, "View Environment", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "View Environment", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Broker"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "View Windows 7 Parent x64"] => {} }, - [EmsFolder, "Xlecauchois", {:hidden => false}] => { + [ManageIQ::Providers::Vmware::InfraManager::EmsFolder, "Xlecauchois", {:hidden => false}] => { [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4014"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav 4018"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "Xav COS 40114"] => {}, @@ -1086,18 +1083,18 @@ def assert_relationship_tree [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL Trunk svn2"] => {}, [ManageIQ::Providers::Vmware::InfraManager::Vm, "XL V4 svn"] => {} }, - [ManageIQ::Providers::Vmware::InfraManager::Template, "Citrix-Win7-Temp"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Template, "Win2008Templatex86"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Template, "Win2k8Template"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-4.0.1.15"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix 5"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah2"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-TinaF"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "KPupgrade"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video1"] => {}, - [ManageIQ::Providers::Vmware::InfraManager::Vm, "TF-Appliance 4.0.1.14"] => {} + [ManageIQ::Providers::Vmware::InfraManager::Template, "Citrix-Win7-Temp"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Template, "Win2008Templatex86"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Template, "Win2k8Template"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "BD-EVM-4.0.1.15"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix 5"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "Citrix-Mahwah2"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "DEV-TinaF"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "KPupgrade"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "netapp_video1"] => {}, + [ManageIQ::Providers::Vmware::InfraManager::Vm, "TF-Appliance 4.0.1.14"] => {} } } } diff --git a/spec/models/miq_vim_broker_worker/runner_spec.rb b/spec/models/miq_vim_broker_worker/runner_spec.rb index 8869e5f34..538b3ce00 100644 --- a/spec/models/miq_vim_broker_worker/runner_spec.rb +++ b/spec/models/miq_vim_broker_worker/runner_spec.rb @@ -258,7 +258,7 @@ it "will handle create events properly" do mor = "group-v123" - klass = "EmsFolder" + klass = "ManageIQ::Providers::Vmware::InfraManager::EmsFolder" find_opts = {:uid_ems => mor} event = {