Skip to content

[AutoPR network/resource-manager] Local september branch merge to master #3316

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.

Sign up for GitHub

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

Merged
AutorestCI merged 4 commits into from
Sep 11, 2018
Merged

[AutoPR network/resource-manager] Local september branch merge to master #3316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e061134
Generated from cae1d45d0e97bdb064573cb8cb684b881656e4ff
AutorestCI Sep 11, 2018
717e7ba
Generated from ec5a468540d009a1c1a5ea68073816c00baddd5d
AutorestCI Sep 11, 2018
13a7ab2
Packaging update of azure-mgmt-network
azuresdkci Sep 11, 2018
21f3142
Generated from e4e4d8af1431b33e8cc8dc7a46448c06dd90d7a4
AutorestCI Sep 11, 2018
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
Prev Previous commit
Generated from e4e4d8af1431b33e8cc8dc7a46448c06dd90d7a4 
Merge branch 'Network-September-Release' into local-september-branch
  • Loading branch information
@AutorestCI
AutorestCI committed Sep 11, 2018
commit 21f31427f148548aba2a1b3450879fccb9c97def
16 changes: 13 additions & 3 deletions azure-mgmt-network/azure/mgmt/network/network_management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2402,7 +2402,6 @@ def virtual_wa_ns(self):
* 2018-04-01: :class:`VirtualWANsOperations<azure.mgmt.network.v2018_04_01.operations.VirtualWANsOperations>`
* 2018-06-01: :class:`VirtualWANsOperations<azure.mgmt.network.v2018_06_01.operations.VirtualWANsOperations>`
* 2018-07-01: :class:`VirtualWANsOperations<azure.mgmt.network.v2018_07_01.operations.VirtualWANsOperations>`
* 2018-08-01: :class:`VirtualWANsOperations<azure.mgmt.network.v2018_08_01.operations.VirtualWANsOperations>`
"""
api_version = self._get_api_version('virtual_wa_ns')
if api_version == '2018-04-01':
Expand All @@ -2411,8 +2410,19 @@ def virtual_wa_ns(self):
from .v2018_06_01.operations import VirtualWANsOperations as OperationClass
elif api_version == '2018-07-01':
from .v2018_07_01.operations import VirtualWANsOperations as OperationClass
elif api_version == '2018-08-01':
from .v2018_08_01.operations import VirtualWANsOperations 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 virtual_wans(self):
"""Instance depends on the API version:

