From fcbeb84a77488c56d18b9d87935cce1d7208d220 Mon Sep 17 00:00:00 2001 From: Vishrut Shah Date: Mon, 11 Jul 2016 17:57:55 -0700 Subject: [PATCH] Handling lookup for provisioning_state in ruby client runtime (#1223) --- .../lib/ms_rest_azure/azure_service_client.rb | 6 +++++- .../lib/ms_rest_azure/polling_state.rb | 6 +++++- .../Ruby/ms-rest-azure/spec/polling_state_spec.rb | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb b/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb index 64cbed1e5067e..b05c8c64c44b8 100644 --- a/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb +++ b/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb @@ -122,7 +122,11 @@ def update_state_from_get_resource_operation(request, polling_state, custom_dese fail AzureOperationError, 'The response from long running operation does not contain a body' if result.response.body.nil? || result.response.body.empty? - if result.body.respond_to?(:provisioning_state) && !result.body.provisioning_state.nil? + # On non flattened resource, we should find provisioning_state inside 'properties' + if result.body.respond_to?(:properties) && result.body.properties.respond_to?(:provisioning_state) && !result.body.properties.provisioning_state.nil? + polling_state.status = result.body.properties.provisioning_state + # On flattened resource, we should find provisioning_state at the top level + elsif result.body.respond_to?(:provisioning_state) && !result.body.provisioning_state.nil? polling_state.status = result.body.provisioning_state else polling_state.status = AsyncOperationStatus::SUCCESS_STATUS diff --git a/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/polling_state.rb b/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/polling_state.rb index 18dbdd0ab99a2..db94c29de76e4 100644 --- a/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/polling_state.rb +++ b/src/client/Ruby/ms-rest-azure/lib/ms_rest_azure/polling_state.rb @@ -35,7 +35,11 @@ def initialize(azure_response, retry_timeout) update_response(azure_response.response) @resource = azure_response.body - if !@resource.nil? && @resource.respond_to?(:provisioning_state) && !@resource.provisioning_state.nil? + # On non flattened resource, we should find provisioning_state inside 'properties' + if (!@resource.nil? && @resource.respond_to?(:properties) && @resource.properties.respond_to?(:provisioning_state) && !@resource.properties.provisioning_state.nil?) + @status = @resource.properties.provisioning_state + # On flattened resource, we should find provisioning_state at the top level + elsif !@resource.nil? && @resource.respond_to?(:provisioning_state) && !@resource.provisioning_state.nil? @status = @resource.provisioning_state else case @response.status diff --git a/src/client/Ruby/ms-rest-azure/spec/polling_state_spec.rb b/src/client/Ruby/ms-rest-azure/spec/polling_state_spec.rb index 899fd898eec47..d9dd5b070e3ea 100644 --- a/src/client/Ruby/ms-rest-azure/spec/polling_state_spec.rb +++ b/src/client/Ruby/ms-rest-azure/spec/polling_state_spec.rb @@ -8,7 +8,7 @@ module MsRestAzure describe PollingState do - it 'should initialize status from response header' do + it 'should initialize status from flattened response body' do response_body = double('response_body', :provisioning_state => 'InProgress') response = double('response', :request => nil, @@ -20,6 +20,19 @@ module MsRestAzure expect(polling_state.status).to eq('InProgress') end + it 'should initialize status from non-flattened response body' do + provisioning_state = double('provisioning_state', :provisioning_state => 'Succeeded') + response_body = double('response_body', :properties => provisioning_state) + response = double('response', + :request => nil, + :response => nil, + :body => response_body) + + polling_state = PollingState.new response, 0 + + expect(polling_state.status).to eq('Succeeded') + end + it 'should initialize status from response status' do response = double('response', :status => 200, :headers => {})