diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/__init__.py
index 5507d65b9320..ff1a5ebc2576 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/__init__.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/__init__.py
@@ -136,6 +136,9 @@
     from .flow_log_information_py3 import FlowLogInformation
     from .connectivity_source_py3 import ConnectivitySource
     from .connectivity_destination_py3 import ConnectivityDestination
+    from .http_header_py3 import HTTPHeader
+    from .http_configuration_py3 import HTTPConfiguration
+    from .protocol_configuration_py3 import ProtocolConfiguration
     from .connectivity_parameters_py3 import ConnectivityParameters
     from .connectivity_issue_py3 import ConnectivityIssue
     from .connectivity_hop_py3 import ConnectivityHop
@@ -326,6 +329,9 @@
     from .flow_log_information import FlowLogInformation
     from .connectivity_source import ConnectivitySource
     from .connectivity_destination import ConnectivityDestination
+    from .http_header import HTTPHeader
+    from .http_configuration import HTTPConfiguration
+    from .protocol_configuration import ProtocolConfiguration
     from .connectivity_parameters import ConnectivityParameters
     from .connectivity_issue import ConnectivityIssue
     from .connectivity_hop import ConnectivityHop
@@ -471,15 +477,18 @@
     ProvisioningState,
     AssociationType,
     Direction,
-    Protocol,
+    IpFlowProtocol,
     NextHopType,
     PcProtocol,
     PcStatus,
     PcError,
+    Protocol,
+    HTTPMethod,
     Origin,
     Severity,
     IssueType,
     ConnectionStatus,
+    ConnectionMonitorSourceStatus,
     ConnectionState,
     EvaluationState,
     VirtualNetworkPeeringState,
@@ -628,6 +637,9 @@
     'FlowLogInformation',
     'ConnectivitySource',
     'ConnectivityDestination',
+    'HTTPHeader',
+    'HTTPConfiguration',
+    'ProtocolConfiguration',
     'ConnectivityParameters',
     'ConnectivityIssue',
     'ConnectivityHop',
@@ -772,15 +784,18 @@
     'ProvisioningState',
     'AssociationType',
     'Direction',
-    'Protocol',
+    'IpFlowProtocol',
     'NextHopType',
     'PcProtocol',
     'PcStatus',
     'PcError',
+    'Protocol',
+    'HTTPMethod',
     'Origin',
     'Severity',
     'IssueType',
     'ConnectionStatus',
+    'ConnectionMonitorSourceStatus',
     'ConnectionState',
     'EvaluationState',
     'VirtualNetworkPeeringState',
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result.py
index 185d6d8ff082..ce397efcf457 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result.py
@@ -15,15 +15,21 @@
 class ConnectionMonitorQueryResult(Model):
     """List of connection states snaphots.
 
+    :param source_status: Status of connection monitor source. Possible values
+     include: 'Uknown', 'Active', 'Inactive'
+    :type source_status: str or
+     ~azure.mgmt.network.v2018_02_01.models.ConnectionMonitorSourceStatus
     :param states: Information about connection states.
     :type states:
      list[~azure.mgmt.network.v2018_02_01.models.ConnectionStateSnapshot]
     """
 
     _attribute_map = {
+        'source_status': {'key': 'sourceStatus', 'type': 'str'},
         'states': {'key': 'states', 'type': '[ConnectionStateSnapshot]'},
     }
 
     def __init__(self, **kwargs):
         super(ConnectionMonitorQueryResult, self).__init__(**kwargs)
