Skip to content

Commit f0fe5fb

Browse files
author
SDKAuto
committed
CodeGen from PR 12711 in Azure/azure-rest-api-specs
Merge 832f743abc735125e073920ccef636b46dde9358 into 17dc295c84264fa23c35a75a6f9e1591282aec5b
1 parent e13e462 commit f0fe5fb

File tree

126 files changed

+92413
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+92413
-78
lines changed

sdk/network/azure-mgmt-network/azure/mgmt/network/_network_management_client.py

Lines changed: 333 additions & 1 deletion
Large diffs are not rendered by default.

sdk/network/azure-mgmt-network/azure/mgmt/network/_operations_mixin.py

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def check_dns_name_availability(self, location, domain_name_label, custom_header
3131
overrides<msrest:optionsforoperations>`.
3232
:return: DnsNameAvailabilityResult or ClientRawResponse if raw=true
3333
:rtype:
34-
~azure.mgmt.network.v2020_07_01.models.DnsNameAvailabilityResult or
34+
~azure.mgmt.network.v2020_08_01.models.DnsNameAvailabilityResult or
3535
~msrest.pipeline.ClientRawResponse
3636
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
3737
@@ -99,6 +99,8 @@ def check_dns_name_availability(self, location, domain_name_label, custom_header
9999
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
100100
elif api_version == '2020-07-01':
101101
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
102+
elif api_version == '2020-08-01':
103+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
102104
else:
103105
raise NotImplementedError("APIVersion {} is not available".format(api_version))
104106
mixin_instance = OperationClass()
@@ -119,7 +121,7 @@ def delete_bastion_shareable_link(self, resource_group_name, bastion_host_name,
119121
:type bastion_host_name: str
120122
:param vms: List of VM references.
121123
:type vms:
122-
list[~azure.mgmt.network.v2020_07_01.models.BastionShareableLink]
124+
list[~azure.mgmt.network.v2020_08_01.models.BastionShareableLink]
123125
:param dict custom_headers: headers that will be added to the request
124126
:param bool raw: The poller return type is ClientRawResponse, the
125127
direct response alongside the deserialized response
@@ -149,6 +151,8 @@ def delete_bastion_shareable_link(self, resource_group_name, bastion_host_name,
149151
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
150152
elif api_version == '2020-07-01':
151153
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
154+
elif api_version == '2020-08-01':
155+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
152156
else:
153157
raise NotImplementedError("APIVersion {} is not available".format(api_version))
154158
mixin_instance = OperationClass()
@@ -175,7 +179,7 @@ def disconnect_active_sessions(self, resource_group_name, bastion_host_name, ses
175179
overrides<msrest:optionsforoperations>`.
176180
:return: An iterator like instance of BastionSessionState
177181
:rtype:
178-
~azure.mgmt.network.v2020_07_01.models.BastionSessionStatePaged[~azure.mgmt.network.v2020_07_01.models.BastionSessionState]
182+
~azure.mgmt.network.v2020_08_01.models.BastionSessionStatePaged[~azure.mgmt.network.v2020_08_01.models.BastionSessionState]
179183
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
180184
181185
"""
@@ -196,6 +200,8 @@ def disconnect_active_sessions(self, resource_group_name, bastion_host_name, ses
196200
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
197201
elif api_version == '2020-07-01':
198202
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
203+
elif api_version == '2020-08-01':
204+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
199205
else:
200206
raise NotImplementedError("APIVersion {} is not available".format(api_version))
201207
mixin_instance = OperationClass()
@@ -222,7 +228,7 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
222228
:param authentication_method: VPN client authentication method.
223229
Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
224230
:type authentication_method: str or
225-
~azure.mgmt.network.v2020_07_01.models.AuthenticationMethod
231+
~azure.mgmt.network.v2020_08_01.models.AuthenticationMethod
226232
:param dict custom_headers: headers that will be added to the request
227233
:param bool raw: The poller return type is ClientRawResponse, the
228234
direct response alongside the deserialized response
@@ -231,9 +237,9 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
231237
:return: An instance of LROPoller that returns VpnProfileResponse or
232238
ClientRawResponse<VpnProfileResponse> if raw==True
233239
:rtype:
234-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_07_01.models.VpnProfileResponse]
240+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_08_01.models.VpnProfileResponse]
235241
or
236-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_07_01.models.VpnProfileResponse]]
242+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_08_01.models.VpnProfileResponse]]
237243
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
238244
239245
"""
@@ -256,6 +262,8 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
256262
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
257263
elif api_version == '2020-07-01':
258264
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
265+
elif api_version == '2020-08-01':
266+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
259267
else:
260268
raise NotImplementedError("APIVersion {} is not available".format(api_version))
261269
mixin_instance = OperationClass()
@@ -282,9 +290,9 @@ def get_active_sessions(self, resource_group_name, bastion_host_name, custom_hea
282290
BastionActiveSessionListResult or
283291
ClientRawResponse<BastionActiveSessionListResult> if raw==True
284292
:rtype:
285-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_07_01.models.BastionActiveSessionListResult]
293+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_08_01.models.BastionActiveSessionListResult]
286294
or
287-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_07_01.models.BastionActiveSessionListResult]]
295+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_08_01.models.BastionActiveSessionListResult]]
288296
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
289297
290298
"""
@@ -305,6 +313,8 @@ def get_active_sessions(self, resource_group_name, bastion_host_name, custom_hea
305313
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
306314
elif api_version == '2020-07-01':
307315
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
316+
elif api_version == '2020-08-01':
317+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
308318
else:
309319
raise NotImplementedError("APIVersion {} is not available".format(api_version))
310320
mixin_instance = OperationClass()
@@ -325,15 +335,15 @@ def get_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
325335
:type bastion_host_name: str
326336
:param vms: List of VM references.
327337
:type vms:
328-
list[~azure.mgmt.network.v2020_07_01.models.BastionShareableLink]
338+
list[~azure.mgmt.network.v2020_08_01.models.BastionShareableLink]
329339
:param dict custom_headers: headers that will be added to the request
330340
:param bool raw: returns the direct response alongside the
331341
deserialized response
332342
:param operation_config: :ref:`Operation configuration
333343
overrides<msrest:optionsforoperations>`.
334344
:return: An iterator like instance of BastionShareableLink
335345
:rtype:
336-
~azure.mgmt.network.v2020_07_01.models.BastionShareableLinkPaged[~azure.mgmt.network.v2020_07_01.models.BastionShareableLink]
346+
~azure.mgmt.network.v2020_08_01.models.BastionShareableLinkPaged[~azure.mgmt.network.v2020_08_01.models.BastionShareableLink]
337347
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
338348
339349
"""
@@ -354,6 +364,8 @@ def get_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
354364
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
355365
elif api_version == '2020-07-01':
356366
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
367+
elif api_version == '2020-08-01':
368+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
357369
else:
358370
raise NotImplementedError("APIVersion {} is not available".format(api_version))
359371
mixin_instance = OperationClass()
@@ -374,7 +386,7 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
374386
:type bastion_host_name: str
375387
:param vms: List of VM references.
376388
:type vms:
377-
list[~azure.mgmt.network.v2020_07_01.models.BastionShareableLink]
389+
list[~azure.mgmt.network.v2020_08_01.models.BastionShareableLink]
378390
:param dict custom_headers: headers that will be added to the request
379391
:param bool raw: The poller return type is ClientRawResponse, the
380392
direct response alongside the deserialized response
@@ -384,9 +396,9 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
384396
BastionShareableLinkListResult or
385397
ClientRawResponse<BastionShareableLinkListResult> if raw==True
386398
:rtype:
387-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_07_01.models.BastionShareableLinkListResult]
399+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_08_01.models.BastionShareableLinkListResult]
388400
or
389-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_07_01.models.BastionShareableLinkListResult]]
401+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_08_01.models.BastionShareableLinkListResult]]
390402
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
391403
392404
"""
@@ -407,6 +419,8 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
407419
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
408420
elif api_version == '2020-07-01':
409421
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
422+
elif api_version == '2020-08-01':
423+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
410424
else:
411425
raise NotImplementedError("APIVersion {} is not available".format(api_version))
412426
mixin_instance = OperationClass()
@@ -432,7 +446,7 @@ def supported_security_providers(self, resource_group_name, virtual_wan_name, cu
432446
overrides<msrest:optionsforoperations>`.
433447
:return: VirtualWanSecurityProviders or ClientRawResponse if raw=true
434448
:rtype:
435-
~azure.mgmt.network.v2020_07_01.models.VirtualWanSecurityProviders or
449+
~azure.mgmt.network.v2020_08_01.models.VirtualWanSecurityProviders or
436450
~msrest.pipeline.ClientRawResponse
437451
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
438452
@@ -472,6 +486,8 @@ def supported_security_providers(self, resource_group_name, virtual_wan_name, cu
472486
from .v2020_06_01.operations import NetworkManagementClientOperationsMixin as OperationClass
473487
elif api_version == '2020-07-01':
474488
from .v2020_07_01.operations import NetworkManagementClientOperationsMixin as OperationClass
489+
elif api_version == '2020-08-01':
490+
from .v2020_08_01.operations import NetworkManagementClientOperationsMixin as OperationClass
475491
else:
476492
raise NotImplementedError("APIVersion {} is not available".format(api_version))
477493
mixin_instance = OperationClass()

sdk/network/azure-mgmt-network/azure/mgmt/network/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
from .v2019_02_01.models import *
99
from .v2019_07_01.models import *
1010
from .v2020_04_01.models import *
11-
from .v2020_07_01.models import *
11+
from .v2020_08_01.models import *

sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01/models/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,6 @@
11161116
SecurityProviderName,
11171117
SecurityPartnerProviderConnectionStatus,
11181118
VirtualNetworkPeeringState,
1119-
VirtualNetworkPeeringLevel,
11201119
VirtualNetworkGatewayType,
11211120
VpnType,
11221121
VpnGatewayGeneration,
@@ -1812,7 +1811,6 @@
18121811
'SecurityProviderName',
18131812
'SecurityPartnerProviderConnectionStatus',
18141813
'VirtualNetworkPeeringState',
1815-
'VirtualNetworkPeeringLevel',
18161814
'VirtualNetworkGatewayType',
18171815
'VpnType',
18181816
'VpnGatewayGeneration',

sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_07_01/models/_models.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7714,8 +7714,6 @@ class ExpressRouteConnection(SubResource):
77147714
:type routing_weight: int
77157715
:param enable_internet_security: Enable internet security.
77167716
:type enable_internet_security: bool
7717-
:param express_route_gateway_bypass: Enable FastPath to vWan Firewall hub.
7718-
:type express_route_gateway_bypass: bool
77197717
:param routing_configuration: The Routing Configuration indicating the
77207718
associated and propagated route tables on this connection.
77217719
:type routing_configuration:
@@ -7737,7 +7735,6 @@ class ExpressRouteConnection(SubResource):
77377735
'authorization_key': {'key': 'properties.authorizationKey', 'type': 'str'},
77387736
'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'},
77397737
'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'},
7740-
'express_route_gateway_bypass': {'key': 'properties.expressRouteGatewayBypass', 'type': 'bool'},
77417738
'routing_configuration': {'key': 'properties.routingConfiguration', 'type': 'RoutingConfiguration'},
77427739
'name': {'key': 'name', 'type': 'str'},
77437740
}
@@ -7749,7 +7746,6 @@ def __init__(self, **kwargs):
77497746
self.authorization_key = kwargs.get('authorization_key', None)
77507747
self.routing_weight = kwargs.get('routing_weight', None)
77517748
self.enable_internet_security = kwargs.get('enable_internet_security', None)
7752-
self.express_route_gateway_bypass = kwargs.get('express_route_gateway_bypass', None)
77537749
self.routing_configuration = kwargs.get('routing_configuration', None)
77547750
self.name = kwargs.get('name', None)
77557751

@@ -18125,14 +18121,10 @@ class VirtualNetworkPeering(SubResource):
1812518121
(https://docs.microsoft.com/en-us/azure/virtual-network/virtual-network-create-peering).
1812618122
:type remote_virtual_network:
1812718123
~azure.mgmt.network.v2020_07_01.models.SubResource
18128-
:param remote_address_space: The reference to the address space peered
18129-
with the remote virtual network.
18124+
:param remote_address_space: The reference to the remote virtual network
18125+
address space.
1813018126
:type remote_address_space:
1813118127
~azure.mgmt.network.v2020_07_01.models.AddressSpace
18132-
:param remote_virtual_network_address_space: The reference to the current
18133-
address space of the remote virtual network.
18134-
:type remote_virtual_network_address_space:
18135-
~azure.mgmt.network.v2020_07_01.models.AddressSpace
1813618128
:param remote_bgp_communities: The reference to the remote virtual
1813718129
network's Bgp Communities.
1813818130
:type remote_bgp_communities:
@@ -18141,15 +18133,6 @@ class VirtualNetworkPeering(SubResource):
1814118133
values include: 'Initiated', 'Connected', 'Disconnected'
1814218134
:type peering_state: str or
1814318135
~azure.mgmt.network.v2020_07_01.models.VirtualNetworkPeeringState
18144-
:param peering_sync_level: The peering sync status of the virtual network
18145-
peering. Possible values include: 'FullySynced', 'RemoteUnsynced',
18146-
'LocalUnsynced', 'LocalAndRemoteUnsynced'
18147-
:type peering_sync_level: str or
18148-
~azure.mgmt.network.v2020_07_01.models.VirtualNetworkPeeringLevel
18149-
:param sync_remote_address_space: Provided when user wants to sync the
18150-
peering with address space on the remote virtual network after the address
18151-
space is updated. Default value: False .
18152-
:type sync_remote_address_space: bool
1815318136
:ivar provisioning_state: The provisioning state of the virtual network
1815418137
peering resource. Possible values include: 'Succeeded', 'Updating',
1815518138
'Deleting', 'Failed'
@@ -18176,11 +18159,8 @@ class VirtualNetworkPeering(SubResource):
1817618159
'use_remote_gateways': {'key': 'properties.useRemoteGateways', 'type': 'bool'},
1817718160
'remote_virtual_network': {'key': 'properties.remoteVirtualNetwork', 'type': 'SubResource'},
1817818161
'remote_address_space': {'key': 'properties.remoteAddressSpace', 'type': 'AddressSpace'},
18179-
'remote_virtual_network_address_space': {'key': 'properties.remoteVirtualNetworkAddressSpace', 'type': 'AddressSpace'},
1818018162
'remote_bgp_communities': {'key': 'properties.remoteBgpCommunities', 'type': 'VirtualNetworkBgpCommunities'},
1818118163
'peering_state': {'key': 'properties.peeringState', 'type': 'str'},
18182-
'peering_sync_level': {'key': 'properties.peeringSyncLevel', 'type': 'str'},
18183-
'sync_remote_address_space': {'key': 'properties.syncRemoteAddressSpace', 'type': 'bool'},
1818418164
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
1818518165
'name': {'key': 'name', 'type': 'str'},
1818618166
'etag': {'key': 'etag', 'type': 'str'},
@@ -18194,11 +18174,8 @@ def __init__(self, **kwargs):
1819418174
self.use_remote_gateways = kwargs.get('use_remote_gateways', None)
1819518175
self.remote_virtual_network = kwargs.get('remote_virtual_network', None)
1819618176
self.remote_address_space = kwargs.get('remote_address_space', None)
18197-
self.remote_virtual_network_address_space = kwargs.get('remote_virtual_network_address_space', None)
1819818177
self.remote_bgp_communities = kwargs.get('remote_bgp_communities', None)
1819918178
self.peering_state = kwargs.get('peering_state', None)
18200-
self.peering_sync_level = kwargs.get('peering_sync_level', None)
18201-
self.sync_remote_address_space = kwargs.get('sync_remote_address_space', False)
1820218179
self.provisioning_state = None
1820318180
self.name = kwargs.get('name', None)
1820418181
self.etag = None

0 commit comments

Comments
 (0)