diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection.py
index c638f55f4eb9..08edcdf5afea 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection.py
@@ -34,12 +34,12 @@ class ExpressRouteCrossConnection(Resource):
     :vartype secondary_azure_port: str
     :ivar s_tag: The identifier of the circuit traffic.
     :vartype s_tag: int
-    :ivar peering_location: The peering location of the ExpressRoute circuit.
-    :vartype peering_location: str
-    :ivar bandwidth_in_mbps: The circuit bandwidth In Mbps.
-    :vartype bandwidth_in_mbps: int
-    :ivar express_route_circuit: The ExpressRouteCircuit
-    :vartype express_route_circuit:
+    :param peering_location: The peering location of the ExpressRoute circuit.
+    :type peering_location: str
+    :param bandwidth_in_mbps: The circuit bandwidth In Mbps.
+    :type bandwidth_in_mbps: int
+    :param express_route_circuit: The ExpressRouteCircuit
+    :type express_route_circuit:
      ~azure.mgmt.network.v2018_02_01.models.ExpressRouteCircuitReference
     :param service_provider_provisioning_state: The provisioning state of the
      circuit in the connectivity provider system. Possible values are
@@ -67,9 +67,6 @@ class ExpressRouteCrossConnection(Resource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         's_tag': {'readonly': True},
-        'peering_location': {'readonly': True},
-        'bandwidth_in_mbps': {'readonly': True},
-        'express_route_circuit': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'etag': {'readonly': True},
     }
@@ -98,9 +95,9 @@ def __init__(self, **kwargs):
         self.primary_azure_port = None
         self.secondary_azure_port = None
         self.s_tag = None
-        self.peering_location = None
-        self.bandwidth_in_mbps = None
-        self.express_route_circuit = None
+        self.peering_location = kwargs.get('peering_location', None)
+        self.bandwidth_in_mbps = kwargs.get('bandwidth_in_mbps', None)
+        self.express_route_circuit = kwargs.get('express_route_circuit', None)
         self.service_provider_provisioning_state = kwargs.get('service_provider_provisioning_state', None)
         self.service_provider_notes = kwargs.get('service_provider_notes', None)
         self.provisioning_state = None
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering.py
index fc40e491ec08..4154d2207fa3 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering.py
@@ -50,8 +50,8 @@ class ExpressRouteCrossConnectionPeering(SubResource):
     :ivar provisioning_state: Gets the provisioning state of the public IP
      resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
     :vartype provisioning_state: str
-    :ivar gateway_manager_etag: The GatewayManager Etag.
-    :vartype gateway_manager_etag: str
+    :param gateway_manager_etag: The GatewayManager Etag.
+    :type gateway_manager_etag: str
     :param last_modified_by: Gets whether the provider or the customer last
      modified the peering.
     :type last_modified_by: str
@@ -72,7 +72,6 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         'provisioning_state': {'readonly': True},
-        'gateway_manager_etag': {'readonly': True},
         'etag': {'readonly': True},
     }
 
@@ -111,7 +110,7 @@ def __init__(self, **kwargs):
         self.vlan_id = kwargs.get('vlan_id', None)
         self.microsoft_peering_config = kwargs.get('microsoft_peering_config', None)
         self.provisioning_state = None
-        self.gateway_manager_etag = None
+        self.gateway_manager_etag = kwargs.get('gateway_manager_etag', None)
         self.last_modified_by = kwargs.get('last_modified_by', None)
         self.ipv6_peering_config = kwargs.get('ipv6_peering_config', None)
         self.name = kwargs.get('name', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering_py3.py
index 0b5a24b10771..eb8e9a2a650c 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering_py3.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering_py3.py
@@ -50,8 +50,8 @@ class ExpressRouteCrossConnectionPeering(SubResource):
     :ivar provisioning_state: Gets the provisioning state of the public IP
      resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
     :vartype provisioning_state: str
-    :ivar gateway_manager_etag: The GatewayManager Etag.
-    :vartype gateway_manager_etag: str
+    :param gateway_manager_etag: The GatewayManager Etag.
+    :type gateway_manager_etag: str
     :param last_modified_by: Gets whether the provider or the customer last
      modified the peering.
     :type last_modified_by: str
@@ -72,7 +72,6 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         'provisioning_state': {'readonly': True},
-        'gateway_manager_etag': {'readonly': True},
         'etag': {'readonly': True},
     }
 
@@ -97,7 +96,7 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int=None, primary_peer_address_prefix: str=None, secondary_peer_address_prefix: str=None, shared_key: str=None, vlan_id: int=None, microsoft_peering_config=None, last_modified_by: str=None, ipv6_peering_config=None, name: str=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int=None, primary_peer_address_prefix: str=None, secondary_peer_address_prefix: str=None, shared_key: str=None, vlan_id: int=None, microsoft_peering_config=None, gateway_manager_etag: str=None, last_modified_by: str=None, ipv6_peering_config=None, name: str=None, **kwargs) -> None:
         super(ExpressRouteCrossConnectionPeering, self).__init__(id=id, **kwargs)
         self.peering_type = peering_type
         self.state = state
@@ -111,7 +110,7 @@ def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int
         self.vlan_id = vlan_id
         self.microsoft_peering_config = microsoft_peering_config
         self.provisioning_state = None
