Skip to content

Commit 3434e38

Browse files
Peering 2019-09-01-preview (#8172)
* peering 2019-09-01-preview * add peering test * fix recording file location * changelog
1 parent de7b4d3 commit 3434e38

20 files changed

Lines changed: 675 additions & 294 deletions

sdk/peering/azure-mgmt-peering/HISTORY.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
Release History
44
===============
55

6+
0.1.0rc2 (2019-10-24)
7+
+++++++++++++++++++++
8+
9+
**Breaking changes**
10+
11+
- Migrated operations from PeeringServicePrefixesOperations to PrefixesOperations
12+
613
0.1.0rc1 (2019-09-26)
714
+++++++++++++++++++++
815

sdk/peering/azure-mgmt-peering/azure/mgmt/peering/_peering_management_client.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from .operations import PeeringLocationsOperations
2121
from .operations import PeeringsOperations
2222
from .operations import PeeringServiceLocationsOperations
23-
from .operations import PeeringServicePrefixesOperations
2423
from .operations import PrefixesOperations
2524
from .operations import PeeringServiceProvidersOperations
2625
from .operations import PeeringServicesOperations
@@ -45,8 +44,6 @@ class PeeringManagementClient(PeeringManagementClientOperationsMixin, SDKClient)
4544
:vartype peerings: azure.mgmt.peering.operations.PeeringsOperations
4645
:ivar peering_service_locations: PeeringServiceLocations operations
4746
:vartype peering_service_locations: azure.mgmt.peering.operations.PeeringServiceLocationsOperations
48-
:ivar peering_service_prefixes: PeeringServicePrefixes operations
49-
:vartype peering_service_prefixes: azure.mgmt.peering.operations.PeeringServicePrefixesOperations
5047
:ivar prefixes: Prefixes operations
5148
:vartype prefixes: azure.mgmt.peering.operations.PrefixesOperations
5249
:ivar peering_service_providers: PeeringServiceProviders operations
@@ -69,7 +66,7 @@ def __init__(
6966
super(PeeringManagementClient, self).__init__(self.config.credentials, self.config)
7067

7168
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
72-
self.api_version = '2019-08-01-preview'
69+
self.api_version = '2019-09-01-preview'
7370
self._serialize = Serializer(client_models)
7471
self._deserialize = Deserializer(client_models)
7572

@@ -85,8 +82,6 @@ def __init__(
8582
self._client, self.config, self._serialize, self._deserialize)
8683
self.peering_service_locations = PeeringServiceLocationsOperations(
8784
self._client, self.config, self._serialize, self._deserialize)
88-
self.peering_service_prefixes = PeeringServicePrefixesOperations(
89-
self._client, self.config, self._serialize, self._deserialize)
9085
self.prefixes = PrefixesOperations(
9186
self._client, self.config, self._serialize, self._deserialize)
9287
self.peering_service_providers = PeeringServiceProvidersOperations(

sdk/peering/azure-mgmt-peering/azure/mgmt/peering/models/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from ._models_py3 import PeeringService
3232
from ._models_py3 import PeeringServiceLocation
3333
from ._models_py3 import PeeringServicePrefix
34+
from ._models_py3 import PeeringServicePrefixEvent
3435
from ._models_py3 import PeeringServiceProvider
3536
from ._models_py3 import PeeringSku
3637
from ._models_py3 import Resource
@@ -58,6 +59,7 @@
5859
from ._models import PeeringService
5960
from ._models import PeeringServiceLocation
6061
from ._models import PeeringServicePrefix
62+
from ._models import PeeringServicePrefixEvent
6163
from ._models import PeeringServiceProvider
6264
from ._models import PeeringSku
6365
from ._models import Resource
@@ -110,6 +112,7 @@
110112
'PeeringService',
111113
'PeeringServiceLocation',
112114
'PeeringServicePrefix',
115+
'PeeringServicePrefixEvent',
113116
'PeeringServiceProvider',
114117
'PeeringSku',
115118
'Resource',

sdk/peering/azure-mgmt-peering/azure/mgmt/peering/models/_models.py

Lines changed: 98 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ class DirectConnection(Model):
149149
150150
:param bandwidth_in_mbps: The bandwidth of the connection.
151151
:type bandwidth_in_mbps: int
152-
:param provisioned_bandwidth_in_mbps: The bandwidth that is actually
152+
:ivar provisioned_bandwidth_in_mbps: The bandwidth that is actually
153153
provisioned.
154-
:type provisioned_bandwidth_in_mbps: int
154+
:vartype provisioned_bandwidth_in_mbps: int
155155
:param session_address_provider: The field indicating if Microsoft
156156
provides session ip addresses. Possible values include: 'Microsoft',
157157
'Peer'
@@ -173,10 +173,15 @@ class DirectConnection(Model):
173173
:param connection_identifier: The unique identifier (GUID) for the
174174
connection.
175175
:type connection_identifier: str
176+
:ivar error_message: The error message related to the connection state, if
177+
any.
178+
:vartype error_message: str
176179
"""
177180

178181
_validation = {
182+
'provisioned_bandwidth_in_mbps': {'readonly': True},
179183
'connection_state': {'readonly': True},
184+
'error_message': {'readonly': True},
180185
}
181186

182187
_attribute_map = {
@@ -188,18 +193,20 @@ class DirectConnection(Model):
188193
'connection_state': {'key': 'connectionState', 'type': 'str'},
189194
'bgp_session': {'key': 'bgpSession', 'type': 'BgpSession'},
190195
'connection_identifier': {'key': 'connectionIdentifier', 'type': 'str'},
196+
'error_message': {'key': 'errorMessage', 'type': 'str'},
191197
}
192198

193199
def __init__(self, **kwargs):
194200
super(DirectConnection, self).__init__(**kwargs)
195201
self.bandwidth_in_mbps = kwargs.get('bandwidth_in_mbps', None)
196-
self.provisioned_bandwidth_in_mbps = kwargs.get('provisioned_bandwidth_in_mbps', None)
202+
self.provisioned_bandwidth_in_mbps = None
197203
self.session_address_provider = kwargs.get('session_address_provider', None)
198204
self.use_for_peering_service = kwargs.get('use_for_peering_service', None)
199205
self.peering_db_facility_id = kwargs.get('peering_db_facility_id', None)
200206
self.connection_state = None
201207
self.bgp_session = kwargs.get('bgp_session', None)
202208
self.connection_identifier = kwargs.get('connection_identifier', None)
209+
self.error_message = None
203210

204211

205212
class DirectPeeringFacility(Model):
@@ -291,17 +298,22 @@ class ExchangeConnection(Model):
291298
:param connection_identifier: The unique identifier (GUID) for the
292299
connection.
293300
:type connection_identifier: str
301+
:ivar error_message: The error message related to the connection state, if
302+
any.
303+
:vartype error_message: str
294304
"""
295305

296306
_validation = {
297307
'connection_state': {'readonly': True},
308+
'error_message': {'readonly': True},
298309
}
299310

300311
_attribute_map = {
301312
'peering_db_facility_id': {'key': 'peeringDBFacilityId', 'type': 'int'},
302313
'connection_state': {'key': 'connectionState', 'type': 'str'},
303314
'bgp_session': {'key': 'bgpSession', 'type': 'BgpSession'},
304315
'connection_identifier': {'key': 'connectionIdentifier', 'type': 'str'},
316+
'error_message': {'key': 'errorMessage', 'type': 'str'},
305317
}
306318

307319
def __init__(self, **kwargs):
@@ -310,6 +322,7 @@ def __init__(self, **kwargs):
310322
self.connection_state = None
311323
self.bgp_session = kwargs.get('bgp_session', None)
312324
self.connection_identifier = kwargs.get('connection_identifier', None)
325+
self.error_message = None
313326

314327

315328
class ExchangePeeringFacility(Model):
@@ -487,12 +500,15 @@ class PeerAsn(Resource):
487500
:param validation_state: The validation state of the ASN associated with
488501
the peer. Possible values include: 'None', 'Pending', 'Approved', 'Failed'
489502
:type validation_state: str or ~azure.mgmt.peering.models.ValidationState
503+
:ivar error_message: The error message for the validation state
504+
:vartype error_message: str
490505
"""
491506

492507
_validation = {
493508
'name': {'readonly': True},
494509
'id': {'readonly': True},
495510
'type': {'readonly': True},
511+
'error_message': {'readonly': True},
496512
}
497513

498514
_attribute_map = {
@@ -503,6 +519,7 @@ class PeerAsn(Resource):
503519
'peer_contact_info': {'key': 'properties.peerContactInfo', 'type': 'ContactInfo'},
504520
'peer_name': {'key': 'properties.peerName', 'type': 'str'},
505521
'validation_state': {'key': 'properties.validationState', 'type': 'str'},
522+
'error_message': {'key': 'properties.errorMessage', 'type': 'str'},
506523
}
507524

508525
def __init__(self, **kwargs):
@@ -511,6 +528,7 @@ def __init__(self, **kwargs):
511528
self.peer_contact_info = kwargs.get('peer_contact_info', None)
512529
self.peer_name = kwargs.get('peer_name', None)
513530
self.validation_state = kwargs.get('validation_state', None)
531+
self.error_message = None
514532

515533

516534
class Peering(Resource):
@@ -709,12 +727,15 @@ def __init__(self, **kwargs):
709727
class PeeringPropertiesDirect(Model):
710728
"""The properties that define a direct peering.
711729
730+
Variables are only populated by the server, and will be ignored when
731+
sending a request.
732+
712733
:param connections: The set of connections that constitute a direct
713734
peering.
714735
:type connections: list[~azure.mgmt.peering.models.DirectConnection]
715-
:param use_for_peering_service: The flag that indicates whether or not the
736+
:ivar use_for_peering_service: The flag that indicates whether or not the
716737
peering is used for peering service.
717-
:type use_for_peering_service: bool
738+
:vartype use_for_peering_service: bool
718739
:param peer_asn: The reference of the peer ASN.
719740
:type peer_asn: ~azure.mgmt.peering.models.SubResource
720741
:param direct_peering_type: The type of direct peering. Possible values
@@ -723,6 +744,10 @@ class PeeringPropertiesDirect(Model):
723744
~azure.mgmt.peering.models.DirectPeeringType
724745
"""
725746

747+
_validation = {
748+
'use_for_peering_service': {'readonly': True},
749+
}
750+
726751
_attribute_map = {
727752
'connections': {'key': 'connections', 'type': '[DirectConnection]'},
728753
'use_for_peering_service': {'key': 'useForPeeringService', 'type': 'bool'},
@@ -733,7 +758,7 @@ class PeeringPropertiesDirect(Model):
733758
def __init__(self, **kwargs):
734759
super(PeeringPropertiesDirect, self).__init__(**kwargs)
735760
self.connections = kwargs.get('connections', None)
736-
self.use_for_peering_service = kwargs.get('use_for_peering_service', None)
761+
self.use_for_peering_service = None
737762
self.peer_asn = kwargs.get('peer_asn', None)
738763
self.direct_peering_type = kwargs.get('direct_peering_type', None)
739764

@@ -870,16 +895,21 @@ class PeeringServicePrefix(Resource):
870895
:vartype id: str
871896
:ivar type: The type of the resource.
872897
:vartype type: str
873-
:param prefix: Valid route prefix
898+
:param prefix: The prefix from which your traffic originates.
874899
:type prefix: str
875-
:param prefix_validation_state: The prefix validation state. Possible
900+
:ivar prefix_validation_state: The prefix validation state. Possible
876901
values include: 'None', 'Invalid', 'Verified', 'Failed', 'Pending',
877-
'Unknown'
878-
:type prefix_validation_state: str or
902+
'Warning', 'Unknown'
903+
:vartype prefix_validation_state: str or
879904
~azure.mgmt.peering.models.PrefixValidationState
880-
:param learned_type: The prefix learned type. Possible values include:
881-
'None', 'ViaPartner', 'ViaSession'
882-
:type learned_type: str or ~azure.mgmt.peering.models.LearnedType
905+
:ivar learned_type: The prefix learned type. Possible values include:
906+
'None', 'ViaServiceProvider', 'ViaSession'
907+
:vartype learned_type: str or ~azure.mgmt.peering.models.LearnedType
908+
:ivar error_message: The error message for validation state
909+
:vartype error_message: str
910+
:ivar events: The list of events for peering service prefix
911+
:vartype events:
912+
list[~azure.mgmt.peering.models.PeeringServicePrefixEvent]
883913
:ivar provisioning_state: The provisioning state of the resource. Possible
884914
values include: 'Succeeded', 'Updating', 'Deleting', 'Failed'
885915
:vartype provisioning_state: str or
@@ -890,6 +920,10 @@ class PeeringServicePrefix(Resource):
890920
'name': {'readonly': True},
891921
'id': {'readonly': True},
892922
'type': {'readonly': True},
923+
'prefix_validation_state': {'readonly': True},
924+
'learned_type': {'readonly': True},
925+
'error_message': {'readonly': True},
926+
'events': {'readonly': True},
893927
'provisioning_state': {'readonly': True},
894928
}
895929

@@ -900,17 +934,66 @@ class PeeringServicePrefix(Resource):
900934
'prefix': {'key': 'properties.prefix', 'type': 'str'},
901935
'prefix_validation_state': {'key': 'properties.prefixValidationState', 'type': 'str'},
902936
'learned_type': {'key': 'properties.learnedType', 'type': 'str'},
937+
'error_message': {'key': 'properties.errorMessage', 'type': 'str'},
938+
'events': {'key': 'properties.events', 'type': '[PeeringServicePrefixEvent]'},
903939
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
904940
}
905941

906942
def __init__(self, **kwargs):
907943
super(PeeringServicePrefix, self).__init__(**kwargs)
908944
self.prefix = kwargs.get('prefix', None)
909-
self.prefix_validation_state = kwargs.get('prefix_validation_state', None)
910-
self.learned_type = kwargs.get('learned_type', None)
945+
self.prefix_validation_state = None
946+
self.learned_type = None
947+
self.error_message = None
948+
self.events = None
911949
self.provisioning_state = None
912950

913951

952+
class PeeringServicePrefixEvent(Model):
953+
"""The details of the event associated with a prefix.
954+
955+
Variables are only populated by the server, and will be ignored when
956+
sending a request.
957+
958+
:ivar event_timestamp: The timestamp of the event associated with a
959+
prefix.
960+
:vartype event_timestamp: datetime
961+
:ivar event_type: The type of the event associated with a prefix.
962+
:vartype event_type: str
963+
:ivar event_summary: The summary of the event associated with a prefix.
964+
:vartype event_summary: str
965+
:ivar event_level: The level of the event associated with a prefix.
966+
:vartype event_level: str
967+
:ivar event_description: The description of the event associated with a
968+
prefix.
969+
:vartype event_description: str
970+
"""
971+
972+
_validation = {
973+
'event_timestamp': {'readonly': True},
974+
'event_type': {'readonly': True},
975+
'event_summary': {'readonly': True},
976+
'event_level': {'readonly': True},
977+
'event_description': {'readonly': True},
978+
}
979+
980+
_attribute_map = {
981+
'event_timestamp': {'key': 'eventTimestamp', 'type': 'iso-8601'},
982+
'event_type': {'key': 'eventType', 'type': 'str'},
983+
'event_summary': {'key': 'eventSummary', 'type': 'str'},
984+
'event_level': {'key': 'eventLevel', 'type': 'str'},
985+
'event_description': {'key': 'eventDescription', 'type': 'str'},
986+
}
987+
988+
def __init__(self, **kwargs):
989+
super(PeeringServicePrefixEvent, self).__init__(**kwargs)
990+
self.event_timestamp = None
991+
self.event_type = None
992+
self.event_summary = None
993+
self.event_level = None
994+
self.event_description = None
995+
996+
914997
class PeeringServiceProvider(Resource):
915998
"""PeeringService provider.
916999

0 commit comments

Comments
 (0)