diff --git a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis.rb b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis.rb index abcbb6ea4d..46acf53718 100644 --- a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis.rb +++ b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis.rb @@ -26,14 +26,15 @@ module Azure::ARM::Redis module Models autoload :RedisListResult, 'generated/azure_mgmt_redis/models/redis_list_result.rb' - autoload :Sku, 'generated/azure_mgmt_redis/models/sku.rb' autoload :RedisRegenerateKeyParameters, 'generated/azure_mgmt_redis/models/redis_regenerate_key_parameters.rb' autoload :RedisRebootParameters, 'generated/azure_mgmt_redis/models/redis_reboot_parameters.rb' - autoload :RedisUpdateParameters, 'generated/azure_mgmt_redis/models/redis_update_parameters.rb' + autoload :RedisForceRebootResponse, 'generated/azure_mgmt_redis/models/redis_force_reboot_response.rb' + autoload :RedisAccessKeys, 'generated/azure_mgmt_redis/models/redis_access_keys.rb' autoload :ExportRDBParameters, 'generated/azure_mgmt_redis/models/export_rdbparameters.rb' + autoload :Sku, 'generated/azure_mgmt_redis/models/sku.rb' autoload :ImportRDBParameters, 'generated/azure_mgmt_redis/models/import_rdbparameters.rb' - autoload :RedisAccessKeys, 'generated/azure_mgmt_redis/models/redis_access_keys.rb' autoload :ScheduleEntry, 'generated/azure_mgmt_redis/models/schedule_entry.rb' + autoload :RedisUpdateParameters, 'generated/azure_mgmt_redis/models/redis_update_parameters.rb' autoload :RedisPatchSchedule, 'generated/azure_mgmt_redis/models/redis_patch_schedule.rb' autoload :RedisCreateParameters, 'generated/azure_mgmt_redis/models/redis_create_parameters.rb' autoload :RedisResource, 'generated/azure_mgmt_redis/models/redis_resource.rb' diff --git a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_force_reboot_response.rb b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_force_reboot_response.rb new file mode 100644 index 0000000000..1ccfda221b --- /dev/null +++ b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_force_reboot_response.rb @@ -0,0 +1,45 @@ +# encoding: utf-8 +# Code generated by Microsoft (R) AutoRest Code Generator 1.0.0.0 +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. + +module Azure::ARM::Redis + module Models + # + # Response to force reboot for Redis cache. + # + class RedisForceRebootResponse + + include MsRestAzure + + # @return [String] Status message + attr_accessor :message + + + # + # Mapper for RedisForceRebootResponse class as Ruby Hash. + # This will be used for serialization/deserialization. + # + def self.mapper() + { + required: false, + serialized_name: 'RedisForceRebootResponse', + type: { + name: 'Composite', + class_name: 'RedisForceRebootResponse', + model_properties: { + message: { + required: false, + read_only: true, + serialized_name: 'Message', + type: { + name: 'String' + } + } + } + } + } + end + end + end +end diff --git a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_resource.rb b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_resource.rb index 481a8f006d..89b0ada4eb 100644 --- a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_resource.rb +++ b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/models/redis_resource.rb @@ -55,6 +55,10 @@ class RedisResource < MsRestAzure::Resource # @return [Integer] Redis SSL port. attr_accessor :ssl_port + # @return [RedisAccessKeys] The keys of the Redis cache - not set if this + # object is not the response to Create or Update redis cache + attr_accessor :access_keys + # # Mapper for RedisResource class as Ruby Hash. @@ -222,6 +226,15 @@ def self.mapper() type: { name: 'Number' } + }, + access_keys: { + required: false, + read_only: true, + serialized_name: 'properties.accessKeys', + type: { + name: 'Composite', + class_name: 'RedisAccessKeys' + } } } } diff --git a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/patch_schedules.rb b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/patch_schedules.rb index e837b5acc4..3bf871eb04 100644 --- a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/patch_schedules.rb +++ b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/patch_schedules.rb @@ -109,7 +109,7 @@ def create_or_update_async(resource_group_name, name, parameters, custom_headers http_response = result.response status_code = http_response.status response_content = http_response.body - unless status_code == 200 + unless status_code == 200 || status_code == 201 error_model = JSON.load(response_content) fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) end @@ -125,6 +125,16 @@ def create_or_update_async(resource_group_name, name, parameters, custom_headers fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) end end + # Deserialize Response + if status_code == 201 + begin + parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content) + result_mapper = RedisPatchSchedule.mapper() + result.body = @client.deserialize(result_mapper, parsed_response, 'result.body') + rescue Exception => e + fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) + end + end result end @@ -280,7 +290,7 @@ def get_async(resource_group_name, name, custom_headers = nil) http_response = result.response status_code = http_response.status response_content = http_response.body - unless status_code == 200 || status_code == 404 + unless status_code == 200 error_model = JSON.load(response_content) fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) end diff --git a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/redis.rb b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/redis.rb index b630197034..c4dd988003 100644 --- a/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/redis.rb +++ b/management/azure_mgmt_redis/lib/generated/azure_mgmt_redis/redis.rb @@ -690,10 +690,11 @@ def regenerate_key_async(resource_group_name, name, parameters, custom_headers = # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # + # @return [RedisForceRebootResponse] operation results. # def force_reboot(resource_group_name, name, parameters, custom_headers = nil) response = force_reboot_async(resource_group_name, name, parameters, custom_headers).value! - nil + response.body unless response.nil? end # @@ -765,12 +766,22 @@ def force_reboot_async(resource_group_name, name, parameters, custom_headers = n http_response = result.response status_code = http_response.status response_content = http_response.body - unless status_code == 200 || status_code == 204 + unless status_code == 200 error_model = JSON.load(response_content) fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) end result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil? + # Deserialize Response + if status_code == 200 + begin + parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content) + result_mapper = RedisForceRebootResponse.mapper() + result.body = @client.deserialize(result_mapper, parsed_response, 'result.body') + rescue Exception => e + fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) + end + end result end @@ -1145,7 +1156,7 @@ def begin_import_data_async(resource_group_name, name, parameters, custom_header http_response = result.response status_code = http_response.status response_content = http_response.body - unless status_code == 202 + unless status_code == 202 || status_code == 200 || status_code == 204 error_model = JSON.load(response_content) fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) end @@ -1241,7 +1252,7 @@ def begin_export_data_async(resource_group_name, name, parameters, custom_header http_response = result.response status_code = http_response.status response_content = http_response.body - unless status_code == 202 + unless status_code == 202 || status_code == 200 || status_code == 204 error_model = JSON.load(response_content) fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) end