-        self.gateway_manager_etag = None
+        self.gateway_manager_etag = gateway_manager_etag
         self.last_modified_by = last_modified_by
         self.ipv6_peering_config = ipv6_peering_config
         self.name = name
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_py3.py
index 32faab74803c..db594ff9c0d3 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_py3.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_py3.py
@@ -34,12 +34,12 @@ class ExpressRouteCrossConnection(Resource):
     :vartype secondary_azure_port: str
     :ivar s_tag: The identifier of the circuit traffic.
     :vartype s_tag: int
-    :ivar peering_location: The peering location of the ExpressRoute circuit.
-    :vartype peering_location: str
-    :ivar bandwidth_in_mbps: The circuit bandwidth In Mbps.
-    :vartype bandwidth_in_mbps: int
-    :ivar express_route_circuit: The ExpressRouteCircuit
-    :vartype express_route_circuit:
+    :param peering_location: The peering location of the ExpressRoute circuit.
+    :type peering_location: str
+    :param bandwidth_in_mbps: The circuit bandwidth In Mbps.
+    :type bandwidth_in_mbps: int
+    :param express_route_circuit: The ExpressRouteCircuit
+    :type express_route_circuit:
      ~azure.mgmt.network.v2018_02_01.models.ExpressRouteCircuitReference
     :param service_provider_provisioning_state: The provisioning state of the
      circuit in the connectivity provider system. Possible values are
@@ -67,9 +67,6 @@ class ExpressRouteCrossConnection(Resource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         's_tag': {'readonly': True},
-        'peering_location': {'readonly': True},
-        'bandwidth_in_mbps': {'readonly': True},
-        'express_route_circuit': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'etag': {'readonly': True},
     }
@@ -93,14 +90,14 @@ class ExpressRouteCrossConnection(Resource):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, location: str=None, tags=None, service_provider_provisioning_state=None, service_provider_notes: str=None, peerings=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, location: str=None, tags=None, peering_location: str=None, bandwidth_in_mbps: int=None, express_route_circuit=None, service_provider_provisioning_state=None, service_provider_notes: str=None, peerings=None, **kwargs) -> None:
         super(ExpressRouteCrossConnection, self).__init__(id=id, location=location, tags=tags, **kwargs)
         self.primary_azure_port = None
         self.secondary_azure_port = None
         self.s_tag = None
-        self.peering_location = None
-        self.bandwidth_in_mbps = None
-        self.express_route_circuit = None
+        self.peering_location = peering_location
+        self.bandwidth_in_mbps = bandwidth_in_mbps
+        self.express_route_circuit = express_route_circuit
         self.service_provider_provisioning_state = service_provider_provisioning_state
         self.service_provider_notes = service_provider_notes
         self.provisioning_state = None
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 2981aba6da52..c70b8312c12d 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
@@ -202,6 +202,7 @@ def __init__(
         self._client = ServiceClient(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)
 
@@ -310,8 +311,6 @@ 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 = {
@@ -323,7 +322,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("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.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 30defb666ec1..7d103684e4b7 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,6 +25,8 @@ 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
@@ -34,14 +36,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 = {
@@ -53,7 +55,7 @@ def _delete_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -139,8 +141,6 @@ 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("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -190,8 +190,6 @@ 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 = {
@@ -203,7 +201,7 @@ def _create_or_update_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -298,8 +296,6 @@ 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 = {
@@ -311,7 +307,7 @@ def _update_tags_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -411,8 +407,6 @@ 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:
@@ -425,7 +419,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -480,8 +474,6 @@ 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:
@@ -495,7 +487,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -537,8 +529,6 @@ 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 = {
@@ -550,7 +540,7 @@ def _get_effective_route_table_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -633,8 +623,6 @@ 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 = {
@@ -646,7 +634,7 @@ def _list_effective_network_security_groups_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -749,8 +737,6 @@ 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:
@@ -766,7 +752,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -824,8 +810,6 @@ 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:
@@ -840,7 +824,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -904,8 +888,6 @@ 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 = {
@@ -919,7 +901,7 @@ def get_virtual_machine_scale_set_network_interface(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -980,8 +962,6 @@ 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:
@@ -998,7 +978,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
                 if expand is not None:
                     query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -1069,8 +1049,6 @@ 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 = {
@@ -1085,7 +1063,7 @@ def get_virtual_machine_scale_set_ip_configuration(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.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 b671457dfb20..45745a137e41 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,6 +25,8 @@ 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
@@ -34,14 +36,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 = {
@@ -53,7 +55,7 @@ def _delete_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -139,8 +141,6 @@ 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("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
         if expand is not None:
             query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
 
@@ -190,8 +190,6 @@ 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 = {
@@ -203,7 +201,7 @@ def _create_or_update_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -298,8 +296,6 @@ 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 = {
@@ -311,7 +307,7 @@ def _update_tags_initial(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
         header_parameters = {}
@@ -411,8 +407,6 @@ 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:
@@ -425,7 +419,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -480,8 +474,6 @@ 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:
@@ -495,7 +487,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -554,8 +546,6 @@ 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:
@@ -570,7 +560,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -635,8 +625,6 @@ 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:
@@ -654,7 +642,7 @@ def internal_paging(next_link=None, raw=False):
 
                 # Construct parameters
                 query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
             else:
                 url = next_link
@@ -722,8 +710,6 @@ 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 = {
@@ -739,7 +725,7 @@ def get_virtual_machine_scale_set_public_ip_address(
 
         # Construct parameters
         query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.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 53a203f32aaf..848a6c9f9e92 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 = ""
+VERSION = "2018-02-01"