azure_mgmt_network 0.1.2 → 0.2.0

data/lib/azure_mgmt_network/usages.rb

@@ -1,11 +1,14 @@
 # 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::Network
   #
-  # Usages
+  # The Microsoft Azure Network management API provides a RESTful set of web
+  # services that interact with Microsoft Azure Networks service to manage
+  # your network resrources. The API has entities that capture the
+  # relationship between an end user and the Microsoft Azure Networks service.
   #
   class Usages
     include Azure::ARM::Network::Models
@@ -19,11 +22,12 @@ module Azure::ARM::Network
       @client = client
     end
 
-    # @return reference to the NetworkResourceProviderClient
+    # @return reference to the NetworkManagementClient
     attr_reader :client
 
     #
     # Lists compute usages for a subscription.
+    #
     # @param location [String] The location upon which resource usage is queried.
     # @param [Hash{String => String}] The hash of custom headers need to be
     # applied to HTTP request.
@@ -35,71 +39,103 @@ module Azure::ARM::Network
       fail ArgumentError, 'location is nil' if location.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.Network/locations/{location}/usages"
-      path['{location}'] = ERB::Util.url_encode(location) if path.include?('{location}')
-      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}/providers/Microsoft.Network/locations/{location}/usages'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'location' => location,'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
 
-      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 = UsagesListResult.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 compute usages for a subscription.
+    #
+    # @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?
+      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 = UsagesListResult.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
 

data/lib/azure_mgmt_network/version.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::ARM::Network
-  VERSION = '0.1.2'
+    VERSION = '0.2.0'
 end

data/lib/azure_mgmt_network/virtual_network_gateway_connections.rb

@@ -1,11 +1,14 @@
 # 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::Network
   #
-  # VirtualNetworkGatewayConnections
+  # The Microsoft Azure Network management API provides a RESTful set of web
+  # services that interact with Microsoft Azure Networks service to manage
+  # your network resrources. The API has entities that capture the
+  # relationship between an end user and the Microsoft Azure Networks service.
   #
   class VirtualNetworkGatewayConnections
     include Azure::ARM::Network::Models
@@ -19,13 +22,14 @@ module Azure::ARM::Network
       @client = client
     end
 
-    # @return reference to the NetworkResourceProviderClient
+    # @return reference to the NetworkManagementClient
     attr_reader :client
 
     #
     # The Put VirtualNetworkGatewayConnection operation creates/updates a virtual
     # network gateway connection in the specified resource group through Network
     # resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The name of the
     # virtual network gateway conenction.
@@ -55,7 +59,7 @@ module Azure::ARM::Network
         end
 
         # Waiting for response.
-        @client.get_put_operation_result(response, custom_headers, deserialize_method)
+        @client.get_put_operation_result(response, deserialize_method)
       end
 
       promise
@@ -65,6 +69,7 @@ module Azure::ARM::Network
     # The Put VirtualNetworkGatewayConnection operation creates/updates a virtual
     # network gateway connection in the specified resource group through Network
     # resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The name of the
     # virtual network gateway conenction.