* 2018-08-01: :class:`VirtualWansOperations<azure.mgmt.network.v2018_08_01.operations.VirtualWansOperations>`
"""
api_version = self._get_api_version('virtual_wans')
if api_version == '2018-08-01':
from .v2018_08_01.operations import VirtualWansOperations 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)))
Expand Down
24 changes: 12 additions & 12 deletions azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@
from .operations.virtual_network_gateways_operations import VirtualNetworkGatewaysOperations
from .operations.virtual_network_gateway_connections_operations import VirtualNetworkGatewayConnectionsOperations
from .operations.local_network_gateways_operations import LocalNetworkGatewaysOperations
from .operations.virtual_wa_ns_operations import VirtualWANsOperations
from .operations.virtual_wans_operations import VirtualWansOperations
from .operations.vpn_sites_operations import VpnSitesOperations
from .operations.vpn_sites_configuration_operations import VpnSitesConfigurationOperations
from .operations.virtual_hubs_operations import VirtualHubsOperations
from .operations.hub_virtual_network_connections_operations import HubVirtualNetworkConnectionsOperations
from .operations.vpn_gateways_operations import VpnGatewaysOperations
from .operations.vpn_connections_operations import VpnConnectionsOperations
from .operations.p2_svpn_server_configurations_operations import P2SVpnServerConfigurationsOperations
from .operations.p2_svpn_gateways_operations import P2SVpnGatewaysOperations
from .operations.p2s_vpn_server_configurations_operations import P2sVpnServerConfigurationsOperations
from .operations.p2s_vpn_gateways_operations import P2sVpnGatewaysOperations
from . import models


Expand Down Expand Up @@ -232,8 +232,8 @@ class NetworkManagementClient(SDKClient):
:vartype virtual_network_gateway_connections: azure.mgmt.network.v2018_08_01.operations.VirtualNetworkGatewayConnectionsOperations
:ivar local_network_gateways: LocalNetworkGateways operations
:vartype local_network_gateways: azure.mgmt.network.v2018_08_01.operations.LocalNetworkGatewaysOperations
:ivar virtual_wa_ns: VirtualWANs operations
:vartype virtual_wa_ns: azure.mgmt.network.v2018_08_01.operations.VirtualWANsOperations
:ivar virtual_wans: VirtualWans operations
:vartype virtual_wans: azure.mgmt.network.v2018_08_01.operations.VirtualWansOperations
:ivar vpn_sites: VpnSites operations
:vartype vpn_sites: azure.mgmt.network.v2018_08_01.operations.VpnSitesOperations
:ivar vpn_sites_configuration: VpnSitesConfiguration operations
Expand All @@ -246,10 +246,10 @@ class NetworkManagementClient(SDKClient):
:vartype vpn_gateways: azure.mgmt.network.v2018_08_01.operations.VpnGatewaysOperations
:ivar vpn_connections: VpnConnections operations
:vartype vpn_connections: azure.mgmt.network.v2018_08_01.operations.VpnConnectionsOperations
:ivar p2_svpn_server_configurations: P2SVpnServerConfigurations operations
:vartype p2_svpn_server_configurations: azure.mgmt.network.v2018_08_01.operations.P2SVpnServerConfigurationsOperations
:ivar p2_svpn_gateways: P2SVpnGateways operations
:vartype p2_svpn_gateways: azure.mgmt.network.v2018_08_01.operations.P2SVpnGatewaysOperations
:ivar p2s_vpn_server_configurations: P2sVpnServerConfigurations operations
:vartype p2s_vpn_server_configurations: azure.mgmt.network.v2018_08_01.operations.P2sVpnServerConfigurationsOperations
:ivar p2s_vpn_gateways: P2sVpnGateways operations
:vartype p2s_vpn_gateways: azure.mgmt.network.v2018_08_01.operations.P2sVpnGatewaysOperations

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
Expand Down Expand Up @@ -379,7 +379,7 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.local_network_gateways = LocalNetworkGatewaysOperations(
self._client, self.config, self._serialize, self._deserialize)
self.virtual_wa_ns = VirtualWANsOperations(
self.virtual_wans = VirtualWansOperations(
self._client, self.config, self._serialize, self._deserialize)
self.vpn_sites = VpnSitesOperations(
self._client, self.config, self._serialize, self._deserialize)
Expand All @@ -393,9 +393,9 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.vpn_connections = VpnConnectionsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.p2_svpn_server_configurations = P2SVpnServerConfigurationsOperations(
self.p2s_vpn_server_configurations = P2sVpnServerConfigurationsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.p2_svpn_gateways = P2SVpnGatewaysOperations(
self.p2s_vpn_gateways = P2sVpnGatewaysOperations(
self._client, self.config, self._serialize, self._deserialize)

def check_dns_name_availability(
Expand Down
12 changes: 6 additions & 6 deletions azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@
from .virtual_network_gateways_operations import VirtualNetworkGatewaysOperations
from .virtual_network_gateway_connections_operations import VirtualNetworkGatewayConnectionsOperations
from .local_network_gateways_operations import LocalNetworkGatewaysOperations
from .virtual_wa_ns_operations import VirtualWANsOperations
from .virtual_wans_operations import VirtualWansOperations
from .vpn_sites_operations import VpnSitesOperations
from .vpn_sites_configuration_operations import VpnSitesConfigurationOperations
from .virtual_hubs_operations import VirtualHubsOperations
from .hub_virtual_network_connections_operations import HubVirtualNetworkConnectionsOperations
from .vpn_gateways_operations import VpnGatewaysOperations
from .vpn_connections_operations import VpnConnectionsOperations
from .p2_svpn_server_configurations_operations import P2SVpnServerConfigurationsOperations
from .p2_svpn_gateways_operations import P2SVpnGatewaysOperations
from .p2s_vpn_server_configurations_operations import P2sVpnServerConfigurationsOperations
from .p2s_vpn_gateways_operations import P2sVpnGatewaysOperations

__all__ = [
'ApplicationGatewaysOperations',
Expand Down Expand Up @@ -128,13 +128,13 @@
'VirtualNetworkGatewaysOperations',
'VirtualNetworkGatewayConnectionsOperations',
'LocalNetworkGatewaysOperations',
'VirtualWANsOperations',
'VirtualWansOperations',
'VpnSitesOperations',
'VpnSitesConfigurationOperations',
'VirtualHubsOperations',
'HubVirtualNetworkConnectionsOperations',
'VpnGatewaysOperations',
'VpnConnectionsOperations',
'P2SVpnServerConfigurationsOperations',
'P2SVpnGatewaysOperations',
'P2sVpnServerConfigurationsOperations',
'P2sVpnGatewaysOperations',
]
4 changes: 2 additions & 2 deletions ...operations/p2_svpn_gateways_operations.py → ...operations/p2s_vpn_gateways_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
from .. import models


class P2SVpnGatewaysOperations(object):
"""P2SVpnGatewaysOperations operations.
class P2sVpnGatewaysOperations(object):
"""P2sVpnGatewaysOperations operations.

:param client: Client for service requests.
:param config: Configuration of service client.
Expand Down
4 changes: 2 additions & 2 deletions ..._svpn_server_configurations_operations.py → ...s_vpn_server_configurations_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
from .. import models


class P2SVpnServerConfigurationsOperations(object):
"""P2SVpnServerConfigurationsOperations operations.
class P2sVpnServerConfigurationsOperations(object):
"""P2sVpnServerConfigurationsOperations operations.

:param client: Client for service requests.
:param config: Configuration of service client.
Expand Down
4 changes: 2 additions & 2 deletions ...01/operations/virtual_wa_ns_operations.py → ..._01/operations/virtual_wans_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
from .. import models


class VirtualWANsOperations(object):
"""VirtualWANsOperations operations.
class VirtualWansOperations(object):
"""VirtualWansOperations operations.

:param client: Client for service requests.
:param config: Configuration of service client.
Expand Down