Generated from 8dfb56822b7d2394dadac574335ecc4a43bc0a0f (#2379)

Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs into readonlyremove

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

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)

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

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

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 = {}