azure_mgmt_storage 0.1.2 → 0.2.0

data/lib/azure_mgmt_storage/models/storage_account_properties_create_parameters.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -13,14 +13,15 @@ module Azure::ARM::Storage
       include MsRestAzure
 
       # @return [AccountType] Gets or sets the account type. Possible values
-      # for this property include: 'Standard_LRS', 'Standard_ZRS',
-      # 'Standard_GRS', 'Standard_RAGRS', 'Premium_LRS'.
+      # include: 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS',
+      # 'Standard_RAGRS', 'Premium_LRS'
       attr_accessor :account_type
 
       #
       # Validate the object. Throws ValidationError if validation fails.
       #
       def validate
+        fail MsRest::ValidationError, 'property account_type is nil' if @account_type.nil?
       end
 
       #
@@ -50,12 +51,10 @@ module Azure::ARM::Storage
         deserialized_property = object['accountType']
         if (!deserialized_property.nil? && !deserialized_property.empty?)
           enum_is_valid = AccountType.constants.any? { |e| AccountType.const_get(e).to_s.downcase == deserialized_property.downcase }
-          fail MsRest::DeserializationError.new('Error occured while deserializing the enum', nil, nil, nil) unless enum_is_valid
+          warn 'Enum AccountType does not contain ' + deserialized_property.downcase + ', but was received from the server.' unless enum_is_valid
         end
         output_object.account_type = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/storage_account_properties_update_parameters.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -15,9 +15,8 @@ module Azure::ARM::Storage
       # @return [AccountType] Gets or sets the account type. Note that
       # StandardZRS and PremiumLRS accounts cannot be changed to other
       # account types, and other account types cannot be changed to
-      # StandardZRS or PremiumLRS. Possible values for this property include:
-      # 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS',
-      # 'Premium_LRS'.
+      # StandardZRS or PremiumLRS. Possible values include: 'Standard_LRS',
+      # 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS', 'Premium_LRS'
       attr_accessor :account_type
 
       # @return [CustomDomain] User domain assigned to the storage account.
@@ -66,7 +65,7 @@ module Azure::ARM::Storage
         deserialized_property = object['accountType']
         if (!deserialized_property.nil? && !deserialized_property.empty?)
           enum_is_valid = AccountType.constants.any? { |e| AccountType.const_get(e).to_s.downcase == deserialized_property.downcase }
-          fail MsRest::DeserializationError.new('Error occured while deserializing the enum', nil, nil, nil) unless enum_is_valid
+          warn 'Enum AccountType does not contain ' + deserialized_property.downcase + ', but was received from the server.' unless enum_is_valid
         end
         output_object.account_type = deserialized_property
 
@@ -76,8 +75,6 @@ module Azure::ARM::Storage
         end
         output_object.custom_domain = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/storage_account_regenerate_key_parameters.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -12,14 +12,14 @@ module Azure::ARM::Storage
 
       include MsRestAzure
 
-      # @return [KeyName] Possible values for this property include: 'key1',
-      # 'key2'.
+      # @return [String]
       attr_accessor :key_name
 
       #
       # Validate the object. Throws ValidationError if validation fails.
       #
       def validate
+        fail MsRest::ValidationError, 'property key_name is nil' if @key_name.nil?
       end
 
       #
@@ -47,14 +47,8 @@ module Azure::ARM::Storage
         output_object = StorageAccountRegenerateKeyParameters.new
 
         deserialized_property = object['keyName']
-        if (!deserialized_property.nil? && !deserialized_property.empty?)
-          enum_is_valid = KeyName.constants.any? { |e| KeyName.const_get(e).to_s.downcase == deserialized_property.downcase }
-          fail MsRest::DeserializationError.new('Error occured while deserializing the enum', nil, nil, nil) unless enum_is_valid
-        end
         output_object.key_name = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/storage_account_update_parameters.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -8,10 +8,13 @@ module Azure::ARM::Storage
     #
     # The parameters to update on the account.
     #
-    class StorageAccountUpdateParameters < MsRestAzure::Resource
+    class StorageAccountUpdateParameters
 
       include MsRestAzure
 
+      # @return [Hash{String => String}] Resource tags
+      attr_accessor :tags
+
       # @return [StorageAccountPropertiesUpdateParameters]
       attr_accessor :properties
 
