From f3c7604a528436b4354fb7e2a48a27c7f97f082c Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 19 Mar 2019 19:07:35 +0000 Subject: [PATCH 1/3] Generated from b91c1b045f5e525e314f9ff0f926e01d1548dd8f Patch call for DDoS Protection plan Removing unreferenced definition Addressing review comments. Setting x-ms-long-running-operation to false Removing tags from Patch call description Fixing the response message description Removing x-ms-long-running-operation from patch fixing the file renames --- .../ddos_protection_plans.rb | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb index 6e9fbfe26d..5aeb7af155 100644 --- a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb +++ b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb @@ -203,6 +203,116 @@ def create_or_update_async(resource_group_name, ddos_protection_plan_name, param promise end + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param custom_headers [Hash{String => String}] A hash of custom headers that + # will be added to the HTTP request. + # + # @return [DdosProtectionPlan] operation results. + # + def update(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + response = update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + response.body unless response.nil? + end + + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param custom_headers [Hash{String => String}] A hash of custom headers that + # will be added to the HTTP request. + # + # @return [MsRestAzure::AzureOperationResponse] HTTP response information. + # + def update_with_http_info(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + end + + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param [Hash{String => String}] A hash of custom headers that will be added + # to the HTTP request. + # + # @return [Concurrent::Promise] Promise object which holds the HTTP response. + # + def update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil? + fail ArgumentError, 'ddos_protection_plan_name is nil' if ddos_protection_plan_name.nil? + fail ArgumentError, 'parameters is nil' if parameters.nil? + fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil? + fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil? + + + request_headers = {} + + # Set Headers + request_headers['x-ms-client-request-id'] = SecureRandom.uuid + request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil? + + request_headers['Content-Type'] = 'application/json; charset=utf-8' + + # Serialize Request + request_mapper = Azure::Network::Mgmt::V2018_12_01::Models::TagsObject.mapper() + request_content = @client.serialize(request_mapper, parameters) + request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil + + path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}' + + request_url = @base_url || @client.base_url + + options = { + middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]], + path_params: {'resourceGroupName' => resource_group_name,'ddosProtectionPlanName' => ddos_protection_plan_name,'subscriptionId' => @client.subscription_id}, + query_params: {'api-version' => @client.api_version}, + body: request_content, + headers: request_headers.merge(custom_headers || {}), + base_url: request_url + } + promise = @client.make_request_async(:patch, path_template, options) + + promise = promise.then do |result| + http_response = result.response + status_code = http_response.status + response_content = http_response.body + 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 = Azure::Network::Mgmt::V2018_12_01::Models::DdosProtectionPlan.mapper() + result.body = @client.deserialize(result_mapper, parsed_response) + rescue Exception => e + fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) + end + end + + result + end + + promise.execute + end + # # Gets all DDoS protection plans in a subscription. # From 39f56a8ffaa28bbe8512d59ce5ed9ee9cefeb79a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 19 Mar 2019 19:23:23 +0000 Subject: [PATCH 2/3] Generated from 911850b6356828aa6f248d69346bb118f81a2554 fixing date --- .../ddos_protection_plans.rb | 196 +++++++++++------- 1 file changed, 122 insertions(+), 74 deletions(-) diff --git a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb index 5aeb7af155..ff14cd2b36 100644 --- a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb +++ b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb @@ -221,8 +221,6 @@ def update(resource_group_name, ddos_protection_plan_name, parameters, custom_he response.body unless response.nil? end - # - # Update a DDoS protection plan # # @param resource_group_name [String] The name of the resource group. # @param ddos_protection_plan_name [String] The name of the DDoS protection @@ -232,85 +230,25 @@ def update(resource_group_name, ddos_protection_plan_name, parameters, custom_he # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # - # @return [MsRestAzure::AzureOperationResponse] HTTP response information. - # - def update_with_http_info(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) - update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! - end - - # - # Update a DDoS protection plan - # - # @param resource_group_name [String] The name of the resource group. - # @param ddos_protection_plan_name [String] The name of the DDoS protection - # plan. - # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. - # @param [Hash{String => String}] A hash of custom headers that will be added - # to the HTTP request. - # - # @return [Concurrent::Promise] Promise object which holds the HTTP response. + # @return [Concurrent::Promise] promise which provides async access to http + # response. # def update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) - fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil? - fail ArgumentError, 'ddos_protection_plan_name is nil' if ddos_protection_plan_name.nil? - fail ArgumentError, 'parameters is nil' if parameters.nil? - fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil? - fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil? - - - request_headers = {} - - # Set Headers - request_headers['x-ms-client-request-id'] = SecureRandom.uuid - request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil? - - request_headers['Content-Type'] = 'application/json; charset=utf-8' - - # Serialize Request - request_mapper = Azure::Network::Mgmt::V2018_12_01::Models::TagsObject.mapper() - request_content = @client.serialize(request_mapper, parameters) - request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil - - path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}' - - request_url = @base_url || @client.base_url - - options = { - middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]], - path_params: {'resourceGroupName' => resource_group_name,'ddosProtectionPlanName' => ddos_protection_plan_name,'subscriptionId' => @client.subscription_id}, - query_params: {'api-version' => @client.api_version}, - body: request_content, - headers: request_headers.merge(custom_headers || {}), - base_url: request_url - } - promise = @client.make_request_async(:patch, path_template, options) - - promise = promise.then do |result| - http_response = result.response - status_code = http_response.status - response_content = http_response.body - unless status_code == 200 - error_model = JSON.load(response_content) - fail MsRestAzure::AzureOperationError.new(result.request, http_response, error_model) - end + # Send request + promise = begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers) - 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 = Azure::Network::Mgmt::V2018_12_01::Models::DdosProtectionPlan.mapper() - result.body = @client.deserialize(result_mapper, parsed_response) - rescue Exception => e - fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) - end + promise = promise.then do |response| + # Defining deserialization method. + deserialize_method = lambda do |parsed_response| + result_mapper = Azure::Network::Mgmt::V2018_12_01::Models::DdosProtectionPlan.mapper() + parsed_response = @client.deserialize(result_mapper, parsed_response) end - result + # Waiting for response. + @client.get_long_running_operation_result(response, deserialize_method) end - promise.execute + promise end # @@ -686,6 +624,116 @@ def begin_create_or_update_async(resource_group_name, ddos_protection_plan_name, promise.execute end + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param custom_headers [Hash{String => String}] A hash of custom headers that + # will be added to the HTTP request. + # + # @return [DdosProtectionPlan] operation results. + # + def begin_update(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + response = begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + response.body unless response.nil? + end + + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param custom_headers [Hash{String => String}] A hash of custom headers that + # will be added to the HTTP request. + # + # @return [MsRestAzure::AzureOperationResponse] HTTP response information. + # + def begin_update_with_http_info(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + end + + # + # Update a DDoS protection plan + # + # @param resource_group_name [String] The name of the resource group. + # @param ddos_protection_plan_name [String] The name of the DDoS protection + # plan. + # @param parameters [TagsObject] Parameters supplied to the update DDoS + # protection plan resource. + # @param [Hash{String => String}] A hash of custom headers that will be added + # to the HTTP request. + # + # @return [Concurrent::Promise] Promise object which holds the HTTP response. + # + def begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil? + fail ArgumentError, 'ddos_protection_plan_name is nil' if ddos_protection_plan_name.nil? + fail ArgumentError, 'parameters is nil' if parameters.nil? + fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil? + fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil? + + + request_headers = {} + + # Set Headers + request_headers['x-ms-client-request-id'] = SecureRandom.uuid + request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil? + + request_headers['Content-Type'] = 'application/json; charset=utf-8' + + # Serialize Request + request_mapper = Azure::Network::Mgmt::V2018_12_01::Models::TagsObject.mapper() + request_content = @client.serialize(request_mapper, parameters) + request_content = request_content != nil ? JSON.generate(request_content, quirks_mode: true) : nil + + path_template = 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}' + + request_url = @base_url || @client.base_url + + options = { + middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]], + path_params: {'resourceGroupName' => resource_group_name,'ddosProtectionPlanName' => ddos_protection_plan_name,'subscriptionId' => @client.subscription_id}, + query_params: {'api-version' => @client.api_version}, + body: request_content, + headers: request_headers.merge(custom_headers || {}), + base_url: request_url + } + promise = @client.make_request_async(:patch, path_template, options) + + promise = promise.then do |result| + http_response = result.response + status_code = http_response.status + response_content = http_response.body + 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 = Azure::Network::Mgmt::V2018_12_01::Models::DdosProtectionPlan.mapper() + result.body = @client.deserialize(result_mapper, parsed_response) + rescue Exception => e + fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result) + end + end + + result + end + + promise.execute + end + # # Gets all DDoS protection plans in a subscription. # From 2829dd60cabbb12defbadbe4eb53b0f0e887e1b8 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 21 Mar 2019 18:31:14 +0000 Subject: [PATCH 3/3] Generated from 6bf97babcf2f5b8706345d4db6ab8ab76621104d Addressing review comments --- .../ddos_protection_plans.rb | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb index ff14cd2b36..7b9950f263 100644 --- a/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb +++ b/management/azure_mgmt_network/lib/2018-12-01/generated/azure_mgmt_network/ddos_protection_plans.rb @@ -204,20 +204,20 @@ def create_or_update_async(resource_group_name, ddos_protection_plan_name, param end # - # Update a DDoS protection plan + # Update a DDoS protection plan tags # # @param resource_group_name [String] The name of the resource group. # @param ddos_protection_plan_name [String] The name of the DDoS protection # plan. # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. + # protection plan resource tags. # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # # @return [DdosProtectionPlan] operation results. # - def update(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) - response = update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + def update_tags(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + response = update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! response.body unless response.nil? end @@ -226,16 +226,16 @@ def update(resource_group_name, ddos_protection_plan_name, parameters, custom_he # @param ddos_protection_plan_name [String] The name of the DDoS protection # plan. # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. + # protection plan resource tags. # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # # @return [Concurrent::Promise] promise which provides async access to http # response. # - def update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + def update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) # Send request - promise = begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers) + promise = begin_update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers) promise = promise.then do |response| # Defining deserialization method. @@ -625,54 +625,54 @@ def begin_create_or_update_async(resource_group_name, ddos_protection_plan_name, end # - # Update a DDoS protection plan + # Update a DDoS protection plan tags # # @param resource_group_name [String] The name of the resource group. # @param ddos_protection_plan_name [String] The name of the DDoS protection # plan. # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. + # protection plan resource tags. # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # # @return [DdosProtectionPlan] operation results. # - def begin_update(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) - response = begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + def begin_update_tags(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + response = begin_update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! response.body unless response.nil? end # - # Update a DDoS protection plan + # Update a DDoS protection plan tags # # @param resource_group_name [String] The name of the resource group. # @param ddos_protection_plan_name [String] The name of the DDoS protection # plan. # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. + # protection plan resource tags. # @param custom_headers [Hash{String => String}] A hash of custom headers that # will be added to the HTTP request. # # @return [MsRestAzure::AzureOperationResponse] HTTP response information. # - def begin_update_with_http_info(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) - begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! + def begin_update_tags_with_http_info(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + begin_update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers).value! end # - # Update a DDoS protection plan + # Update a DDoS protection plan tags # # @param resource_group_name [String] The name of the resource group. # @param ddos_protection_plan_name [String] The name of the DDoS protection # plan. # @param parameters [TagsObject] Parameters supplied to the update DDoS - # protection plan resource. + # protection plan resource tags. # @param [Hash{String => String}] A hash of custom headers that will be added # to the HTTP request. # # @return [Concurrent::Promise] Promise object which holds the HTTP response. # - def begin_update_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) + def begin_update_tags_async(resource_group_name, ddos_protection_plan_name, parameters, custom_headers = nil) fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil? fail ArgumentError, 'ddos_protection_plan_name is nil' if ddos_protection_plan_name.nil? fail ArgumentError, 'parameters is nil' if parameters.nil?