Fix unknown location for vCloud provider

agrare · Jun 20, 2018 · cbcea7e · cbcea7e
1 parent 1b08354
commit cbcea7e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/vmware/cloud_manager/refresh_parser.rb b/app/models/manageiq/providers/vmware/cloud_manager/refresh_parser.rb
@@ -141,6 +141,7 @@ def parse_vm(vm)
       :ems_ref                => uid,
       :name                   => name,
       :hostname               => hostname,
+      :location               => uid,
       :vendor                 => "vmware",
       :raw_power_state        => status,
       :snapshots              => [parse_snapshot(vm)].compact,
@@ -193,6 +194,7 @@ def parse_image(image, is_public)
       :uid_ems            => uid,
       :ems_ref            => uid,
       :name               => name,
+      :location           => uid,
       :vendor             => "vmware",
       :raw_power_state    => "never",
       :publicly_available => is_public

diff --git a/app/models/manageiq/providers/vmware/inventory/parser/cloud_manager.rb b/app/models/manageiq/providers/vmware/inventory/parser/cloud_manager.rb
@@ -33,6 +33,7 @@ def vms
         :uid_ems                => vm[:vm].id,
         :name                   => vm[:vm].name,
         :hostname               => vm[:hostname],
+        :location               => vm[:vm].id,
         :vendor                 => 'vmware',
         :raw_power_state        => vm[:vm].status,
         :orchestration_stack    => persister.orchestration_stacks.lazy_find(vm[:vm].vapp_id),
@@ -98,6 +99,7 @@ def images
       persister.miq_templates.find_or_build(image[:image].id).assign_attributes(
         :uid_ems            => image[:image].id,
         :name               => image[:image].name,
+        :location           => image[:image].id,
         :vendor             => 'vmware',
         :raw_power_state    => 'never',
         :publicly_available => image[:is_published]

diff --git a/spec/models/manageiq/providers/vmware/cloud_manager/refresher_spec.rb b/spec/models/manageiq/providers/vmware/cloud_manager/refresher_spec.rb
@@ -172,7 +172,7 @@ def assert_specific_template
       :vendor                => 'vmware',
       :power_state           => 'never',
       :publicly_available    => false,
-      :location              => 'unknown',
+      :location              => 'vm-ac90bd58-3bc4-47a5-bc8c-f1c8f5c468b6',
       :tools_status          => nil,
       :boot_time             => nil,
       :standby_action        => nil,
@@ -205,7 +205,7 @@ def assert_specific_vm_powered_on
       :uid_ems                => 'vm-84faa107-c0b9-4a21-adc5-b17e0c5355a2',
       :vendor                 => 'vmware',
       :power_state            => 'on',
-      :location               => 'unknown',
+      :location               => 'vm-84faa107-c0b9-4a21-adc5-b17e0c5355a2',
       :tools_status           => nil,
       :boot_time              => nil,
       :standby_action         => nil,
@@ -295,7 +295,7 @@ def assert_specific_vm_powered_off
       :uid_ems               => 'vm-aaf94123-cbf9-4de9-841c-41dd41ac310e',
       :vendor                => 'vmware',
       :power_state           => 'off',
-      :location              => 'unknown',
+      :location              => 'vm-aaf94123-cbf9-4de9-841c-41dd41ac310e',
       :tools_status          => nil,
       :boot_time             => nil,
       :standby_action        => nil,