diff --git a/azure-mgmt-network/azure/mgmt/network/v2015_06_15/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2015_06_15/network_management_client.py
index 83d61852c713..67ebc03a056b 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2015_06_15/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2015_06_15/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -73,7 +73,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -130,7 +130,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2015-06-15'
diff --git a/azure-mgmt-network/azure/mgmt/network/v2016_09_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2016_09_01/network_management_client.py
index 42cc01c5a2db..7100a271308e 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2016_09_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2016_09_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -76,7 +76,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -139,7 +139,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-09-01'
diff --git a/azure-mgmt-network/azure/mgmt/network/v2016_12_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2016_12_01/network_management_client.py
index e3add9ad6aaf..2e6c8cbfcd31 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2016_12_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2016_12_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -79,7 +79,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -148,7 +148,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-12-01'
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_03_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_03_01/network_management_client.py
index 9b7710270611..2038ad13a152 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_03_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_03_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -79,7 +79,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -148,7 +148,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_06_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_06_01/network_management_client.py
index e22c7eac3c70..75784b8b0a08 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_06_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_06_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -89,7 +89,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -178,7 +178,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/network_management_client.py
index a80115b17ca8..0928a3bcc00c 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -89,7 +89,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -178,7 +178,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_09_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_09_01/network_management_client.py
index a26ee74b754a..a6660a669738 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_09_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_09_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -91,7 +91,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -184,7 +184,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_10_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_10_01/network_management_client.py
index 8b37e2000264..a8705d53fdbc 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_10_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_10_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -92,7 +92,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -187,7 +187,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_11_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2017_11_01/network_management_client.py
index 35b21d404d8e..a35d83f8360a 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2017_11_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2017_11_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -92,7 +92,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -187,7 +187,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_01_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_01_01/network_management_client.py
index 398496371570..33c858d31bb0 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_01_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_01_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -92,7 +92,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -187,7 +187,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/network_management_client.py
index c70b8312c12d..7dcc83da9494 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/network_management_client.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/network_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -96,7 +96,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class NetworkManagementClient(object):
+class NetworkManagementClient(SDKClient):
     """Network Client
 
     :ivar config: Configuration for client.
@@ -199,10 +199,9 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = NetworkManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(NetworkManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-02-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -311,6 +310,8 @@ def check_dns_name_availability(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.check_dns_name_availability.metadata['url']
         path_format_arguments = {
@@ -322,7 +323,7 @@ def check_dns_name_availability(
         # Construct parameters
         query_parameters = {}
         query_parameters['domainNameLabel'] = self._serialize.query("domain_name_label", domain_name_label, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_interfaces_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_interfaces_operations.py
index 7d103684e4b7..30defb666ec1 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_interfaces_operations.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_interfaces_operations.py
@@ -25,8 +25,6 @@ class NetworkInterfacesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API version. Constant value: "2018-02-01".
-    :ivar api_version: Client API version. Constant value: "2018-02-01".
     """
 
     models = models
