Merge pull request #18210 from yrudman/accept-hash-object-as-result-o…

…f-inter-region-api-invocation

Accept Hash object as result of inter region api invocation

(cherry picked from commit 0f85990)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1650335

app/models/mixins/inter_region_api_method_relay.rb

@@ -80,6 +80,11 @@ def self.exec_api_call(region, collection_name, action, api_args = nil, id = nil
       result.attributes
     when ManageIQ::API::Client::Resource
       instance_for_resource(result)
+    when Hash
+      # Some of API invocation returning Hash object
+      # Example: retire_resource for Service
+      _log.warn("remote API invocation returned Hash object")
+      result
     else
       raise InterRegionApiMethodRelayError, "Got unexpected API result object #{result.class}"
     end

spec/models/mixins/inter_region_api_method_relay_spec.rb

@@ -228,6 +228,11 @@ def expect_api_call(expected_action, expected_args = nil)
         }.to raise_error(described_class::InterRegionApiMethodRelayError)
       end
 
+      it "accepts Hash object as api result" do
+        expect(api_collection).to receive(action).and_return({})
+        expect { described_class.exec_api_call(region, collection_name, action) }.not_to raise_error
+      end
+
       it "calls the given action with the given args" do
         args = {:my => "args", :here => 123}
         expect(api_collection).to receive(action).with(args).and_return(api_success_result)