+        self.source_status = kwargs.get('source_status', None)
         self.states = kwargs.get('states', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result_py3.py
index 709ffee65608..0160e1073746 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result_py3.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connection_monitor_query_result_py3.py
@@ -15,15 +15,21 @@
 class ConnectionMonitorQueryResult(Model):
     """List of connection states snaphots.
 
+    :param source_status: Status of connection monitor source. Possible values
+     include: 'Uknown', 'Active', 'Inactive'
+    :type source_status: str or
+     ~azure.mgmt.network.v2018_02_01.models.ConnectionMonitorSourceStatus
     :param states: Information about connection states.
     :type states:
      list[~azure.mgmt.network.v2018_02_01.models.ConnectionStateSnapshot]
     """
 
     _attribute_map = {
+        'source_status': {'key': 'sourceStatus', 'type': 'str'},
         'states': {'key': 'states', 'type': '[ConnectionStateSnapshot]'},
     }
 
-    def __init__(self, *, states=None, **kwargs) -> None:
+    def __init__(self, *, source_status=None, states=None, **kwargs) -> None:
         super(ConnectionMonitorQueryResult, self).__init__(**kwargs)
+        self.source_status = source_status
         self.states = states
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters.py
index de68b5365705..92024b70765e 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters.py
@@ -22,6 +22,12 @@ class ConnectivityParameters(Model):
     :param destination: Required.
     :type destination:
      ~azure.mgmt.network.v2018_02_01.models.ConnectivityDestination
+    :param protocol: Network protocol. Possible values include: 'Tcp', 'Http',
+     'Https', 'Icmp'
+    :type protocol: str or ~azure.mgmt.network.v2018_02_01.models.Protocol
+    :param protocol_configuration:
+    :type protocol_configuration:
+     ~azure.mgmt.network.v2018_02_01.models.ProtocolConfiguration
     """
 
     _validation = {
@@ -32,9 +38,13 @@ class ConnectivityParameters(Model):
     _attribute_map = {
         'source': {'key': 'source', 'type': 'ConnectivitySource'},
         'destination': {'key': 'destination', 'type': 'ConnectivityDestination'},
+        'protocol': {'key': 'protocol', 'type': 'str'},
+        'protocol_configuration': {'key': 'protocolConfiguration', 'type': 'ProtocolConfiguration'},
     }
 
     def __init__(self, **kwargs):
         super(ConnectivityParameters, self).__init__(**kwargs)
         self.source = kwargs.get('source', None)
         self.destination = kwargs.get('destination', None)
+        self.protocol = kwargs.get('protocol', None)
+        self.protocol_configuration = kwargs.get('protocol_configuration', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters_py3.py
index a9aa95791c2b..2f6d375168c5 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters_py3.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/connectivity_parameters_py3.py
@@ -22,6 +22,12 @@ class ConnectivityParameters(Model):
     :param destination: Required.
     :type destination:
      ~azure.mgmt.network.v2018_02_01.models.ConnectivityDestination
+    :param protocol: Network protocol. Possible values include: 'Tcp', 'Http',
+     'Https', 'Icmp'
+    :type protocol: str or ~azure.mgmt.network.v2018_02_01.models.Protocol
+    :param protocol_configuration:
+    :type protocol_configuration:
+     ~azure.mgmt.network.v2018_02_01.models.ProtocolConfiguration
     """
 
     _validation = {
@@ -32,9 +38,13 @@ class ConnectivityParameters(Model):
     _attribute_map = {
         'source': {'key': 'source', 'type': 'ConnectivitySource'},
         'destination': {'key': 'destination', 'type': 'ConnectivityDestination'},
+        'protocol': {'key': 'protocol', 'type': 'str'},
+        'protocol_configuration': {'key': 'protocolConfiguration', 'type': 'ProtocolConfiguration'},
     }
 
-    def __init__(self, *, source, destination, **kwargs) -> None:
+    def __init__(self, *, source, destination, protocol=None, protocol_configuration=None, **kwargs) -> None:
         super(ConnectivityParameters, self).__init__(**kwargs)
         self.source = source
         self.destination = destination
+        self.protocol = protocol
+        self.protocol_configuration = protocol_configuration
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration.py
new file mode 100644
index 000000000000..9a15da5a81c7
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration.py
@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HTTPConfiguration(Model):
+    """HTTP configuration of the connectivity check.
+
+    :param method: HTTP method. Possible values include: 'Get'
+    :type method: str or ~azure.mgmt.network.v2018_02_01.models.HTTPMethod
+    :param headers: List of HTTP headers.
+    :type headers: list[~azure.mgmt.network.v2018_02_01.models.HTTPHeader]
+    :param valid_status_codes: Valid status codes.
+    :type valid_status_codes: list[int]
+    """
+
+    _attribute_map = {
+        'method': {'key': 'method', 'type': 'str'},
+        'headers': {'key': 'headers', 'type': '[HTTPHeader]'},
+        'valid_status_codes': {'key': 'validStatusCodes', 'type': '[int]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HTTPConfiguration, self).__init__(**kwargs)
+        self.method = kwargs.get('method', None)
+        self.headers = kwargs.get('headers', None)
+        self.valid_status_codes = kwargs.get('valid_status_codes', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration_py3.py
new file mode 100644
index 000000000000..a748c2cf5dba
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_configuration_py3.py
@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HTTPConfiguration(Model):
+    """HTTP configuration of the connectivity check.
+
+    :param method: HTTP method. Possible values include: 'Get'
+    :type method: str or ~azure.mgmt.network.v2018_02_01.models.HTTPMethod
+    :param headers: List of HTTP headers.
+    :type headers: list[~azure.mgmt.network.v2018_02_01.models.HTTPHeader]
+    :param valid_status_codes: Valid status codes.
+    :type valid_status_codes: list[int]
+    """
+
+    _attribute_map = {
+        'method': {'key': 'method', 'type': 'str'},
+        'headers': {'key': 'headers', 'type': '[HTTPHeader]'},
+        'valid_status_codes': {'key': 'validStatusCodes', 'type': '[int]'},
+    }
+
+    def __init__(self, *, method=None, headers=None, valid_status_codes=None, **kwargs) -> None:
+        super(HTTPConfiguration, self).__init__(**kwargs)
+        self.method = method
+        self.headers = headers
+        self.valid_status_codes = valid_status_codes
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header.py
new file mode 100644
index 000000000000..0d0a9a93cd5a
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HTTPHeader(Model):
+    """Describes the HTTP header.
+
+    :param name: The name in HTTP header.
+    :type name: str
+    :param value: The value in HTTP header.
+    :type value: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HTTPHeader, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header_py3.py
new file mode 100644
index 000000000000..366f1a2bf681
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/http_header_py3.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HTTPHeader(Model):
+    """Describes the HTTP header.
+
+    :param name: The name in HTTP header.
+    :type name: str
+    :param value: The value in HTTP header.
+    :type value: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, value: str=None, **kwargs) -> None:
+        super(HTTPHeader, self).__init__(**kwargs)
+        self.name = name
+        self.value = value
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/network_management_client_enums.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/network_management_client_enums.py
index d7bded307342..0e20d24072aa 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/network_management_client_enums.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/network_management_client_enums.py
@@ -311,7 +311,7 @@ class Direction(str, Enum):
     outbound = "Outbound"
 
 
-class Protocol(str, Enum):
+class IpFlowProtocol(str, Enum):
 
     tcp = "TCP"
     udp = "UDP"
@@ -352,6 +352,19 @@ class PcError(str, Enum):
     storage_failed = "StorageFailed"
 
 
+class Protocol(str, Enum):
+
+    tcp = "Tcp"
+    http = "Http"
+    https = "Https"
+    icmp = "Icmp"
+
+
+class HTTPMethod(str, Enum):
+
+    get = "Get"
+
+
 class Origin(str, Enum):
 
     local = "Local"
@@ -386,6 +399,13 @@ class ConnectionStatus(str, Enum):
     degraded = "Degraded"
 
 
+class ConnectionMonitorSourceStatus(str, Enum):
+
+    uknown = "Uknown"
+    active = "Active"
+    inactive = "Inactive"
+
+
 class ConnectionState(str, Enum):
 
     reachable = "Reachable"
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration.py
new file mode 100644
index 000000000000..095e83574667
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ProtocolConfiguration(Model):
+    """Configuration of the protocol.
+
+    :param http_configuration:
+    :type http_configuration:
+     ~azure.mgmt.network.v2018_02_01.models.HTTPConfiguration
+    """
+
+    _attribute_map = {
+        'http_configuration': {'key': 'HTTPConfiguration', 'type': 'HTTPConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ProtocolConfiguration, self).__init__(**kwargs)
+        self.http_configuration = kwargs.get('http_configuration', None)
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration_py3.py
new file mode 100644
index 000000000000..a550172fe800
--- /dev/null
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/protocol_configuration_py3.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ProtocolConfiguration(Model):
+    """Configuration of the protocol.
+
+    :param http_configuration:
+    :type http_configuration:
+     ~azure.mgmt.network.v2018_02_01.models.HTTPConfiguration
+    """
+
+    _attribute_map = {
+        'http_configuration': {'key': 'HTTPConfiguration', 'type': 'HTTPConfiguration'},
+    }
+
+    def __init__(self, *, http_configuration=None, **kwargs) -> None:
+        super(ProtocolConfiguration, self).__init__(**kwargs)
+        self.http_configuration = http_configuration
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters.py
index eb14fcbcf38a..b58690aa1da4 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters.py
@@ -25,7 +25,8 @@ class VerificationIPFlowParameters(Model):
     :type direction: str or ~azure.mgmt.network.v2018_02_01.models.Direction
     :param protocol: Required. Protocol to be verified on. Possible values
      include: 'TCP', 'UDP'
-    :type protocol: str or ~azure.mgmt.network.v2018_02_01.models.Protocol
+    :type protocol: str or
+     ~azure.mgmt.network.v2018_02_01.models.IpFlowProtocol
     :param local_port: Required. The local port. Acceptable values are a
      single integer in the range (0-65535). Support for * for the source port,
      which depends on the direction.
diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters_py3.py
index 692363df8664..e5440c3e3e1c 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters_py3.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/verification_ip_flow_parameters_py3.py
@@ -25,7 +25,8 @@ class VerificationIPFlowParameters(Model):
     :type direction: str or ~azure.mgmt.network.v2018_02_01.models.Direction
     :param protocol: Required. Protocol to be verified on. Possible values
      include: 'TCP', 'UDP'
-    :type protocol: str or ~azure.mgmt.network.v2018_02_01.models.Protocol
+    :type protocol: str or
+     ~azure.mgmt.network.v2018_02_01.models.IpFlowProtocol
     :param local_port: Required. The local port. Acceptable values are a
      single integer in the range (0-65535). Support for * for the source port,
      which depends on the direction.
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..2981aba6da52 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,7 +202,6 @@ 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)
 
@@ -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/network_watchers_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_watchers_operations.py
index ec53d5ea9d7a..afbc5e02c71b 100644
--- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_watchers_operations.py
+++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/network_watchers_operations.py
@@ -1262,9 +1262,7 @@ def get_long_running_output(response):
 
 
     def _check_connectivity_initial(
-            self, resource_group_name, network_watcher_name, source, destination, custom_headers=None, raw=False, **operation_config):
-        parameters = models.ConnectivityParameters(source=source, destination=destination)
-
+            self, resource_group_name, network_watcher_name, parameters, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.check_connectivity.metadata['url']
         path_format_arguments = {
@@ -1315,7 +1313,7 @@ def _check_connectivity_initial(
         return deserialized
 
     def check_connectivity(
-            self, resource_group_name, network_watcher_name, source, destination, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, network_watcher_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
         """Verifies the possibility of establishing a direct TCP connection from a
         virtual machine to a given endpoint including another VM or an
         arbitrary remote server.
@@ -1325,12 +1323,10 @@ def check_connectivity(
         :type resource_group_name: str
         :param network_watcher_name: The name of the network watcher resource.
         :type network_watcher_name: str
-        :param source:
-        :type source:
-         ~azure.mgmt.network.v2018_02_01.models.ConnectivitySource
-        :param destination:
-        :type destination:
-         ~azure.mgmt.network.v2018_02_01.models.ConnectivityDestination
+        :param parameters: Parameters that determine how the connectivity
+         check will be performed.
+        :type parameters:
+         ~azure.mgmt.network.v2018_02_01.models.ConnectivityParameters
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -1347,8 +1343,7 @@ def check_connectivity(
         raw_result = self._check_connectivity_initial(
             resource_group_name=resource_group_name,
             network_watcher_name=network_watcher_name,
-            source=source,
-            destination=destination,
+            parameters=parameters,
             custom_headers=custom_headers,
             raw=True,
             **operation_config
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 = ""