Skip to content

Commit 60f769d

Browse files
author
SDK Automation
committed
Generated from d12b3d86cdb43b5ad0ffe87b1e3a3cbceda12cd3
add package-2020-05
1 parent debbb83 commit 60f769d

File tree

119 files changed

+85835
-41
lines changed

Some content is hidden

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

119 files changed

+85835
-41
lines changed

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

+389-1
Large diffs are not rendered by default.

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

+30-14
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_04_01.models.DnsNameAvailabilityResult or
34+
~azure.mgmt.network.v2020_05_01.models.DnsNameAvailabilityResult or
3535
~msrest.pipeline.ClientRawResponse
3636
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
3737
@@ -93,6 +93,8 @@ def check_dns_name_availability(self, location, domain_name_label, custom_header
9393
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
9494
elif api_version == '2020-04-01':
9595
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
96+
elif api_version == '2020-05-01':
97+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
9698
else:
9799
raise NotImplementedError("APIVersion {} is not available".format(api_version))
98100
mixin_instance = OperationClass()
@@ -113,7 +115,7 @@ def delete_bastion_shareable_link(self, resource_group_name, bastion_host_name,
113115
:type bastion_host_name: str
114116
:param vms: List of VM references.
115117
:type vms:
116-
list[~azure.mgmt.network.v2020_04_01.models.BastionShareableLink]
118+
list[~azure.mgmt.network.v2020_05_01.models.BastionShareableLink]
117119
:param dict custom_headers: headers that will be added to the request
118120
:param bool raw: The poller return type is ClientRawResponse, the
119121
direct response alongside the deserialized response
@@ -137,6 +139,8 @@ def delete_bastion_shareable_link(self, resource_group_name, bastion_host_name,
137139
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
138140
elif api_version == '2020-04-01':
139141
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
142+
elif api_version == '2020-05-01':
143+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
140144
else:
141145
raise NotImplementedError("APIVersion {} is not available".format(api_version))
142146
mixin_instance = OperationClass()
@@ -163,7 +167,7 @@ def disconnect_active_sessions(self, resource_group_name, bastion_host_name, ses
163167
overrides<msrest:optionsforoperations>`.
164168
:return: An iterator like instance of BastionSessionState
165169
:rtype:
166-
~azure.mgmt.network.v2020_04_01.models.BastionSessionStatePaged[~azure.mgmt.network.v2020_04_01.models.BastionSessionState]
170+
~azure.mgmt.network.v2020_05_01.models.BastionSessionStatePaged[~azure.mgmt.network.v2020_05_01.models.BastionSessionState]
167171
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
168172
169173
"""
@@ -178,6 +182,8 @@ def disconnect_active_sessions(self, resource_group_name, bastion_host_name, ses
178182
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
179183
elif api_version == '2020-04-01':
180184
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
185+
elif api_version == '2020-05-01':
186+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
181187
else:
182188
raise NotImplementedError("APIVersion {} is not available".format(api_version))
183189
mixin_instance = OperationClass()
@@ -204,7 +210,7 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
204210
:param authentication_method: VPN client authentication method.
205211
Possible values include: 'EAPTLS', 'EAPMSCHAPv2'
206212
:type authentication_method: str or
207-
~azure.mgmt.network.v2020_04_01.models.AuthenticationMethod
213+
~azure.mgmt.network.v2020_05_01.models.AuthenticationMethod
208214
:param dict custom_headers: headers that will be added to the request
209215
:param bool raw: The poller return type is ClientRawResponse, the
210216
direct response alongside the deserialized response
@@ -213,9 +219,9 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
213219
:return: An instance of LROPoller that returns VpnProfileResponse or
214220
ClientRawResponse<VpnProfileResponse> if raw==True
215221
:rtype:
216-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_04_01.models.VpnProfileResponse]
222+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_05_01.models.VpnProfileResponse]
217223
or
218-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_04_01.models.VpnProfileResponse]]
224+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_05_01.models.VpnProfileResponse]]
219225
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
220226
221227
"""
@@ -232,6 +238,8 @@ def generatevirtualwanvpnserverconfigurationvpnprofile(self, resource_group_name
232238
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
233239
elif api_version == '2020-04-01':
234240
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
241+
elif api_version == '2020-05-01':
242+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
235243
else:
236244
raise NotImplementedError("APIVersion {} is not available".format(api_version))
237245
mixin_instance = OperationClass()
@@ -258,9 +266,9 @@ def get_active_sessions(self, resource_group_name, bastion_host_name, custom_hea
258266
BastionActiveSessionListResult or
259267
ClientRawResponse<BastionActiveSessionListResult> if raw==True
260268
:rtype:
261-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_04_01.models.BastionActiveSessionListResult]
269+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_05_01.models.BastionActiveSessionListResult]
262270
or
263-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_04_01.models.BastionActiveSessionListResult]]
271+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_05_01.models.BastionActiveSessionListResult]]
264272
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
265273
266274
"""
@@ -275,6 +283,8 @@ def get_active_sessions(self, resource_group_name, bastion_host_name, custom_hea
275283
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
276284
elif api_version == '2020-04-01':
277285
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
286+
elif api_version == '2020-05-01':
287+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
278288
else:
279289
raise NotImplementedError("APIVersion {} is not available".format(api_version))
280290
mixin_instance = OperationClass()
@@ -295,15 +305,15 @@ def get_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
295305
:type bastion_host_name: str
296306
:param vms: List of VM references.
297307
:type vms:
298-
list[~azure.mgmt.network.v2020_04_01.models.BastionShareableLink]
308+
list[~azure.mgmt.network.v2020_05_01.models.BastionShareableLink]
299309
:param dict custom_headers: headers that will be added to the request
300310
:param bool raw: returns the direct response alongside the
301311
deserialized response
302312
:param operation_config: :ref:`Operation configuration
303313
overrides<msrest:optionsforoperations>`.
304314
:return: An iterator like instance of BastionShareableLink
305315
:rtype:
306-
~azure.mgmt.network.v2020_04_01.models.BastionShareableLinkPaged[~azure.mgmt.network.v2020_04_01.models.BastionShareableLink]
316+
~azure.mgmt.network.v2020_05_01.models.BastionShareableLinkPaged[~azure.mgmt.network.v2020_05_01.models.BastionShareableLink]
307317
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
308318
309319
"""
@@ -318,6 +328,8 @@ def get_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
318328
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
319329
elif api_version == '2020-04-01':
320330
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
331+
elif api_version == '2020-05-01':
332+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
321333
else:
322334
raise NotImplementedError("APIVersion {} is not available".format(api_version))
323335
mixin_instance = OperationClass()
@@ -338,7 +350,7 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
338350
:type bastion_host_name: str
339351
:param vms: List of VM references.
340352
:type vms:
341-
list[~azure.mgmt.network.v2020_04_01.models.BastionShareableLink]
353+
list[~azure.mgmt.network.v2020_05_01.models.BastionShareableLink]
342354
:param dict custom_headers: headers that will be added to the request
343355
:param bool raw: The poller return type is ClientRawResponse, the
344356
direct response alongside the deserialized response
@@ -348,9 +360,9 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
348360
BastionShareableLinkListResult or
349361
ClientRawResponse<BastionShareableLinkListResult> if raw==True
350362
:rtype:
351-
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_04_01.models.BastionShareableLinkListResult]
363+
~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2020_05_01.models.BastionShareableLinkListResult]
352364
or
353-
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_04_01.models.BastionShareableLinkListResult]]
365+
~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2020_05_01.models.BastionShareableLinkListResult]]
354366
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
355367
356368
"""
@@ -365,6 +377,8 @@ def put_bastion_shareable_link(self, resource_group_name, bastion_host_name, vms
365377
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
366378
elif api_version == '2020-04-01':
367379
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
380+
elif api_version == '2020-05-01':
381+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
368382
else:
369383
raise NotImplementedError("APIVersion {} is not available".format(api_version))
370384
mixin_instance = OperationClass()
@@ -390,7 +404,7 @@ def supported_security_providers(self, resource_group_name, virtual_wan_name, cu
390404
overrides<msrest:optionsforoperations>`.
391405
:return: VirtualWanSecurityProviders or ClientRawResponse if raw=true
392406
:rtype:
393-
~azure.mgmt.network.v2020_04_01.models.VirtualWanSecurityProviders or
407+
~azure.mgmt.network.v2020_05_01.models.VirtualWanSecurityProviders or
394408
~msrest.pipeline.ClientRawResponse
395409
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
396410
@@ -424,6 +438,8 @@ def supported_security_providers(self, resource_group_name, virtual_wan_name, cu
424438
from .v2020_03_01.operations import NetworkManagementClientOperationsMixin as OperationClass
425439
elif api_version == '2020-04-01':
426440
from .v2020_04_01.operations import NetworkManagementClientOperationsMixin as OperationClass
441+
elif api_version == '2020-05-01':
442+
from .v2020_05_01.operations import NetworkManagementClientOperationsMixin as OperationClass
427443
else:
428444
raise NotImplementedError("APIVersion {} is not available".format(api_version))
429445
mixin_instance = OperationClass()

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

+1
Original file line numberDiff line numberDiff line change
@@ -8,3 +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_05_01.models import *

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,6 @@
921921
RouteNextHopType,
922922
PublicIPAddressSkuName,
923923
DdosSettingsProtectionCoverage,
924-
VirtualNetworkPeeringState,
925924
TransportProtocol,
926925
ApplicationGatewayCookieBasedAffinity,
927926
ApplicationGatewayBackendHealthServerHealth,
@@ -1004,6 +1003,7 @@
10041003
PublicIPPrefixSkuName,
10051004
SecurityProviderName,
10061005
SecurityPartnerProviderConnectionStatus,
1006+
VirtualNetworkPeeringState,
10071007
VirtualNetworkGatewayType,
10081008
VpnType,
10091009
VpnGatewayGeneration,
@@ -1546,7 +1546,6 @@
15461546
'RouteNextHopType',
15471547
'PublicIPAddressSkuName',
15481548
'DdosSettingsProtectionCoverage',
1549-
'VirtualNetworkPeeringState',
15501549
'TransportProtocol',
15511550
'ApplicationGatewayCookieBasedAffinity',
15521551
'ApplicationGatewayBackendHealthServerHealth',
@@ -1629,6 +1628,7 @@
16291628
'PublicIPPrefixSkuName',
16301629
'SecurityProviderName',
16311630
'SecurityPartnerProviderConnectionStatus',
1631+
'VirtualNetworkPeeringState',
16321632
'VirtualNetworkGatewayType',
16331633
'VpnType',
16341634
'VpnGatewayGeneration',

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

+14-8
Original file line numberDiff line numberDiff line change
@@ -9546,31 +9546,37 @@ def __init__(self, **kwargs):
95469546
class LoadBalancerBackendAddress(Model):
95479547
"""Load balancer backend addresses.
95489548

9549+
Variables are only populated by the server, and will be ignored when
9550+
sending a request.
9551+
95499552
:param virtual_network: Reference to an existing virtual network.
9550-
:type virtual_network:
9551-
~azure.mgmt.network.v2020_04_01.models.VirtualNetwork
9553+
:type virtual_network: ~azure.mgmt.network.v2020_04_01.models.SubResource
95529554
:param ip_address: IP Address belonging to the referenced virtual network.
95539555
:type ip_address: str
9554-
:param network_interface_ip_configuration: Reference to IP address defined
9556+
:ivar network_interface_ip_configuration: Reference to IP address defined
95559557
in network interfaces.
9556-
:type network_interface_ip_configuration:
9557-
~azure.mgmt.network.v2020_04_01.models.NetworkInterfaceIPConfiguration
9558+
:vartype network_interface_ip_configuration:
9559+
~azure.mgmt.network.v2020_04_01.models.SubResource
95589560
:param name: Name of the backend address.
95599561
:type name: str
95609562
"""
95619563

9564+
_validation = {
9565+
'network_interface_ip_configuration': {'readonly': True},
9566+
}
9567+
95629568
_attribute_map = {
9563-
'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'VirtualNetwork'},
9569+
'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'SubResource'},
95649570
'ip_address': {'key': 'properties.ipAddress', 'type': 'str'},
9565-
'network_interface_ip_configuration': {'key': 'properties.networkInterfaceIPConfiguration', 'type': 'NetworkInterfaceIPConfiguration'},
9571+
'network_interface_ip_configuration': {'key': 'properties.networkInterfaceIPConfiguration', 'type': 'SubResource'},
95669572
'name': {'key': 'name', 'type': 'str'},
95679573
}
95689574

95699575
def __init__(self, **kwargs):
95709576
super(LoadBalancerBackendAddress, self).__init__(**kwargs)
95719577
self.virtual_network = kwargs.get('virtual_network', None)
95729578
self.ip_address = kwargs.get('ip_address', None)
9573-
self.network_interface_ip_configuration = kwargs.get('network_interface_ip_configuration', None)
9579+
self.network_interface_ip_configuration = None
95749580
self.name = kwargs.get('name', None)
95759581

95769582

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

+15-9
Original file line numberDiff line numberDiff line change
@@ -9546,31 +9546,37 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, fro
95469546
class LoadBalancerBackendAddress(Model):
95479547
"""Load balancer backend addresses.
95489548

9549+
Variables are only populated by the server, and will be ignored when
9550+
sending a request.
9551+
95499552
:param virtual_network: Reference to an existing virtual network.
9550-
:type virtual_network:
9551-
~azure.mgmt.network.v2020_04_01.models.VirtualNetwork
9553+
:type virtual_network: ~azure.mgmt.network.v2020_04_01.models.SubResource
95529554
:param ip_address: IP Address belonging to the referenced virtual network.
95539555
:type ip_address: str
9554-
:param network_interface_ip_configuration: Reference to IP address defined
9556+
:ivar network_interface_ip_configuration: Reference to IP address defined
95559557
in network interfaces.
9556-
:type network_interface_ip_configuration:
9557-
~azure.mgmt.network.v2020_04_01.models.NetworkInterfaceIPConfiguration
9558+
:vartype network_interface_ip_configuration:
9559+
~azure.mgmt.network.v2020_04_01.models.SubResource
95589560
:param name: Name of the backend address.
95599561
:type name: str
95609562
"""
95619563

9564+
_validation = {
9565+
'network_interface_ip_configuration': {'readonly': True},
9566+
}
9567+
95629568
_attribute_map = {
9563-
'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'VirtualNetwork'},
9569+
'virtual_network': {'key': 'properties.virtualNetwork', 'type': 'SubResource'},
95649570
'ip_address': {'key': 'properties.ipAddress', 'type': 'str'},
9565-
'network_interface_ip_configuration': {'key': 'properties.networkInterfaceIPConfiguration', 'type': 'NetworkInterfaceIPConfiguration'},
9571+
'network_interface_ip_configuration': {'key': 'properties.networkInterfaceIPConfiguration', 'type': 'SubResource'},
95669572
'name': {'key': 'name', 'type': 'str'},
95679573
}
95689574

9569-
def __init__(self, *, virtual_network=None, ip_address: str=None, network_interface_ip_configuration=None, name: str=None, **kwargs) -> None:
9575+
def __init__(self, *, virtual_network=None, ip_address: str=None, name: str=None, **kwargs) -> None:
95709576
super(LoadBalancerBackendAddress, self).__init__(**kwargs)
95719577
self.virtual_network = virtual_network
95729578
self.ip_address = ip_address
9573-
self.network_interface_ip_configuration = network_interface_ip_configuration
9579+
self.network_interface_ip_configuration = None
95749580
self.name = name
95759581

95769582

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,6 @@ class DdosSettingsProtectionCoverage(str, Enum):
8686
standard = "Standard"
8787

8888

89-
class VirtualNetworkPeeringState(str, Enum):
90-
91-
initiated = "Initiated"
92-
connected = "Connected"
93-
disconnected = "Disconnected"
94-
95-
9689
class TransportProtocol(str, Enum):
9790

9891
udp = "Udp"
@@ -678,6 +671,13 @@ class SecurityPartnerProviderConnectionStatus(str, Enum):
678671
not_connected = "NotConnected"
679672

680673

674+
class VirtualNetworkPeeringState(str, Enum):
675+
676+
initiated = "Initiated"
677+
connected = "Connected"
678+
disconnected = "Disconnected"
679+
680+
681681
class VirtualNetworkGatewayType(str, Enum):
682682

683683
vpn = "Vpn"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from ._configuration import NetworkManagementClientConfiguration
13+
from ._network_management_client import NetworkManagementClient
14+
__all__ = ['NetworkManagementClient', 'NetworkManagementClientConfiguration']
15+
16+
from .version import VERSION
17+
18+
__version__ = VERSION
19+

0 commit comments

Comments
 (0)