@@ -19,6 +22,7 @@ module Azure::ARM::Storage
       # Validate the object. Throws ValidationError if validation fails.
       #
       def validate
+        @tags.each{ |e| e.validate if e.respond_to?(:validate) } unless @tags.nil?
         @properties.validate unless @properties.nil?
       end
 
@@ -31,18 +35,6 @@ module Azure::ARM::Storage
         object.validate
         output_object = {}
 
-        serialized_property = object.location
-        output_object['location'] = serialized_property unless serialized_property.nil?
-
-        serialized_property = object.id
-        output_object['id'] = serialized_property unless serialized_property.nil?
-
-        serialized_property = object.name
-        output_object['name'] = serialized_property unless serialized_property.nil?
-
-        serialized_property = object.type
-        output_object['type'] = serialized_property unless serialized_property.nil?
-
         serialized_property = object.tags
         output_object['tags'] = serialized_property unless serialized_property.nil?
 
@@ -64,18 +56,6 @@ module Azure::ARM::Storage
         return if object.nil?
         output_object = StorageAccountUpdateParameters.new
 
-        deserialized_property = object['location']
-        output_object.location = deserialized_property
-
-        deserialized_property = object['id']
-        output_object.id = deserialized_property
-
-        deserialized_property = object['name']
-        output_object.name = deserialized_property
-
-        deserialized_property = object['type']
-        output_object.type = deserialized_property
-
         deserialized_property = object['tags']
         output_object.tags = deserialized_property
 
@@ -85,8 +65,6 @@ module Azure::ARM::Storage
         end
         output_object.properties = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/usage.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -12,9 +12,9 @@ module Azure::ARM::Storage
 
       include MsRestAzure
 
-      # @return [UsageUnit] Gets the unit of measurement. Possible values for
-      # this property include: 'Count', 'Bytes', 'Seconds', 'Percent',
-      # 'CountsPerSecond', 'BytesPerSecond'.
+      # @return [UsageUnit] Gets the unit of measurement. Possible values
+      # include: 'Count', 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond',
+      # 'BytesPerSecond'
       attr_accessor :unit
 
       # @return [Integer] Gets the current count of the allocated resources in
@@ -32,6 +32,10 @@ module Azure::ARM::Storage
       # Validate the object. Throws ValidationError if validation fails.
       #
       def validate
+        fail MsRest::ValidationError, 'property unit is nil' if @unit.nil?
+        fail MsRest::ValidationError, 'property current_value is nil' if @current_value.nil?
+        fail MsRest::ValidationError, 'property limit is nil' if @limit.nil?
+        fail MsRest::ValidationError, 'property name is nil' if @name.nil?
         @name.validate unless @name.nil?
       end
 
@@ -74,7 +78,7 @@ module Azure::ARM::Storage
         deserialized_property = object['unit']
         if (!deserialized_property.nil? && !deserialized_property.empty?)
           enum_is_valid = UsageUnit.constants.any? { |e| UsageUnit.const_get(e).to_s.downcase == deserialized_property.downcase }
-          fail MsRest::DeserializationError.new('Error occured while deserializing the enum', nil, nil, nil) unless enum_is_valid
+          warn 'Enum UsageUnit does not contain ' + deserialized_property.downcase + ', but was received from the server.' unless enum_is_valid
         end
         output_object.unit = deserialized_property
 
@@ -92,8 +96,6 @@ module Azure::ARM::Storage
         end
         output_object.name = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/usage_list_result.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -58,19 +58,17 @@ module Azure::ARM::Storage
 
         deserialized_property = object['value']
         unless deserialized_property.nil?
-          deserializedArray = [];
+          deserialized_array = []
           deserialized_property.each do |element1|
             unless element1.nil?
               element1 = Usage.deserialize_object(element1)
             end
-            deserializedArray.push(element1);
+            deserialized_array.push(element1)
           end
-          deserialized_property = deserializedArray;
+          deserialized_property = deserialized_array
         end
         output_object.value = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/usage_name.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -58,8 +58,6 @@ module Azure::ARM::Storage
         deserialized_property = object['localizedValue']
         output_object.localized_value = deserialized_property
 
-        output_object.validate
-
         output_object
       end
     end

data/lib/azure_mgmt_storage/models/usage_unit.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 

data/lib/azure_mgmt_storage/module_definition.rb

