azure_mgmt_compute 0.1.2 → 0.2.0

data/lib/azure_mgmt_compute/virtual_machines.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::Compute
   #
-  # VirtualMachines
+  # The Compute Management Client.
   #
   class VirtualMachines
     include Azure::ARM::Compute::Models
@@ -25,6 +25,7 @@ module Azure::ARM::Compute
     #
     # Captures the VM by copying VirtualHardDisks of the VM and outputs a template
     # that can be used to create similar VMs.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param parameters [VirtualMachineCaptureParameters] Parameters supplied to
@@ -40,12 +41,12 @@ module Azure::ARM::Compute
         # Defining deserialization method.
         deserialize_method = lambda do |parsed_response|
           unless parsed_response.nil?
-            parsed_response = ComputeLongRunningOperationResult.deserialize_object(parsed_response)
+            parsed_response = VirtualMachineCaptureResult.deserialize_object(parsed_response)
           end
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -54,6 +55,7 @@ module Azure::ARM::Compute
     #
     # Captures the VM by copying VirtualHardDisks of the VM and outputs a template
     # that can be used to create similar VMs.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param parameters [VirtualMachineCaptureParameters] Parameters supplied to
@@ -71,80 +73,52 @@ module Azure::ARM::Compute
       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.Compute/virtualMachines/{vmName}/capture"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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 = VirtualMachineCaptureParameters.serialize_object(parameters)
       end
       request_content = JSON.generate(parameters, 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.Compute/virtualMachines/{vmName}/capture'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 || 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 = ComputeLongRunningOperationResult.deserialize_object(parsed_response)
+              parsed_response = VirtualMachineCaptureResult.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
 
@@ -156,6 +130,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to create or update a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param parameters [VirtualMachine] Parameters supplied to the Create Virtual
@@ -183,7 +158,7 @@ module Azure::ARM::Compute
         end
 
         # Waiting for response.
-        @client.get_put_operation_result(response, custom_headers, deserialize_method)
+        @client.get_put_operation_result(response, deserialize_method)
       end
 
       promise
@@ -191,6 +166,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to create or update a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param parameters [VirtualMachine] Parameters supplied to the Create Virtual
@@ -208,92 +184,64 @@ module Azure::ARM::Compute
       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.Compute/virtualMachines/{vmName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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 = VirtualMachine.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.Compute/virtualMachines/{vmName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 == 201 || status_code == 200)
+        unless status_code == 200 || status_code == 201
           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 == 201
+        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 = VirtualMachine.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
         # Deserialize Response
-        if status_code == 200
+        if status_code == 201
           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 = VirtualMachine.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
 
@@ -305,6 +253,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to delete a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -320,7 +269,7 @@ module Azure::ARM::Compute
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -328,6 +277,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to delete a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -341,60 +291,33 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 || status_code == 202)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 200 || status_code == 202 || 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
@@ -405,10 +328,10 @@ module Azure::ARM::Compute
 
     #
     # The operation to get a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
-    # @param expand [String] Name of the property to expand. Allowed value is null
-    # or 'instanceView'.
+    # @param expand [String] The expand expression to apply on the operation.
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
     #
@@ -420,73 +343,44 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['$expand'] = ERB::Util.url_encode(expand.to_s) unless expand.nil?
-      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.Compute/virtualMachines/{vmName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'$expand' => expand,'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 = VirtualMachine.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
 
@@ -499,6 +393,7 @@ module Azure::ARM::Compute
     #
     # Shuts down the Virtual Machine and releases the compute resources. You are
     # not billed for the compute resources that this Virtual Machine uses.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -514,7 +409,7 @@ module Azure::ARM::Compute
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -523,6 +418,7 @@ module Azure::ARM::Compute
     #
     # Shuts down the Virtual Machine and releases the compute resources. You are
     # not billed for the compute resources that this Virtual Machine uses.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -536,60 +432,33 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/deallocate"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}/deallocate'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 == 202)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 202
+          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
@@ -600,6 +469,7 @@ module Azure::ARM::Compute
 
     #
     # Sets the state of the VM as Generalized.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -613,60 +483,33 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/generalize"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}/generalize'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 200
+          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
@@ -677,6 +520,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to list virtual machines under a resource group.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
@@ -688,71 +532,44 @@ module Azure::ARM::Compute
       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.Compute/virtualMachines"
-      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.Compute/virtualMachines'
+      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 = VirtualMachineListResult.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
 
@@ -766,6 +583,7 @@ module Azure::ARM::Compute
     # Gets the list of Virtual Machines in the subscription. Use nextLink property
     # in the response to get the next page of Virtual Machines. Do this till
     # nextLink is not null to fetch all the Virtual Machines.
+    #
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
     #
@@ -775,70 +593,44 @@ module Azure::ARM::Compute
     def list_all(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.Compute/virtualMachines"
-      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.Compute/virtualMachines'
+      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 = VirtualMachineListResult.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
 
@@ -850,6 +642,7 @@ module Azure::ARM::Compute
 
     #
     # Lists virtual-machine-sizes available to be used for a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -863,72 +656,44 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/vmSizes"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}/vmSizes'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 = VirtualMachineSizeListResult.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
 
@@ -940,6 +705,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to power off (stop) a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -955,7 +721,7 @@ module Azure::ARM::Compute
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -963,6 +729,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to power off (stop) a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -976,60 +743,33 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/powerOff"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}/powerOff'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 == 202)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 202
+          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
@@ -1040,6 +780,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to restart a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -1055,7 +796,7 @@ module Azure::ARM::Compute
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -1063,6 +804,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to restart a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -1076,60 +818,33 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/restart"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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.Compute/virtualMachines/{vmName}/restart'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 == 202)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 202
+          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
@@ -1140,6 +855,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to start a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -1155,7 +871,7 @@ module Azure::ARM::Compute
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -1163,6 +879,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to start a virtual machine.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param vm_name [String] The name of the virtual machine.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -1176,60 +893,108 @@ module Azure::ARM::Compute
       fail ArgumentError, 'vm_name is nil' if vm_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.Compute/virtualMachines/{vmName}/start"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{vmName}'] = ERB::Util.url_encode(vm_name) if path.include?('{vmName}')
-      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?
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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
 
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
+      promise = promise.then do |http_response|
+        status_code = http_response.status
+        response_content = http_response.body
+        unless status_code == 202
+          error_model = JSON.load(response_content)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
+
+        # Create Result
+        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
       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?
+      promise.execute
+    end
+
+    #
+    # The operation to redeploy a virtual machine.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param vm_name [String] The name of the virtual machine.
+    # @return [Concurrent::Promise] promise which provides async access to http
+    # response.
+    #
+    def redeploy(resource_group_name, vm_name, custom_headers = nil)
+      # Send request
+      promise = begin_redeploy(resource_group_name, vm_name, custom_headers)
+
+      promise = promise.then do |response|
+        # Defining deserialization method.
+        deserialize_method = lambda do |parsed_response|
         end
+
+       # Waiting for response.
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
+      end
+
+      promise
+    end
+
+    #
+    # The operation to redeploy a virtual machine.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param vm_name [String] The name of the virtual machine.
+    # @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 begin_redeploy(resource_group_name, vm_name, custom_headers = nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'vm_name is nil' if vm_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?
+      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?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'vmName' => vm_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 == 202)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 202
+          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
@@ -1240,6 +1005,7 @@ module Azure::ARM::Compute
 
     #
     # The operation to list virtual machines under a resource group.
+    #
     # @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
@@ -1250,69 +1016,43 @@ module Azure::ARM::Compute
     #
     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
+      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 = '{nextLink}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          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 = VirtualMachineListResult.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
 
@@ -1326,6 +1066,7 @@ module Azure::ARM::Compute
     # Gets the list of Virtual Machines in the subscription. Use nextLink property
     # in the response to get the next page of Virtual Machines. Do this till
     # nextLink is not null to fetch all the Virtual Machines.
+    #
     # @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
@@ -1336,69 +1077,102 @@ module Azure::ARM::Compute
     #
     def list_all_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
+      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['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '{nextLink}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          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
 
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
+      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(request, http_response, error_model)
         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?
+        # Create Result
+        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 = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            unless parsed_response.nil?
+              parsed_response = VirtualMachineListResult.deserialize_object(parsed_response)
+            end
+            result.body = 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
+
+    #
+    # Lists virtual-machine-sizes available to be used for a virtual machine.
+    #
+    # @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_available_sizes_next(next_page_link, custom_headers = nil)
+      fail ArgumentError, 'next_page_link is nil' if next_page_link.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?
+      path_template = '{nextLink}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          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 = VirtualMachineListResult.deserialize_object(parsed_response)
+              parsed_response = VirtualMachineSizeListResult.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