azure_mgmt_network 0.1.2 → 0.2.0

data/lib/azure_mgmt_network/models/vpn_client_revoked_certificate_properties_format.rb

@@ -0,0 +1,69 @@
+# 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
+  module Models
+    #
+    # Properties of the revoked VPN client certificate of virtual network
+    # gateway
+    #
+    class VpnClientRevokedCertificatePropertiesFormat
+
+      include MsRestAzure
+
+      # @return [String] Gets or sets the revoked Vpn client certificate
+      # thumbprint
+      attr_accessor :thumbprint
+
+      # @return [String] Gets or sets Provisioning state of the VPN client
+      # revoked certificate resource Updating/Deleting/Failed
+      attr_accessor :provisioning_state
+
+      #
+      # Validate the object. Throws ValidationError if validation fails.
+      #
+      def validate
+        # Nothing to validate
+      end
+
+      #
+      # Serializes given Model object into Ruby Hash.
+      # @param object Model object to serialize.
+      # @return [Hash] Serialized object in form of Ruby Hash.
+      #
+      def self.serialize_object(object)
+        object.validate
+        output_object = {}
+
+        serialized_property = object.thumbprint
+        output_object['thumbprint'] = serialized_property unless serialized_property.nil?
+
+        serialized_property = object.provisioning_state
+        output_object['provisioningState'] = serialized_property unless serialized_property.nil?
+
+        output_object
+      end
+
+      #
+      # Deserializes given Ruby Hash into Model object.
+      # @param object [Hash] Ruby Hash object to deserialize.
+      # @return [VpnClientRevokedCertificatePropertiesFormat] Deserialized
+      # object.
+      #
+      def self.deserialize_object(object)
+        return if object.nil?
+        output_object = VpnClientRevokedCertificatePropertiesFormat.new
+
+        deserialized_property = object['thumbprint']
+        output_object.thumbprint = deserialized_property
+
+        deserialized_property = object['provisioningState']
+        output_object.provisioning_state = deserialized_property
+
+        output_object
+      end
+    end
+  end
+end

data/lib/azure_mgmt_network/models/vpn_client_root_certificate.rb

@@ -0,0 +1,88 @@
+# 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
+  module Models
+    #
+    # VPN client root certificate of virtual network gateway
+    #
+    class VpnClientRootCertificate < MsRestAzure::SubResource
+
+      include MsRestAzure
+
+      # @return [VpnClientRootCertificatePropertiesFormat]
+      attr_accessor :properties
+
+      # @return [String] Gets name of the resource that is unique within a
+      # resource group. This name can be used to access the resource
+      attr_accessor :name
+
+      # @return [String] A unique read-only string that changes whenever the
+      # resource is updated
+      attr_accessor :etag
+
+      #
+      # Validate the object. Throws ValidationError if validation fails.
+      #
+      def validate
+        @properties.validate unless @properties.nil?
+      end
+
+      #
+      # Serializes given Model object into Ruby Hash.
+      # @param object Model object to serialize.
+      # @return [Hash] Serialized object in form of Ruby Hash.
+      #
+      def self.serialize_object(object)
+        object.validate
+        output_object = {}
+
+        serialized_property = object.id
+        output_object['id'] = serialized_property unless serialized_property.nil?
+
+        serialized_property = object.properties
+        unless serialized_property.nil?
+          serialized_property = VpnClientRootCertificatePropertiesFormat.serialize_object(serialized_property)
+        end
+        output_object['properties'] = serialized_property unless serialized_property.nil?
+
+        serialized_property = object.name
+        output_object['name'] = serialized_property unless serialized_property.nil?
+
+        serialized_property = object.etag
+        output_object['etag'] = serialized_property unless serialized_property.nil?
+
+        output_object
+      end
+
+      #
+      # Deserializes given Ruby Hash into Model object.
+      # @param object [Hash] Ruby Hash object to deserialize.
+      # @return [VpnClientRootCertificate] Deserialized object.
+      #
+      def self.deserialize_object(object)
+        return if object.nil?
+        output_object = VpnClientRootCertificate.new
+
+        deserialized_property = object['id']
+        output_object.id = deserialized_property
+
+        deserialized_property = object['properties']
+        unless deserialized_property.nil?
+          deserialized_property = VpnClientRootCertificatePropertiesFormat.deserialize_object(deserialized_property)
+        end
+        output_object.properties = deserialized_property
+
+        deserialized_property = object['name']
+        output_object.name = deserialized_property
+
+        deserialized_property = object['etag']
+        output_object.etag = deserialized_property
+
+        output_object
+      end
+    end
+  end
+end

data/lib/azure_mgmt_network/models/vpn_client_root_certificate_properties_format.rb

