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/models/ddos_protection_plan.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan.py index dfede8f84d63..9e855bdbf486 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan.py @@ -9,17 +9,17 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from msrest.serialization import Model -class DdosProtectionPlan(Resource): +class DdosProtectionPlan(Model): """A DDoS protection plan in a resource group. Variables are only populated by the server, and will be ignored when sending a request. - :param id: Resource ID. - :type id: str + :ivar id: Resource ID. + :vartype id: str :ivar name: Resource name. :vartype name: str :ivar type: Resource type. @@ -47,6 +47,7 @@ class DdosProtectionPlan(Resource): """ _validation = { + 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, 'resource_guid': {'readonly': True}, @@ -69,6 +70,11 @@ class DdosProtectionPlan(Resource): def __init__(self, **kwargs): super(DdosProtectionPlan, self).__init__(**kwargs) + self.id = None + self.name = None + self.type = None + self.location = kwargs.get('location', None) + self.tags = kwargs.get('tags', None) self.resource_guid = None self.provisioning_state = None self.virtual_networks = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan_py3.py index f5091f5674d3..73642b0d134a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan_py3.py @@ -9,17 +9,17 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from msrest.serialization import Model -class DdosProtectionPlan(Resource): +class DdosProtectionPlan(Model): """A DDoS protection plan in a resource group. Variables are only populated by the server, and will be ignored when sending a request. - :param id: Resource ID. - :type id: str + :ivar id: Resource ID. + :vartype id: str :ivar name: Resource name. :vartype name: str :ivar type: Resource type. @@ -47,6 +47,7 @@ class DdosProtectionPlan(Resource): """ _validation = { + 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, 'resource_guid': {'readonly': True}, @@ -67,8 +68,13 @@ class DdosProtectionPlan(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, **kwargs) -> None: - super(DdosProtectionPlan, self).__init__(id=id, location=location, tags=tags, **kwargs) + def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: + super(DdosProtectionPlan, self).__init__(**kwargs) + self.id = None + self.name = None + self.type = None + self.location = location + self.tags = tags self.resource_guid = None self.provisioning_state = None self.virtual_networks = None 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 08edcdf5afea..c638f55f4eb9 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 - :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: + :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: ~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,6 +67,9 @@ 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}, } @@ -95,9 +98,9 @@ def __init__(self, **kwargs): self.primary_azure_port = None self.secondary_azure_port = None self.s_tag = 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.peering_location = None + self.bandwidth_in_mbps = None + self.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 4154d2207fa3..fc40e491ec08 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 - :param gateway_manager_etag: The GatewayManager Etag. - :type gateway_manager_etag: str + :ivar gateway_manager_etag: The GatewayManager Etag. + :vartype 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,6 +72,7 @@ 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}, } @@ -110,7 +111,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 = kwargs.get('gateway_manager_etag', None) + self.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 eb8e9a2a650c..0b5a24b10771 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 - :param gateway_manager_etag: The GatewayManager Etag. - :type gateway_manager_etag: str + :ivar gateway_manager_etag: The GatewayManager Etag. + :vartype 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,6 +72,7 @@ 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}, } @@ -96,7 +97,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, gateway_manager_etag: str=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, 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 @@ -110,7 +111,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 = gateway_manager_etag + self.gateway_manager_etag = None 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 db594ff9c0d3..32faab74803c 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 - :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: + :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: ~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,6 +67,9 @@ 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}, } @@ -90,14 +93,14 @@ class ExpressRouteCrossConnection(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - 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: + 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: 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 = peering_location - self.bandwidth_in_mbps = bandwidth_in_mbps - self.express_route_circuit = express_route_circuit + self.peering_location = None + self.bandwidth_in_mbps = None + self.express_route_circuit = None 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 c70b8312c12d..1eaeeb601593 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,7 +199,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 = '2018-02-01' diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/ddos_protection_plans_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/ddos_protection_plans_operations.py index a2c6543447b5..de73b31c2d0a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/ddos_protection_plans_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/ddos_protection_plans_operations.py @@ -185,7 +185,9 @@ def get( def _create_or_update_initial( - self, resource_group_name, ddos_protection_plan_name, parameters, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, ddos_protection_plan_name, location=None, tags=None, custom_headers=None, raw=False, **operation_config): + parameters = models.DdosProtectionPlan(location=location, tags=tags) + # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { @@ -236,7 +238,7 @@ def _create_or_update_initial( return deserialized def create_or_update( - self, resource_group_name, ddos_protection_plan_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): + self, resource_group_name, ddos_protection_plan_name, location=None, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): """Creates or updates a DDoS protection plan. :param resource_group_name: The name of the resource group. @@ -244,10 +246,10 @@ def create_or_update( :param ddos_protection_plan_name: The name of the DDoS protection plan. :type ddos_protection_plan_name: str - :param parameters: Parameters supplied to the create or update - operation. - :type parameters: - ~azure.mgmt.network.v2018_02_01.models.DdosProtectionPlan + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] :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 @@ -264,7 +266,8 @@ def create_or_update( raw_result = self._create_or_update_initial( resource_group_name=resource_group_name, ddos_protection_plan_name=ddos_protection_plan_name, - parameters=parameters, + location=location, + tags=tags, custom_headers=custom_headers, raw=True, **operation_config