diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index faf9e712d292..a1285b434b2d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -114,6 +114,8 @@ from .express_route_circuit_reference_py3 import ExpressRouteCircuitReference from .express_route_cross_connection_peering_py3 import ExpressRouteCrossConnectionPeering from .express_route_cross_connection_py3 import ExpressRouteCrossConnection + from .virtual_hub_id_py3 import VirtualHubId + from .express_route_circuit_peering_id_py3 import ExpressRouteCircuitPeeringId from .express_route_gateway_properties_auto_scale_configuration_bounds_py3 import ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds from .express_route_gateway_properties_auto_scale_configuration_py3 import ExpressRouteGatewayPropertiesAutoScaleConfiguration from .express_route_connection_py3 import ExpressRouteConnection @@ -361,6 +363,8 @@ from .express_route_circuit_reference import ExpressRouteCircuitReference from .express_route_cross_connection_peering import ExpressRouteCrossConnectionPeering from .express_route_cross_connection import ExpressRouteCrossConnection + from .virtual_hub_id import VirtualHubId + from .express_route_circuit_peering_id import ExpressRouteCircuitPeeringId from .express_route_gateway_properties_auto_scale_configuration_bounds import ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds from .express_route_gateway_properties_auto_scale_configuration import ExpressRouteGatewayPropertiesAutoScaleConfiguration from .express_route_connection import ExpressRouteConnection @@ -746,6 +750,8 @@ 'ExpressRouteCircuitReference', 'ExpressRouteCrossConnectionPeering', 'ExpressRouteCrossConnection', + 'VirtualHubId', + 'ExpressRouteCircuitPeeringId', 'ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds', 'ExpressRouteGatewayPropertiesAutoScaleConfiguration', 'ExpressRouteConnection', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py new file mode 100644 index 000000000000..8e20d23a582d --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py @@ -0,0 +1,28 @@ +# 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 ExpressRouteCircuitPeeringId(Model): + """ExpressRoute circuit peering identifier. + + :param id: The ID of the ExpressRoute circuit peering. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ExpressRouteCircuitPeeringId, self).__init__(**kwargs) + self.id = kwargs.get('id', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py new file mode 100644 index 000000000000..0261435f5ecc --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py @@ -0,0 +1,28 @@ +# 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 ExpressRouteCircuitPeeringId(Model): + """ExpressRoute circuit peering identifier. + + :param id: The ID of the ExpressRoute circuit peering. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, **kwargs) -> None: + super(ExpressRouteCircuitPeeringId, self).__init__(**kwargs) + self.id = id diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py index 74ffadec81ac..b8ab0ea3fd24 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py @@ -26,9 +26,10 @@ class ExpressRouteConnection(SubResource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_connection_id: The ID of the ExpressRoute circuit + :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. - :type express_route_connection_id: str + :type express_route_circuit_peering: + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitPeeringId :param authorization_key: Authorization key to establish the connection. :type authorization_key: str :param routing_weight: The routing weight associated to the connection. @@ -39,13 +40,14 @@ class ExpressRouteConnection(SubResource): _validation = { 'provisioning_state': {'readonly': True}, + 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_connection_id': {'key': 'properties.expressRouteCircuitPeering.id', 'type': 'str'}, + 'express_route_circuit_peering': {'key': 'properties.expressRouteCircuitPeering', 'type': 'ExpressRouteCircuitPeeringId'}, 'authorization_key': {'key': 'properties.authorizationKey', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'name': {'key': 'name', 'type': 'str'}, @@ -54,7 +56,7 @@ class ExpressRouteConnection(SubResource): def __init__(self, **kwargs): super(ExpressRouteConnection, self).__init__(**kwargs) self.provisioning_state = None - self.express_route_connection_id = kwargs.get('express_route_connection_id', None) + self.express_route_circuit_peering = kwargs.get('express_route_circuit_peering', None) self.authorization_key = kwargs.get('authorization_key', None) self.routing_weight = kwargs.get('routing_weight', None) self.name = kwargs.get('name', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py index 206af6a6164f..247cc748523b 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py @@ -26,9 +26,10 @@ class ExpressRouteConnection(SubResource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_connection_id: The ID of the ExpressRoute circuit + :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. - :type express_route_connection_id: str + :type express_route_circuit_peering: + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitPeeringId :param authorization_key: Authorization key to establish the connection. :type authorization_key: str :param routing_weight: The routing weight associated to the connection. @@ -39,22 +40,23 @@ class ExpressRouteConnection(SubResource): _validation = { 'provisioning_state': {'readonly': True}, + 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_connection_id': {'key': 'properties.expressRouteCircuitPeering.id', 'type': 'str'}, + 'express_route_circuit_peering': {'key': 'properties.expressRouteCircuitPeering', 'type': 'ExpressRouteCircuitPeeringId'}, 'authorization_key': {'key': 'properties.authorizationKey', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'name': {'key': 'name', 'type': 'str'}, } - def __init__(self, *, name: str, id: str=None, express_route_connection_id: str=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: + def __init__(self, *, express_route_circuit_peering, name: str, id: str=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: super(ExpressRouteConnection, self).__init__(id=id, **kwargs) self.provisioning_state = None - self.express_route_connection_id = express_route_connection_id + self.express_route_circuit_peering = express_route_circuit_peering self.authorization_key = authorization_key self.routing_weight = routing_weight self.name = name diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py index bf1c32cb2166..07d9850a9ebc 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py @@ -18,6 +18,8 @@ class ExpressRouteGateway(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :param id: Resource ID. :type id: str :ivar name: Resource name. @@ -39,11 +41,9 @@ class ExpressRouteGateway(Resource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_gateway_id: The resource URI for the Virtual Hub - where the ExpressRoute gateway is or will be deployed. The Virtual Hub - resource and the ExpressRoute gateway resource reside in the same - subscription. - :type express_route_gateway_id: str + :param virtual_hub: Required. The Virtual Hub where the ExpressRoute + gateway is or will be deployed. + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.VirtualHubId :ivar etag: A unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -54,6 +54,7 @@ class ExpressRouteGateway(Resource): 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -66,7 +67,7 @@ class ExpressRouteGateway(Resource): 'auto_scale_configuration': {'key': 'properties.autoScaleConfiguration', 'type': 'ExpressRouteGatewayPropertiesAutoScaleConfiguration'}, 'express_route_connections': {'key': 'properties.expressRouteConnections', 'type': '[ExpressRouteConnection]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_gateway_id': {'key': 'properties.virtualHub.id', 'type': 'str'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'VirtualHubId'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -75,5 +76,5 @@ def __init__(self, **kwargs): self.auto_scale_configuration = kwargs.get('auto_scale_configuration', None) self.express_route_connections = None self.provisioning_state = None - self.express_route_gateway_id = kwargs.get('express_route_gateway_id', None) + self.virtual_hub = kwargs.get('virtual_hub', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py index 723bb8e472cd..9154f326ddc8 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py @@ -18,6 +18,8 @@ class ExpressRouteGateway(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :param id: Resource ID. :type id: str :ivar name: Resource name. @@ -39,11 +41,9 @@ class ExpressRouteGateway(Resource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_gateway_id: The resource URI for the Virtual Hub - where the ExpressRoute gateway is or will be deployed. The Virtual Hub - resource and the ExpressRoute gateway resource reside in the same - subscription. - :type express_route_gateway_id: str + :param virtual_hub: Required. The Virtual Hub where the ExpressRoute + gateway is or will be deployed. + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.VirtualHubId :ivar etag: A unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -54,6 +54,7 @@ class ExpressRouteGateway(Resource): 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -66,14 +67,14 @@ class ExpressRouteGateway(Resource): 'auto_scale_configuration': {'key': 'properties.autoScaleConfiguration', 'type': 'ExpressRouteGatewayPropertiesAutoScaleConfiguration'}, 'express_route_connections': {'key': 'properties.expressRouteConnections', 'type': '[ExpressRouteConnection]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_gateway_id': {'key': 'properties.virtualHub.id', 'type': 'str'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'VirtualHubId'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, express_route_gateway_id: str=None, **kwargs) -> None: + def __init__(self, *, virtual_hub, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, **kwargs) -> None: super(ExpressRouteGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) self.auto_scale_configuration = auto_scale_configuration self.express_route_connections = None self.provisioning_state = None - self.express_route_gateway_id = express_route_gateway_id + self.virtual_hub = virtual_hub self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py new file mode 100644 index 000000000000..6754cbd3b4f6 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py @@ -0,0 +1,30 @@ +# 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 VirtualHubId(Model): + """Virtual Hub identifier. + + :param id: The resource URI for the Virtual Hub where the ExpressRoute + gateway is or will be deployed. The Virtual Hub resource and the + ExpressRoute gateway resource reside in the same subscription. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(VirtualHubId, self).__init__(**kwargs) + self.id = kwargs.get('id', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py new file mode 100644 index 000000000000..730c061d5b7e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py @@ -0,0 +1,30 @@ +# 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 VirtualHubId(Model): + """Virtual Hub identifier. + + :param id: The resource URI for the Virtual Hub where the ExpressRoute + gateway is or will be deployed. The Virtual Hub resource and the + ExpressRoute gateway resource reside in the same subscription. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, **kwargs) -> None: + super(VirtualHubId, self).__init__(**kwargs) + self.id = id