Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR network/resource-manager] Network: fix descriptions & remove unused/duplicate definitions #4398

Merged
merged 2 commits into from
Mar 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions azure-mgmt-network/azure/mgmt/network/network_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -2142,6 +2142,19 @@ def packet_captures(self):
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def peer_express_route_circuit_connections(self):
"""Instance depends on the API version:

* 2018-12-01: :class:`PeerExpressRouteCircuitConnectionsOperations<azure.mgmt.network.v2018_12_01.operations.PeerExpressRouteCircuitConnectionsOperations>`
"""
api_version = self._get_api_version('peer_express_route_circuit_connections')
if api_version == '2018-12-01':
from .v2018_12_01.operations import PeerExpressRouteCircuitConnectionsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

@property
def public_ip_addresses(self):
"""Instance depends on the API version:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
from .express_route_circuit_stats_py3 import ExpressRouteCircuitStats
from .express_route_connection_id_py3 import ExpressRouteConnectionId
from .express_route_circuit_connection_py3 import ExpressRouteCircuitConnection
from .peer_express_route_circuit_connection_py3 import PeerExpressRouteCircuitConnection
from .express_route_circuit_peering_py3 import ExpressRouteCircuitPeering
from .route_filter_py3 import RouteFilter
from .ipv6_express_route_circuit_peering_config_py3 import Ipv6ExpressRouteCircuitPeeringConfig
Expand Down Expand Up @@ -397,6 +398,7 @@
from .express_route_circuit_stats import ExpressRouteCircuitStats
from .express_route_connection_id import ExpressRouteConnectionId
from .express_route_circuit_connection import ExpressRouteCircuitConnection
from .peer_express_route_circuit_connection import PeerExpressRouteCircuitConnection
from .express_route_circuit_peering import ExpressRouteCircuitPeering
from .route_filter import RouteFilter
from .ipv6_express_route_circuit_peering_config import Ipv6ExpressRouteCircuitPeeringConfig
Expand Down Expand Up @@ -594,6 +596,7 @@
from .express_route_circuit_authorization_paged import ExpressRouteCircuitAuthorizationPaged
from .express_route_circuit_peering_paged import ExpressRouteCircuitPeeringPaged
from .express_route_circuit_connection_paged import ExpressRouteCircuitConnectionPaged
from .peer_express_route_circuit_connection_paged import PeerExpressRouteCircuitConnectionPaged
from .express_route_circuit_paged import ExpressRouteCircuitPaged
from .express_route_service_provider_paged import ExpressRouteServiceProviderPaged
from .express_route_cross_connection_paged import ExpressRouteCrossConnectionPaged
Expand Down Expand Up @@ -844,6 +847,7 @@
'ExpressRouteCircuitStats',
'ExpressRouteConnectionId',
'ExpressRouteCircuitConnection',
'PeerExpressRouteCircuitConnection',
'ExpressRouteCircuitPeering',
'RouteFilter',
'Ipv6ExpressRouteCircuitPeeringConfig',
Expand Down Expand Up @@ -1041,6 +1045,7 @@
'ExpressRouteCircuitAuthorizationPaged',
'ExpressRouteCircuitPeeringPaged',
'ExpressRouteCircuitConnectionPaged',
'PeerExpressRouteCircuitConnectionPaged',
'ExpressRouteCircuitPaged',
'ExpressRouteServiceProviderPaged',
'ExpressRouteCrossConnectionPaged',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ApplicationGatewayProbe(SubResource):
interval between two consecutive probes. Acceptable values are from 1
second to 86400 seconds.
:type interval: int
:param timeout: the probe timeout in seconds. Probe marked as failed if
:param timeout: The probe timeout in seconds. Probe marked as failed if
valid response is not received with this timeout period. Acceptable values
are from 1 second to 86400 seconds.
:type timeout: int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ApplicationGatewayProbe(SubResource):
interval between two consecutive probes. Acceptable values are from 1
second to 86400 seconds.
:type interval: int
:param timeout: the probe timeout in seconds. Probe marked as failed if
:param timeout: The probe timeout in seconds. Probe marked as failed if
valid response is not received with this timeout period. Acceptable values
are from 1 second to 86400 seconds.
:type timeout: int
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ class ExpressRouteCircuit(Resource):
:type gateway_manager_etag: str
:param allow_global_reach: Flag to enable Global Reach on the circuit.
:type allow_global_reach: bool
:param global_reach_enabled: Flag denoting Global reach status.
:type global_reach_enabled: bool
:ivar etag: Gets a unique read-only string that changes whenever the
resource is updated.
:vartype etag: str
Expand Down Expand Up @@ -105,6 +107,7 @@ class ExpressRouteCircuit(Resource):
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'gateway_manager_etag': {'key': 'properties.gatewayManagerEtag', 'type': 'str'},
'allow_global_reach': {'key': 'properties.allowGlobalReach', 'type': 'bool'},
'global_reach_enabled': {'key': 'properties.globalReachEnabled', 'type': 'bool'},
'etag': {'key': 'etag', 'type': 'str'},
}

Expand All @@ -125,4 +128,5 @@ def __init__(self, **kwargs):
self.provisioning_state = kwargs.get('provisioning_state', None)
self.gateway_manager_etag = kwargs.get('gateway_manager_etag', None)
self.allow_global_reach = kwargs.get('allow_global_reach', None)
self.global_reach_enabled = kwargs.get('global_reach_enabled', None)
self.etag = None
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ class ExpressRouteCircuitPeering(SubResource):
Private Peering for this circuit.
:type connections:
list[~azure.mgmt.network.v2018_12_01.models.ExpressRouteCircuitConnection]
:ivar peered_connections: The list of peered circuit connections
associated with Azure Private Peering for this circuit.
:vartype peered_connections:
list[~azure.mgmt.network.v2018_12_01.models.PeerExpressRouteCircuitConnection]
:param name: Gets name of the resource that is unique within a resource
group. This name can be used to access the resource.
:type name: str
Expand All @@ -80,6 +84,7 @@ class ExpressRouteCircuitPeering(SubResource):

_validation = {
'peer_asn': {'maximum': 4294967295, 'minimum': 1},
'peered_connections': {'readonly': True},
'etag': {'readonly': True},
}

Expand All @@ -104,6 +109,7 @@ class ExpressRouteCircuitPeering(SubResource):
'ipv6_peering_config': {'key': 'properties.ipv6PeeringConfig', 'type': 'Ipv6ExpressRouteCircuitPeeringConfig'},
'express_route_connection': {'key': 'properties.expressRouteConnection', 'type': 'ExpressRouteConnectionId'},
'connections': {'key': 'properties.connections', 'type': '[ExpressRouteCircuitConnection]'},
'peered_connections': {'key': 'properties.peeredConnections', 'type': '[PeerExpressRouteCircuitConnection]'},
'name': {'key': 'name', 'type': 'str'},
'etag': {'key': 'etag', 'type': 'str'},
}
Expand All @@ -129,5 +135,6 @@ def __init__(self, **kwargs):
self.ipv6_peering_config = kwargs.get('ipv6_peering_config', None)
self.express_route_connection = kwargs.get('express_route_connection', None)
self.connections = kwargs.get('connections', None)
self.peered_connections = None
self.name = kwargs.get('name', None)
self.etag = None
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ class ExpressRouteCircuitPeering(SubResource):
Private Peering for this circuit.
:type connections:
list[~azure.mgmt.network.v2018_12_01.models.ExpressRouteCircuitConnection]
:ivar peered_connections: The list of peered circuit connections
associated with Azure Private Peering for this circuit.
:vartype peered_connections:
list[~azure.mgmt.network.v2018_12_01.models.PeerExpressRouteCircuitConnection]
:param name: Gets name of the resource that is unique within a resource
group. This name can be used to access the resource.
:type name: str
Expand All @@ -80,6 +84,7 @@ class ExpressRouteCircuitPeering(SubResource):

_validation = {
'peer_asn': {'maximum': 4294967295, 'minimum': 1},
'peered_connections': {'readonly': True},
'etag': {'readonly': True},
}

Expand All @@ -104,6 +109,7 @@ class ExpressRouteCircuitPeering(SubResource):
'ipv6_peering_config': {'key': 'properties.ipv6PeeringConfig', 'type': 'Ipv6ExpressRouteCircuitPeeringConfig'},
'express_route_connection': {'key': 'properties.expressRouteConnection', 'type': 'ExpressRouteConnectionId'},
'connections': {'key': 'properties.connections', 'type': '[ExpressRouteCircuitConnection]'},
'peered_connections': {'key': 'properties.peeredConnections', 'type': '[PeerExpressRouteCircuitConnection]'},
'name': {'key': 'name', 'type': 'str'},
'etag': {'key': 'etag', 'type': 'str'},
}
Expand All @@ -129,5 +135,6 @@ def __init__(self, *, id: str=None, peering_type=None, state=None, azure_asn: in
self.ipv6_peering_config = ipv6_peering_config
self.express_route_connection = express_route_connection
self.connections = connections
self.peered_connections = None
self.name = name
self.etag = None
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ class ExpressRouteCircuit(Resource):
:type gateway_manager_etag: str
:param allow_global_reach: Flag to enable Global Reach on the circuit.
:type allow_global_reach: bool
:param global_reach_enabled: Flag denoting Global reach status.
:type global_reach_enabled: bool
:ivar etag: Gets a unique read-only string that changes whenever the
resource is updated.
:vartype etag: str
Expand Down Expand Up @@ -105,10 +107,11 @@ class ExpressRouteCircuit(Resource):
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'gateway_manager_etag': {'key': 'properties.gatewayManagerEtag', 'type': 'str'},
'allow_global_reach': {'key': 'properties.allowGlobalReach', 'type': 'bool'},
'global_reach_enabled': {'key': 'properties.globalReachEnabled', 'type': 'bool'},
'etag': {'key': 'etag', 'type': 'str'},
}

def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, allow_classic_operations: bool=None, circuit_provisioning_state: str=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key: str=None, service_provider_notes: str=None, service_provider_properties=None, express_route_port=None, bandwidth_in_gbps: float=None, provisioning_state: str=None, gateway_manager_etag: str=None, allow_global_reach: bool=None, **kwargs) -> None:
def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, allow_classic_operations: bool=None, circuit_provisioning_state: str=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key: str=None, service_provider_notes: str=None, service_provider_properties=None, express_route_port=None, bandwidth_in_gbps: float=None, provisioning_state: str=None, gateway_manager_etag: str=None, allow_global_reach: bool=None, global_reach_enabled: bool=None, **kwargs) -> None:
super(ExpressRouteCircuit, self).__init__(id=id, location=location, tags=tags, **kwargs)
self.sku = sku
self.allow_classic_operations = allow_classic_operations
Expand All @@ -125,4 +128,5 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, all
self.provisioning_state = provisioning_state
self.gateway_manager_etag = gateway_manager_etag
self.allow_global_reach = allow_global_reach
self.global_reach_enabled = global_reach_enabled
self.etag = None
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class P2SVpnServerConfiguration(SubResource):
group. This name can be used to access the resource along with Paren
VirtualWan resource name.
:type p2_svpn_server_configuration_properties_name: str
:param vpn_protocols: vpnProtocols for the P2SVpnServerConfiguration.
:param vpn_protocols: VPN protocols for the P2SVpnServerConfiguration.
:type vpn_protocols: list[str or
~azure.mgmt.network.v2018_12_01.models.VpnGatewayTunnelingProtocol]
:param p2_svpn_server_config_vpn_client_root_certificates: VPN client root
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class P2SVpnServerConfiguration(SubResource):
group. This name can be used to access the resource along with Paren
VirtualWan resource name.
:type p2_svpn_server_configuration_properties_name: str
:param vpn_protocols: vpnProtocols for the P2SVpnServerConfiguration.
:param vpn_protocols: VPN protocols for the P2SVpnServerConfiguration.
:type vpn_protocols: list[str or
~azure.mgmt.network.v2018_12_01.models.VpnGatewayTunnelingProtocol]
:param p2_svpn_server_config_vpn_client_root_certificates: VPN client root
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# 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 .sub_resource import SubResource


class PeerExpressRouteCircuitConnection(SubResource):
"""Peer Express Route Circuit Connection in an ExpressRouteCircuitPeering
resource.