@@ -0,0 +1,66 @@
+# 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
+  module Models
+    #
+    # Properties of SSL certificates of application gateway
+    #
+    class VpnClientRootCertificatePropertiesFormat
+
+      include MsRestAzure
+
+      # @return [String] Gets or sets the certificate public data
+      attr_accessor :public_cert_data
+
+      # @return [String] Gets or sets Provisioning state of the VPN client
+      # root certificate resource Updating/Deleting/Failed
+      attr_accessor :provisioning_state
+
+      #
+      # Validate the object. Throws ValidationError if validation fails.
+      #
+      def validate
+        # Nothing to validate
+      end
+
+      #
+      # Serializes given Model object into Ruby Hash.
+      # @param object Model object to serialize.
+      # @return [Hash] Serialized object in form of Ruby Hash.
+      #
+      def self.serialize_object(object)
+        object.validate
+        output_object = {}
+
+        serialized_property = object.public_cert_data
+        output_object['publicCertData'] = serialized_property unless serialized_property.nil?
+
+        serialized_property = object.provisioning_state
+        output_object['provisioningState'] = serialized_property unless serialized_property.nil?
+
+        output_object
+      end
+
+      #
+      # Deserializes given Ruby Hash into Model object.
+      # @param object [Hash] Ruby Hash object to deserialize.
+      # @return [VpnClientRootCertificatePropertiesFormat] Deserialized object.
+      #
+      def self.deserialize_object(object)
+        return if object.nil?
+        output_object = VpnClientRootCertificatePropertiesFormat.new
+
+        deserialized_property = object['publicCertData']
+        output_object.public_cert_data = deserialized_property
+
+        deserialized_property = object['provisioningState']
+        output_object.provisioning_state = deserialized_property
+
+        output_object
+      end
+    end
+  end
+end

data/lib/azure_mgmt_network/models/vpn_type.rb

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

data/lib/azure_mgmt_network/module_definition.rb

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

data/lib/azure_mgmt_network/network_interfaces.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
   #
-  # NetworkInterfaces
+  # 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 NetworkInterfaces
     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
 
     #
     # The delete netwokInterface operation deletes the specified netwokInterface.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param network_interface_name [String] The name of the network interface.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -39,7 +43,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