@@ -84,92 +89,64 @@ module Azure::ARM::Network
       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.Network/connections/{virtualNetworkGatewayConnectionName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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 = VirtualNetworkGatewayConnection.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.Network/connections/{virtualNetworkGatewayConnectionName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualNetworkGatewayConnectionName' => virtual_network_gateway_connection_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 == 201)
+        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 == 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 = VirtualNetworkGatewayConnection.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 == 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 = VirtualNetworkGatewayConnection.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
 
@@ -183,6 +160,7 @@ module Azure::ARM::Network
     # The Get VirtualNetworkGatewayConnection operation retrieves information
     # about the specified virtual network gateway connection through Network
     # resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The name of the
     # virtual network gateway connection.
@@ -197,72 +175,44 @@ module Azure::ARM::Network
       fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_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.Network/connections/{virtualNetworkGatewayConnectionName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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.Network/connections/{virtualNetworkGatewayConnectionName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualNetworkGatewayConnectionName' => virtual_network_gateway_connection_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 = VirtualNetworkGatewayConnection.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
 
@@ -275,6 +225,7 @@ module Azure::ARM::Network
     #
     # The Delete VirtualNetworkGatewayConnection operation deletes the specifed
     # virtual network Gateway connection through Network resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The name of the
     # virtual network gateway connection.
@@ -291,7 +242,7 @@ module Azure::ARM::Network
         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
@@ -300,6 +251,7 @@ module Azure::ARM::Network
     #
     # The Delete VirtualNetworkGatewayConnection operation deletes the specifed
     # virtual network Gateway connection through Network resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The name of the
     # virtual network gateway connection.
@@ -314,60 +266,33 @@ module Azure::ARM::Network
       fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_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.Network/connections/{virtualNetworkGatewayConnectionName}/"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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.Network/connections/{virtualNetworkGatewayConnectionName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualNetworkGatewayConnectionName' => virtual_network_gateway_connection_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 == 202 || status_code == 204)
-          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
@@ -380,86 +305,59 @@ module Azure::ARM::Network
     # The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves
     # information about the specified virtual network gateway connection shared
     # key through Network resource provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
-    # @param virtual_network_gateway_connection_name [String] The virtual network
-    # gateway connection shared key name.
+    # @param connection_shared_key_name [String] The virtual network gateway
+    # connection shared key name.
     # @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 get_shared_key(resource_group_name, virtual_network_gateway_connection_name, custom_headers = nil)
+    def get_shared_key(resource_group_name, connection_shared_key_name, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
-      fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_name.nil?
+      fail ArgumentError, 'connection_shared_key_name is nil' if connection_shared_key_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.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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.Network/connections/{connectionSharedKeyName}/sharedkey'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'connectionSharedKeyName' => connection_shared_key_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 = ConnectionSharedKey.deserialize_object(parsed_response)
+              parsed_response = ConnectionSharedKeyResult.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
 
@@ -470,155 +368,58 @@ module Azure::ARM::Network
     end
 
     #
-    # The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual
-    # network gateway connection shared key for passed virtual network gateway
-    # connection in the specified resource group through Network resource
-    # provider.
-    # @param resource_group_name [String] The name of the resource group.
-    # @param virtual_network_gateway_connection_name [String] The virtual network
-    # gateway connection name.
-    # @param parameters [ConnectionSharedKey] Parameters supplied to the Begin Set
-    # Virtual Network Gateway conection Shared key operation throughNetwork
-    # resource provider.
-    # @param @client.api_version [String] Client Api Version.
-    # @param @client.subscription_id [String] Gets subscription credentials which
-    # uniquely identify Microsoft Azure subscription. The subscription ID forms
-    # part of the URI for every service call.
-    # @param @client.accept_language [String] Gets or sets the preferred language
-    # for the response.
-    #
-    # @return [Concurrent::Promise] promise which provides async access to http
-    # response.
-    #
-    def set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
-      # Send request
-      promise = begin_set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers)
-
-      promise = promise.then do |response|
-        # Defining deserialization method.
-        deserialize_method = lambda do |parsed_response|
-          unless parsed_response.nil?
-            parsed_response = ConnectionSharedKey.deserialize_object(parsed_response)
-          end
-        end
-
-        # Waiting for response.
-        @client.get_put_operation_result(response, custom_headers, deserialize_method)
-      end
-
-      promise
-    end
-
+    # The List VirtualNetworkGatewayConnections operation retrieves all the
+    # virtual network gateways connections created.
     #
-    # The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual
-    # network gateway connection shared key for passed virtual network gateway
-    # connection in the specified resource group through Network resource
-    # provider.
     # @param resource_group_name [String] The name of the resource group.
-    # @param virtual_network_gateway_connection_name [String] The virtual network
-    # gateway connection name.
-    # @param parameters [ConnectionSharedKey] Parameters supplied to the Begin Set
-    # Virtual Network Gateway conection Shared key operation throughNetwork
-    # resource provider.
     # @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_set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
+    def list(resource_group_name, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
-      fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_name.nil?
-      fail ArgumentError, 'parameters is nil' if parameters.nil?
-      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.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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
-
-      # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
-      unless parameters.nil?
-        parameters = ConnectionSharedKey.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
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections'
+      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 || status_code == 201)
+        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?
-            unless parsed_response.nil?
-              parsed_response = ConnectionSharedKey.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
-        # Deserialize Response
-        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 = ConnectionSharedKey.deserialize_object(parsed_response)
+              parsed_response = VirtualNetworkGatewayConnectionListResult.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
 
@@ -629,84 +430,110 @@ module Azure::ARM::Network
     end
 
     #
-    # The List VirtualNetworkGatewayConnections operation retrieves all the
-    # virtual network gateways connections created.
+    # The VirtualNetworkGatewayConnectionResetSharedKey operation resets the
+    # virtual network gateway connection shared key for passed virtual network
+    # gateway connection in the specified resource group through Network resource
+    # provider.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param virtual_network_gateway_connection_name [String] The virtual network
+    # gateway connection reset shared key Name.
+    # @param parameters [ConnectionResetSharedKey] Parameters supplied to the
+    # Begin Reset Virtual Network Gateway connection shared key operation through
+    # Network resource provider.
+    # @return [Concurrent::Promise] promise which provides async access to http
+    # response.
+    #
+    def reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
+      # Send request
+      promise = begin_reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers)
+
+      promise = promise.then do |response|
+        # Defining deserialization method.
+        deserialize_method = lambda do |parsed_response|
+          unless parsed_response.nil?
+            parsed_response = ConnectionResetSharedKey.deserialize_object(parsed_response)
+          end
+        end
+
+       # Waiting for response.
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
+      end
+
+      promise
+    end
+
+    #
+    # The VirtualNetworkGatewayConnectionResetSharedKey operation resets the
+    # virtual network gateway connection shared key for passed virtual network
+    # gateway connection in the specified resource group through Network resource
+    # provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
+    # @param virtual_network_gateway_connection_name [String] The virtual network
+    # gateway connection reset shared key Name.
+    # @param parameters [ConnectionResetSharedKey] Parameters supplied to the
+    # Begin Reset Virtual Network Gateway connection shared key operation through
+    # Network resource provider.
     # @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(resource_group_name, custom_headers = nil)
+    def begin_reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_name.nil?
+      fail ArgumentError, 'parameters is nil' if parameters.nil?
+      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.Network/connections"
-      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?
+      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
+      # Serialize Request
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
+      unless parameters.nil?
+        parameters = ConnectionResetSharedKey.serialize_object(parameters)
       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_content = JSON.generate(parameters, quirks_mode: true)
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey/reset'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualNetworkGatewayConnectionName' => virtual_network_gateway_connection_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 || 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 = VirtualNetworkGatewayConnectionListResult.deserialize_object(parsed_response)
+              parsed_response = ConnectionResetSharedKey.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
 
@@ -717,136 +544,129 @@ module Azure::ARM::Network
     end
 
     #
-    # The VirtualNetworkGatewayConnectionResetSharedKey operation resets the
-    # virtual network gateway connection shared key for passed virtual network
-    # gateway connection in the specified resource group through Network resource
+    # The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual
+    # network gateway connection shared key for passed virtual network gateway
+    # connection in the specified resource group through Network resource
     # provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The virtual network
-    # gateway connection reset shared key Name.
-    # @param parameters [ConnectionResetSharedKey] Parameters supplied to the
-    # Begin Reset Virtual Network Gateway connection shared key operation through
-    # Network resource provider.
+    # gateway connection name.
+    # @param parameters [ConnectionSharedKey] Parameters supplied to the Begin Set
+    # Virtual Network Gateway conection Shared key operation throughNetwork
+    # resource provider.
+    # @param @client.api_version [String] Client Api Version.
+    # @param @client.subscription_id [String] Gets subscription credentials which
+    # uniquely identify Microsoft Azure subscription. The subscription ID forms
+    # part of the URI for every service call.
+    # @param @client.accept_language [String] Gets or sets the preferred language
+    # for the response.
+    #
     # @return [Concurrent::Promise] promise which provides async access to http
     # response.
     #
-    def reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
+    def set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
       # Send request
-      promise = begin_reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers)
+      promise = begin_set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers)
 
       promise = promise.then do |response|
         # Defining deserialization method.
         deserialize_method = lambda do |parsed_response|
           unless parsed_response.nil?
-            parsed_response = ConnectionResetSharedKey.deserialize_object(parsed_response)
+            parsed_response = ConnectionSharedKey.deserialize_object(parsed_response)
           end
         end
 
-       # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+        # Waiting for response.
+        @client.get_put_operation_result(response, deserialize_method)
       end
 
       promise
     end
 
     #
-    # The VirtualNetworkGatewayConnectionResetSharedKey operation resets the
-    # virtual network gateway connection shared key for passed virtual network
-    # gateway connection in the specified resource group through Network resource
+    # The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual
+    # network gateway connection shared key for passed virtual network gateway
+    # connection in the specified resource group through Network resource
     # provider.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param virtual_network_gateway_connection_name [String] The virtual network
-    # gateway connection reset shared key Name.
-    # @param parameters [ConnectionResetSharedKey] Parameters supplied to the
-    # Begin Reset Virtual Network Gateway connection shared key operation through
-    # Network resource provider.
+    # gateway connection name.
+    # @param parameters [ConnectionSharedKey] Parameters supplied to the Begin Set
+    # Virtual Network Gateway conection Shared key operation throughNetwork
+    # resource provider.
     # @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_reset_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
+    def begin_set_shared_key(resource_group_name, virtual_network_gateway_connection_name, parameters, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'virtual_network_gateway_connection_name is nil' if virtual_network_gateway_connection_name.nil?
       fail ArgumentError, 'parameters is nil' if parameters.nil?
       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.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey/reset"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{virtualNetworkGatewayConnectionName}'] = ERB::Util.url_encode(virtual_network_gateway_connection_name) if path.include?('{virtualNetworkGatewayConnectionName}')
-      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 = ConnectionResetSharedKey.serialize_object(parameters)
+        parameters = ConnectionSharedKey.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.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualNetworkGatewayConnectionName' => virtual_network_gateway_connection_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 == 201 || 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 == 201
+          begin
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
+            unless parsed_response.nil?
+              parsed_response = ConnectionSharedKey.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
+        # 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 = ConnectionResetSharedKey.deserialize_object(parsed_response)
+              parsed_response = ConnectionSharedKey.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
 
@@ -859,6 +679,7 @@ module Azure::ARM::Network
     #
     # The List VirtualNetworkGatewayConnections operation retrieves all the
     # virtual network gateways connections created.
+    #
     # @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
@@ -869,69 +690,43 @@ module Azure::ARM::Network
     #
     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 = VirtualNetworkGatewayConnectionListResult.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