Variables are only populated by the server, and will be ignored when
sending a request.

:param id: Resource ID.
:type id: str
:param express_route_circuit_peering: Reference to Express Route Circuit
Private Peering Resource of the circuit.
:type express_route_circuit_peering:
~azure.mgmt.network.v2018_12_01.models.SubResource
:param peer_express_route_circuit_peering: Reference to Express Route
Circuit Private Peering Resource of the peered circuit.
:type peer_express_route_circuit_peering:
~azure.mgmt.network.v2018_12_01.models.SubResource
:param address_prefix: /29 IP address space to carve out Customer
addresses for tunnels.
:type address_prefix: str
:ivar circuit_connection_status: Express Route Circuit Connection State.
Possible values are: 'Connected' and 'Disconnected'. Possible values
include: 'Connected', 'Connecting', 'Disconnected'
:vartype circuit_connection_status: str or
~azure.mgmt.network.v2018_12_01.models.CircuitConnectionStatus
:param connection_name: The name of the express route circuit connection
resource.
:type connection_name: str
:param auth_resource_guid: The resource guid of the authorization used for
the express route circuit connection.
:type auth_resource_guid: str
:ivar provisioning_state: Provisioning state of the peer express route
circuit connection resource. Possible values are: 'Succeeded', 'Updating',
'Deleting', and 'Failed'.
:vartype provisioning_state: str
:param name: Gets name of the resource that is unique within a resource
group. This name can be used to access the resource.
:type name: str
:ivar etag: A unique read-only string that changes whenever the resource
is updated.
:vartype etag: str
"""

_validation = {
'circuit_connection_status': {'readonly': True},
'provisioning_state': {'readonly': True},
'etag': {'readonly': True},
}

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'express_route_circuit_peering': {'key': 'properties.expressRouteCircuitPeering', 'type': 'SubResource'},
'peer_express_route_circuit_peering': {'key': 'properties.peerExpressRouteCircuitPeering', 'type': 'SubResource'},
'address_prefix': {'key': 'properties.addressPrefix', 'type': 'str'},
'circuit_connection_status': {'key': 'properties.circuitConnectionStatus', 'type': 'str'},
'connection_name': {'key': 'properties.connectionName', 'type': 'str'},
'auth_resource_guid': {'key': 'properties.authResourceGuid', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'etag': {'key': 'etag', 'type': 'str'},
}

def __init__(self, **kwargs):
super(PeerExpressRouteCircuitConnection, self).__init__(**kwargs)
self.express_route_circuit_peering = kwargs.get('express_route_circuit_peering', None)
self.peer_express_route_circuit_peering = kwargs.get('peer_express_route_circuit_peering', None)
self.address_prefix = kwargs.get('address_prefix', None)
self.circuit_connection_status = None
self.connection_name = kwargs.get('connection_name', None)
self.auth_resource_guid = kwargs.get('auth_resource_guid', None)
self.provisioning_state = None
self.name = kwargs.get('name', None)
self.etag = None
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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.paging import Paged


class PeerExpressRouteCircuitConnectionPaged(Paged):
"""
A paging container for iterating over a list of :class:`PeerExpressRouteCircuitConnection <azure.mgmt.network.v2018_12_01.models.PeerExpressRouteCircuitConnection>` object
"""

_attribute_map = {
'next_link': {'key': 'nextLink', 'type': 'str'},
'current_page': {'key': 'value', 'type': '[PeerExpressRouteCircuitConnection]'}
}

def __init__(self, *args, **kwargs):

super(PeerExpressRouteCircuitConnectionPaged, self).__init__(*args, **kwargs)
Loading