@@ -1,6 +1,8 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
+# encoding: utf-8
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
 
 module Azure end
 module Azure::ARM end
-module Azure::ARM::Storage end
+module Azure::ARM::Storage end

data/lib/azure_mgmt_storage/storage_accounts.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
 module Azure::ARM::Storage
   #
-  # StorageAccounts
+  # The Storage Management Client.
   #
   class StorageAccounts
     include Azure::ARM::Storage::Models
@@ -24,6 +24,7 @@ module Azure::ARM::Storage
 
     #
     # Checks that account name is valid and is not in use.
+    #
     # @param account_name [StorageAccountCheckNameAvailabilityParameters] The name
     # of the storage account within the specified resource group. Storage account
     # names must be between 3 and 24 characters in length and use numbers and
@@ -39,78 +40,52 @@ module Azure::ARM::Storage
       account_name.validate unless account_name.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability"
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless account_name.nil?
         account_name = StorageAccountCheckNameAvailabilityParameters.serialize_object(account_name)
       end
       request_content = JSON.generate(account_name, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.post do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = CheckNameAvailabilityResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -126,8 +101,9 @@ module Azure::ARM::Storage
     # the Update Storage Account API. If an account is already created and
     # subsequent PUT request is issued with exact same set of properties, then
     # HTTP 200 would be returned.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
@@ -156,7 +132,7 @@ module Azure::ARM::Storage
         end
 
         # Waiting for response.
-        @client.get_put_operation_result(response, custom_headers, deserialize_method)
+        @client.get_put_operation_result(response, deserialize_method)
       end
 
       promise
@@ -168,8 +144,9 @@ module Azure::ARM::Storage
     # the Update Storage Account API. If an account is already created and
     # subsequent PUT request is issued with exact same set of properties, then
     # HTTP 200 would be returned.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
@@ -188,80 +165,52 @@ module Azure::ARM::Storage
       parameters.validate unless 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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless parameters.nil?
         parameters = StorageAccountCreateParameters.serialize_object(parameters)
       end
       request_content = JSON.generate(parameters, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.put do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :put, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200 || status_code == 202)
+        unless status_code == 200 || status_code == 202
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccount.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -273,8 +222,9 @@ module Azure::ARM::Storage
 
     #
     # Deletes a storage account in Microsoft Azure.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
@@ -289,60 +239,33 @@ module Azure::ARM::Storage
       fail ArgumentError, 'account_name is nil' if account_name.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.delete do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :delete, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200 || status_code == 204)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 200 || status_code == 204
+          error_model = JSON.load(response_content)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
 
         result
@@ -355,8 +278,9 @@ module Azure::ARM::Storage
     # Returns the properties for the specified storage account including but not
     # limited to name, account type, location, and account status. The ListKeys
     # operation should be used to retrieve storage keys.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
@@ -371,72 +295,44 @@ module Azure::ARM::Storage
       fail ArgumentError, 'account_name is nil' if account_name.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccount.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -450,14 +346,18 @@ module Azure::ARM::Storage
     # Updates the account type or tags for a storage account. It can also be used
     # to add a custom domain (note that custom domains cannot be added via the
     # Create operation). Only one custom domain is supported per storage account.
-    # This API can only be used to update one of tags, accountType, or
-    # customDomain per call. To update multiple of these properties, call the API
-    # multiple times with one change per call. This call does not change the
+    # In order to replace a custom domain, the old value must be cleared before a
+    # new value may be set. To clear a custom domain, simply update the custom
+    # domain with empty string. Then call update again with the new cutsom domain
+    # name. The update API can only be used to update one of tags, accountType,
+    # or customDomain per call. To update multiple of these properties, call the
+    # API multiple times with one change per call. This call does not change the
     # storage keys for the account. If you want to change storage account keys,
     # use the RegenerateKey operation. The location and name of the storage
     # account cannot be changed after creation.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
