Merge pull request #62 from djberg96/instance_location

[REFACTOR] Set instance location to region location instead of using uid value (cherry picked from commit 04e380b) https://bugzilla.redhat.com/show_bug.cgi?id=1488967
ManageIQ · Sep 12, 2017 · b75fb9b · b75fb9b
1 parent 8154df6
commit b75fb9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/azure/cloud_manager/refresh_parser.rb b/app/models/manageiq/providers/azure/cloud_manager/refresh_parser.rb
@@ -224,7 +224,7 @@ def parse_instance(instance)
           :raw_power_state     => power_status(instance),
           :operating_system    => process_os(instance),
           :flavor              => series,
-          :location            => uid,
+          :location            => instance.location,
           :orchestration_stack => @data_index.fetch_path(:orchestration_stacks, @resource_to_stack[uid]),
           :availability_zone   => @data_index.fetch_path(:availability_zones, 'default'),
           :hardware            => {

diff --git a/spec/models/manageiq/providers/azure/cloud_manager/refresher_spec.rb b/spec/models/manageiq/providers/azure/cloud_manager/refresher_spec.rb
@@ -403,7 +403,7 @@ def assert_specific_vm_powered_on
       :uid_ems               => vm_resource_id,
       :vendor                => "azure",
       :power_state           => "on",
-      :location              => vm_resource_id,
+      :location              => "eastus",
       :tools_status          => nil,
       :boot_time             => nil,
       :standby_action        => nil,
@@ -539,7 +539,7 @@ def assert_specific_vm_powered_off_attributes(v)
       :uid_ems               => vm_resource_id,
       :vendor                => "azure",
       :power_state           => "off",
-      :location              => vm_resource_id,
+      :location              => "eastus",
       :tools_status          => nil,
       :boot_time             => nil,
       :standby_action        => nil,