@@ -36,14 +34,14 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-02-01"
-        self.api_version = "2018-02-01"
 
         self.config = config
 
 
     def _delete_initial(
             self, resource_group_name, network_interface_name, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
@@ -55,7 +53,7 @@ def _delete_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -141,6 +139,8 @@ def get(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.get.metadata['url']
         path_format_arguments = {
@@ -152,7 +152,7 @@ def get(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -190,6 +190,8 @@ def get(
 
     def _create_or_update_initial(
             self, resource_group_name, network_interface_name, parameters, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -201,7 +203,7 @@ def _create_or_update_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -296,6 +298,8 @@ def _update_tags_initial(
             self, resource_group_name, network_interface_name, tags=None, custom_headers=None, raw=False, **operation_config):
         parameters = models.TagsObject(tags=tags)
 
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.update_tags.metadata['url']
         path_format_arguments = {
@@ -307,7 +311,7 @@ def _update_tags_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -407,6 +411,8 @@ def list_all(
          ~azure.mgmt.network.v2018_02_01.models.NetworkInterfacePaged[~azure.mgmt.network.v2018_02_01.models.NetworkInterface]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -419,7 +425,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -474,6 +480,8 @@ def list(
          ~azure.mgmt.network.v2018_02_01.models.NetworkInterfacePaged[~azure.mgmt.network.v2018_02_01.models.NetworkInterface]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -487,7 +495,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -529,6 +537,8 @@ def internal_paging(next_link=None, raw=False):
 
     def _get_effective_route_table_initial(
             self, resource_group_name, network_interface_name, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.get_effective_route_table.metadata['url']
         path_format_arguments = {
@@ -540,7 +550,7 @@ def _get_effective_route_table_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -623,6 +633,8 @@ def get_long_running_output(response):
 
     def _list_effective_network_security_groups_initial(
             self, resource_group_name, network_interface_name, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.list_effective_network_security_groups.metadata['url']
         path_format_arguments = {
@@ -634,7 +646,7 @@ def _list_effective_network_security_groups_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -737,6 +749,8 @@ def list_virtual_machine_scale_set_vm_network_interfaces(
          ~azure.mgmt.network.v2018_02_01.models.NetworkInterfacePaged[~azure.mgmt.network.v2018_02_01.models.NetworkInterface]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -752,7 +766,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -810,6 +824,8 @@ def list_virtual_machine_scale_set_network_interfaces(
          ~azure.mgmt.network.v2018_02_01.models.NetworkInterfacePaged[~azure.mgmt.network.v2018_02_01.models.NetworkInterface]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -824,7 +840,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -888,6 +904,8 @@ def get_virtual_machine_scale_set_network_interface(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         # Construct URL
         url = self.get_virtual_machine_scale_set_network_interface.metadata['url']
         path_format_arguments = {
@@ -901,7 +919,7 @@ def get_virtual_machine_scale_set_network_interface(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -962,6 +980,8 @@ def list_virtual_machine_scale_set_ip_configurations(
          ~azure.mgmt.network.v2018_02_01.models.NetworkInterfaceIPConfigurationPaged[~azure.mgmt.network.v2018_02_01.models.NetworkInterfaceIPConfiguration]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -978,7 +998,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
                 if expand is not None:
                     query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -1049,6 +1069,8 @@ def get_virtual_machine_scale_set_ip_configuration(
          or ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         # Construct URL
         url = self.get_virtual_machine_scale_set_ip_configuration.metadata['url']
         path_format_arguments = {
@@ -1063,7 +1085,7 @@ def get_virtual_machine_scale_set_ip_configuration(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/public_ip_addresses_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/public_ip_addresses_operations.py
index 45745a137e41..b671457dfb20 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/public_ip_addresses_operations.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/public_ip_addresses_operations.py
@@ -25,8 +25,6 @@ class PublicIPAddressesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API version. Constant value: "2018-02-01".
-    :ivar api_version: Client API version. Constant value: "2018-02-01".
     """
 
     models = models
@@ -36,14 +34,14 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-02-01"
-        self.api_version = "2018-02-01"
 
         self.config = config
 
 
     def _delete_initial(
             self, resource_group_name, public_ip_address_name, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
@@ -55,7 +53,7 @@ def _delete_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -141,6 +139,8 @@ def get(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.get.metadata['url']
         path_format_arguments = {
@@ -152,7 +152,7 @@ def get(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -190,6 +190,8 @@ def get(
 
     def _create_or_update_initial(
             self, resource_group_name, public_ip_address_name, parameters, custom_headers=None, raw=False, **operation_config):
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -201,7 +203,7 @@ def _create_or_update_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -296,6 +298,8 @@ def _update_tags_initial(
             self, resource_group_name, public_ip_address_name, tags=None, custom_headers=None, raw=False, **operation_config):
         parameters = models.TagsObject(tags=tags)
 
+        api_version = "2018-02-01"
+
         # Construct URL
         url = self.update_tags.metadata['url']
         path_format_arguments = {
@@ -307,7 +311,7 @@ def _update_tags_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -407,6 +411,8 @@ def list_all(
          ~azure.mgmt.network.v2018_02_01.models.PublicIPAddressPaged[~azure.mgmt.network.v2018_02_01.models.PublicIPAddress]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -419,7 +425,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -474,6 +480,8 @@ def list(
          ~azure.mgmt.network.v2018_02_01.models.PublicIPAddressPaged[~azure.mgmt.network.v2018_02_01.models.PublicIPAddress]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2018-02-01"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -487,7 +495,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -546,6 +554,8 @@ def list_virtual_machine_scale_set_public_ip_addresses(
          ~azure.mgmt.network.v2018_02_01.models.PublicIPAddressPaged[~azure.mgmt.network.v2018_02_01.models.PublicIPAddress]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -560,7 +570,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -625,6 +635,8 @@ def list_virtual_machine_scale_set_vm_public_ip_addresses(
          ~azure.mgmt.network.v2018_02_01.models.PublicIPAddressPaged[~azure.mgmt.network.v2018_02_01.models.PublicIPAddress]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
@@ -642,7 +654,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
 
             else:
                 url = next_link
@@ -710,6 +722,8 @@ def get_virtual_machine_scale_set_public_ip_address(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        api_version = "2017-03-30"
+
         # Construct URL
         url = self.get_virtual_machine_scale_set_public_ip_address.metadata['url']
         path_format_arguments = {
@@ -725,7 +739,7 @@ def get_virtual_machine_scale_set_public_ip_address(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/version.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/version.py
index 848a6c9f9e92..53a203f32aaf 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/version.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2018-02-01"
+VERSION = ""