@@ -477,80 +377,52 @@ module Azure::ARM::Storage
       parameters.validate unless 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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless parameters.nil?
         parameters = StorageAccountUpdateParameters.serialize_object(parameters)
       end
       request_content = JSON.generate(parameters, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.patch do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :patch, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccount.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -562,6 +434,7 @@ module Azure::ARM::Storage
 
     #
     # Lists the access keys for the specified storage account.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param account_name [String] The name of the storage account.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -575,72 +448,44 @@ module Azure::ARM::Storage
       fail ArgumentError, 'account_name is nil' if account_name.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/listKeys"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.post do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/listKeys'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccountKeys.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -653,6 +498,7 @@ module Azure::ARM::Storage
     #
     # Lists all the storage accounts available under the subscription. Note that
     # storage keys are not returned; use the ListKeys operation for this.
+    #
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
     #
@@ -662,70 +508,44 @@ module Azure::ARM::Storage
     def list(custom_headers = 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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/storageAccounts"
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/providers/Microsoft.Storage/storageAccounts'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccountListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -739,8 +559,9 @@ module Azure::ARM::Storage
     # Lists all the storage accounts available under the given resource group.
     # Note that storage keys are not returned; use the ListKeys operation for
     # this.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
     #
@@ -751,71 +572,44 @@ module Azure::ARM::Storage
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccountListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -827,13 +621,14 @@ module Azure::ARM::Storage
 
     #
     # Regenerates the access keys for the specified storage account.
+    #
     # @param resource_group_name [String] The name of the resource group within
-    # the user’s subscription.
+    # the user's subscription.
     # @param account_name [String] The name of the storage account within the
     # specified resource group. Storage account names must be between 3 and 24
     # characters in length and use numbers and lower-case letters only.
     # @param regenerate_key [StorageAccountRegenerateKeyParameters] Specifies name
-    # of the key which should be regenerated.
+    # of the key which should be regenerated. key1 or key2 for the default keys
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
     #
@@ -847,251 +642,52 @@ module Azure::ARM::Storage
       regenerate_key.validate unless regenerate_key.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?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{accountName}'] = ERB::Util.url_encode(account_name) if path.include?('{accountName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      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?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless regenerate_key.nil?
         regenerate_key = StorageAccountRegenerateKeyParameters.serialize_object(regenerate_key)
       end
       request_content = JSON.generate(regenerate_key, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.post do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'accountName' => account_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         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 = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = StorageAccountKeys.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
-          end
-        end
-
-        result
-      end
-
-      promise.execute
-    end
-
-    #
-    # Lists all the storage accounts available under the subscription. Note that
-    # storage keys are not returned; use the ListKeys operation for this.
-    # @param next_page_link [String] The NextLink from the previous successful
-    # call to List operation.
-    # @param [Hash{String => String}] The hash of custom headers need to be
-    # applied to HTTP request.
-    #
-    # @return [Concurrent::Promise] Promise object which allows to get HTTP
-    # response.
-    #
-    def list_next(next_page_link, custom_headers = nil)
-      fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
-      # Construct URL
-      path = "{nextLink}"
-      path['{nextLink}'] = next_page_link if path.include?('{nextLink}')
-      url = URI.parse(path)
-      properties = {}
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
-
-      # Set Headers
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
-      end
-
-      promise = promise.then do |http_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(connection, http_response, error_model)
-        end
-
-        # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
-        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 = JSON.load(response_content) unless response_content.to_s.empty?
-            unless parsed_response.nil?
-              parsed_response = StorageAccountListResult.deserialize_object(parsed_response)
-            end
-            result.body = parsed_response
-          rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
-          end
-        end
-
-        result
-      end
-
-      promise.execute
-    end
-
-    #
-    # Lists all the storage accounts available under the given resource group.
-    # Note that storage keys are not returned; use the ListKeys operation for
-    # this.
-    # @param next_page_link [String] The NextLink from the previous successful
-    # call to List operation.
-    # @param [Hash{String => String}] The hash of custom headers need to be
-    # applied to HTTP request.
-    #
-    # @return [Concurrent::Promise] Promise object which allows to get HTTP
-    # response.
-    #
-    def list_by_resource_group_next(next_page_link, custom_headers = nil)
-      fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
-      # Construct URL
-      path = "{nextLink}"
-      path['{nextLink}'] = next_page_link if path.include?('{nextLink}')
-      url = URI.parse(path)
-      properties = {}
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
-
-      # Set Headers
-      request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
-      end
-
-      promise = promise.then do |http_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(connection, http_response, error_model)
-        end
-
-        # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
-        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 = JSON.load(response_content) unless response_content.to_s.empty?
-            unless parsed_response.nil?
-              parsed_response = StorageAccountListResult.deserialize_object(parsed_response)
-            end
-            result.body = parsed_response
-          rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end