@@ -47,6 +51,7 @@ module Azure::ARM::Network
 
     #
     # The delete netwokInterface operation deletes the specified netwokInterface.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param network_interface_name [String] The name of the network interface.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -60,60 +65,33 @@ module Azure::ARM::Network
       fail ArgumentError, 'network_interface_name is nil' if network_interface_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/networkInterfaces/{networkInterfaceName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{networkInterfaceName}'] = ERB::Util.url_encode(network_interface_name) if path.include?('{networkInterfaceName}')
-      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/networkInterfaces/{networkInterfaceName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'networkInterfaceName' => network_interface_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 == 204 || status_code == 202 || 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
@@ -125,85 +103,59 @@ module Azure::ARM::Network
     #
     # The Get ntework interface operation retreives information about the
     # specified network interface.
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param network_interface_name [String] The name of the network interface.
+    # @param expand [String] expand references resources.
     # @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(resource_group_name, network_interface_name, custom_headers = nil)
+    def get(resource_group_name, network_interface_name, expand = nil, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'network_interface_name is nil' if network_interface_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/networkInterfaces/{networkInterfaceName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{networkInterfaceName}'] = ERB::Util.url_encode(network_interface_name) if path.include?('{networkInterfaceName}')
-      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/networkInterfaces/{networkInterfaceName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'networkInterfaceName' => network_interface_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version,'$expand' => expand},
+          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 = NetworkInterface.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
 
@@ -215,6 +167,7 @@ module Azure::ARM::Network
 
     #
     # The Put NetworkInterface operation creates/updates a networkInterface
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param network_interface_name [String] The name of the network interface.
     # @param parameters [NetworkInterface] Parameters supplied to the
@@ -242,7 +195,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
@@ -250,6 +203,7 @@ module Azure::ARM::Network
 
     #
     # The Put NetworkInterface operation creates/updates a networkInterface
+    #
     # @param resource_group_name [String] The name of the resource group.
     # @param network_interface_name [String] The name of the network interface.
     # @param parameters [NetworkInterface] Parameters supplied to the
@@ -267,92 +221,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/networkInterfaces/{networkInterfaceName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{networkInterfaceName}'] = ERB::Util.url_encode(network_interface_name) if path.include?('{networkInterfaceName}')
-      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 = NetworkInterface.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/networkInterfaces/{networkInterfaceName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'networkInterfaceName' => network_interface_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 == 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 = 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 = NetworkInterface.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
           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 = NetworkInterface.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
 
@@ -363,81 +289,258 @@ module Azure::ARM::Network
     end
 
     #
-    # The List networkInterfaces opertion retrieves all the networkInterfaces in a
-    # subscription.
+    # The list network interface operation retrieves information about all network
+    # interfaces in a virtual machine from a virtual machine scale set.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param virtual_machine_scale_set_name [String] The name of the virtual
+    # machine scale set.
+    # @param virtualmachine_index [String] The virtual machine index.
     # @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_all(custom_headers = nil)
+    def list_virtual_machine_scale_set_vmnetwork_interfaces(resource_group_name, virtual_machine_scale_set_name, virtualmachine_index, custom_headers = nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'virtual_machine_scale_set_name is nil' if virtual_machine_scale_set_name.nil?
+      fail ArgumentError, 'virtualmachine_index is nil' if virtualmachine_index.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/networkInterfaces"
-      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
+      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/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualMachineScaleSetName' => virtual_machine_scale_set_name,'virtualmachineIndex' => virtualmachine_index,'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
-      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
+
+      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
+
+        # 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 = NetworkInterfaceListResult.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
-      request_headers = Hash.new
+
+      promise.execute
+    end
+
+    #
+    # The list network interface operation retrieves information about all network
+    # interfaces in a virtual machine scale set.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param virtual_machine_scale_set_name [String] The name of the virtual
+    # machine scale set.
+    # @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_virtual_machine_scale_set_network_interfaces(resource_group_name, virtual_machine_scale_set_name, custom_headers = nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'virtual_machine_scale_set_name is nil' if virtual_machine_scale_set_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?
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/networkInterfaces'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualMachineScaleSetName' => virtual_machine_scale_set_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
+          error_model = JSON.load(response_content)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
+        end
 
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
+        # 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 = NetworkInterfaceListResult.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
 
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
+      promise.execute
+    end
+
+    #
+    # The Get ntework interface operation retreives information about the
+    # specified network interface in a virtual machine scale set.
+    #
+    # @param resource_group_name [String] The name of the resource group.
+    # @param virtual_machine_scale_set_name [String] The name of the virtual
+    # machine scale set.
+    # @param virtualmachine_index [String] The virtual machine index.
+    # @param network_interface_name [String] The name of the network interface.
+    # @param expand [String] expand references resources.
+    # @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_virtual_machine_scale_set_network_interface(resource_group_name, virtual_machine_scale_set_name, virtualmachine_index, network_interface_name, expand = nil, custom_headers = nil)
+      fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
+      fail ArgumentError, 'virtual_machine_scale_set_name is nil' if virtual_machine_scale_set_name.nil?
+      fail ArgumentError, 'virtualmachine_index is nil' if virtualmachine_index.nil?
+      fail ArgumentError, 'network_interface_name is nil' if network_interface_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/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'virtualMachineScaleSetName' => virtual_machine_scale_set_name,'virtualmachineIndex' => virtualmachine_index,'networkInterfaceName' => network_interface_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version,'$expand' => expand},
+          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
+          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?
+        # 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 = NetworkInterface.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
+
+    #
+    # The List networkInterfaces opertion retrieves all the networkInterfaces in a
+    # subscription.
+    #
+    # @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_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?
+      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}/providers/Microsoft.Network/networkInterfaces'
+      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 = NetworkInterfaceListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -450,6 +553,7 @@ module Azure::ARM::Network
     #
     # The List networkInterfaces opertion retrieves all the networkInterfaces in 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.
@@ -461,71 +565,164 @@ module Azure::ARM::Network
       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.Network/networkInterfaces"
-      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
+      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.Network/networkInterfaces'
+      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
-      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
+
+      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
+
+        # 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 = NetworkInterfaceListResult.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
-      request_headers = Hash.new
+
+      promise.execute
+    end
+
+    #
+    # The list network interface operation retrieves information about all network
+    # interfaces in a virtual machine from a virtual machine scale set.
+    #
+    # @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_virtual_machine_scale_set_vmnetwork_interfaces_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?
+      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 = NetworkInterfaceListResult.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
+
+    #
+    # The list network interface operation retrieves information about all network
+    # interfaces in a virtual machine scale set.
+    #
+    # @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_virtual_machine_scale_set_network_interfaces_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 = NetworkInterfaceListResult.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
 
@@ -538,6 +735,7 @@ module Azure::ARM::Network
     #
     # The List networkInterfaces opertion retrieves all the networkInterfaces in 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
@@ -548,69 +746,43 @@ module Azure::ARM::Network
     #
     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?
-
-      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 = NetworkInterfaceListResult.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
 
@@ -623,6 +795,7 @@ module Azure::ARM::Network
     #
     # The List networkInterfaces opertion retrieves all the networkInterfaces in 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
@@ -633,69 +806,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 = NetworkInterfaceListResult.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