diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection.py index ef0237e1e5c6..32dec36e35a1 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection.py @@ -40,8 +40,8 @@ class VpnConnection(Resource): :vartype ingress_bytes_transferred: long :ivar egress_bytes_transferred: Egress bytes transferred. :vartype egress_bytes_transferred: long - :ivar connection_bandwidth_in_mbps: Expected bandwidth in MBPS. - :vartype connection_bandwidth_in_mbps: int + :ivar connection_bandwidth: Expected bandwidth in MBPS. + :vartype connection_bandwidth: int :param shared_key: SharedKey for the vpn connection. :type shared_key: str :param enable_bgp: EnableBgp flag @@ -64,7 +64,7 @@ class VpnConnection(Resource): 'type': {'readonly': True}, 'ingress_bytes_transferred': {'readonly': True}, 'egress_bytes_transferred': {'readonly': True}, - 'connection_bandwidth_in_mbps': {'readonly': True}, + 'connection_bandwidth': {'readonly': True}, 'etag': {'readonly': True}, } @@ -79,7 +79,7 @@ class VpnConnection(Resource): 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, 'ingress_bytes_transferred': {'key': 'properties.ingressBytesTransferred', 'type': 'long'}, 'egress_bytes_transferred': {'key': 'properties.egressBytesTransferred', 'type': 'long'}, - 'connection_bandwidth_in_mbps': {'key': 'properties.connectionBandwidthInMbps', 'type': 'int'}, + 'connection_bandwidth': {'key': 'properties.connectionBandwidth', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'enable_bgp': {'key': 'properties.enableBgp', 'type': 'bool'}, 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, @@ -94,7 +94,7 @@ def __init__(self, **kwargs): self.connection_status = kwargs.get('connection_status', None) self.ingress_bytes_transferred = None self.egress_bytes_transferred = None - self.connection_bandwidth_in_mbps = None + self.connection_bandwidth = None self.shared_key = kwargs.get('shared_key', None) self.enable_bgp = kwargs.get('enable_bgp', None) self.ipsec_policies = kwargs.get('ipsec_policies', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection_py3.py index b73fa0bb31eb..9941ea0ed8ed 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/models/vpn_connection_py3.py @@ -40,8 +40,8 @@ class VpnConnection(Resource): :vartype ingress_bytes_transferred: long :ivar egress_bytes_transferred: Egress bytes transferred. :vartype egress_bytes_transferred: long - :ivar connection_bandwidth_in_mbps: Expected bandwidth in MBPS. - :vartype connection_bandwidth_in_mbps: int + :ivar connection_bandwidth: Expected bandwidth in MBPS. + :vartype connection_bandwidth: int :param shared_key: SharedKey for the vpn connection. :type shared_key: str :param enable_bgp: EnableBgp flag @@ -64,7 +64,7 @@ class VpnConnection(Resource): 'type': {'readonly': True}, 'ingress_bytes_transferred': {'readonly': True}, 'egress_bytes_transferred': {'readonly': True}, - 'connection_bandwidth_in_mbps': {'readonly': True}, + 'connection_bandwidth': {'readonly': True}, 'etag': {'readonly': True}, } @@ -79,7 +79,7 @@ class VpnConnection(Resource): 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, 'ingress_bytes_transferred': {'key': 'properties.ingressBytesTransferred', 'type': 'long'}, 'egress_bytes_transferred': {'key': 'properties.egressBytesTransferred', 'type': 'long'}, - 'connection_bandwidth_in_mbps': {'key': 'properties.connectionBandwidthInMbps', 'type': 'int'}, + 'connection_bandwidth': {'key': 'properties.connectionBandwidth', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'enable_bgp': {'key': 'properties.enableBgp', 'type': 'bool'}, 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, @@ -94,7 +94,7 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, remote_vpn_si self.connection_status = connection_status self.ingress_bytes_transferred = None self.egress_bytes_transferred = None - self.connection_bandwidth_in_mbps = None + self.connection_bandwidth = None self.shared_key = shared_key self.enable_bgp = enable_bgp self.ipsec_policies = ipsec_policies diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/operations/vpn_connections_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/operations/vpn_connections_operations.py index 6f302381f087..a433e9d9b9e5 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_04_01/operations/vpn_connections_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_04_01/operations/vpn_connections_operations.py @@ -294,9 +294,11 @@ def get_long_running_output(response): delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}'} def list_by_vpn_gateway( - self, gateway_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, gateway_name, custom_headers=None, raw=False, **operation_config): """Retrieves all vpn connections for a particular virtual wan vpn gateway. + :param resource_group_name: The resource group name of the VpnGateway. + :type resource_group_name: str :param gateway_name: The name of the gateway. :type gateway_name: str :param dict custom_headers: headers that will be added to the request @@ -317,6 +319,7 @@ def internal_paging(next_link=None, raw=False): url = self.list_by_vpn_gateway.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -358,4 +361,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized - list_by_vpn_gateway.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections'} + list_by_vpn_gateway.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections'}