diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index a99844516373..4c5a7e5cb869 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -254,16 +254,28 @@ from .virtual_network_connection_gateway_reference_py3 import VirtualNetworkConnectionGatewayReference from .virtual_network_gateway_connection_list_entity_py3 import VirtualNetworkGatewayConnectionListEntity from .vpn_device_script_parameters_py3 import VpnDeviceScriptParameters + from .p2_svpn_server_config_vpn_client_root_certificate_py3 import P2SVpnServerConfigVpnClientRootCertificate + from .p2_svpn_server_config_vpn_client_revoked_certificate_py3 import P2SVpnServerConfigVpnClientRevokedCertificate + from .p2_svpn_server_config_radius_server_root_certificate_py3 import P2SVpnServerConfigRadiusServerRootCertificate + from .p2_svpn_server_config_radius_client_root_certificate_py3 import P2SVpnServerConfigRadiusClientRootCertificate + from .p2_svpn_server_configuration_py3 import P2SVpnServerConfiguration from .virtual_wan_py3 import VirtualWAN from .device_properties_py3 import DeviceProperties from .vpn_site_py3 import VpnSite from .get_vpn_sites_configuration_request_py3 import GetVpnSitesConfigurationRequest from .hub_virtual_network_connection_py3 import HubVirtualNetworkConnection + from .virtual_hub_route_py3 import VirtualHubRoute + from .virtual_hub_route_table_py3 import VirtualHubRouteTable from .virtual_hub_py3 import VirtualHub from .vpn_connection_py3 import VpnConnection - from .policies_py3 import Policies from .vpn_gateway_py3 import VpnGateway from .vpn_site_id_py3 import VpnSiteId + from .virtual_wan_security_provider_py3 import VirtualWanSecurityProvider + from .virtual_wan_security_providers_py3 import VirtualWanSecurityProviders + from .vpn_client_connection_health_py3 import VpnClientConnectionHealth + from .p2_svpn_gateway_py3 import P2SVpnGateway + from .p2_svpn_profile_parameters_py3 import P2SVpnProfileParameters + from .vpn_profile_response_py3 import VpnProfileResponse except (SyntaxError, ImportError): from .network_interface_tap_configuration import NetworkInterfaceTapConfiguration from .sub_resource import SubResource @@ -509,16 +521,28 @@ from .virtual_network_connection_gateway_reference import VirtualNetworkConnectionGatewayReference from .virtual_network_gateway_connection_list_entity import VirtualNetworkGatewayConnectionListEntity from .vpn_device_script_parameters import VpnDeviceScriptParameters + from .p2_svpn_server_config_vpn_client_root_certificate import P2SVpnServerConfigVpnClientRootCertificate + from .p2_svpn_server_config_vpn_client_revoked_certificate import P2SVpnServerConfigVpnClientRevokedCertificate + from .p2_svpn_server_config_radius_server_root_certificate import P2SVpnServerConfigRadiusServerRootCertificate + from .p2_svpn_server_config_radius_client_root_certificate import P2SVpnServerConfigRadiusClientRootCertificate + from .p2_svpn_server_configuration import P2SVpnServerConfiguration from .virtual_wan import VirtualWAN from .device_properties import DeviceProperties from .vpn_site import VpnSite from .get_vpn_sites_configuration_request import GetVpnSitesConfigurationRequest from .hub_virtual_network_connection import HubVirtualNetworkConnection + from .virtual_hub_route import VirtualHubRoute + from .virtual_hub_route_table import VirtualHubRouteTable from .virtual_hub import VirtualHub from .vpn_connection import VpnConnection - from .policies import Policies from .vpn_gateway import VpnGateway from .vpn_site_id import VpnSiteId + from .virtual_wan_security_provider import VirtualWanSecurityProvider + from .virtual_wan_security_providers import VirtualWanSecurityProviders + from .vpn_client_connection_health import VpnClientConnectionHealth + from .p2_svpn_gateway import P2SVpnGateway + from .p2_svpn_profile_parameters import P2SVpnProfileParameters + from .vpn_profile_response import VpnProfileResponse from .application_gateway_paged import ApplicationGatewayPaged from .application_gateway_ssl_predefined_policy_paged import ApplicationGatewaySslPredefinedPolicyPaged from .application_security_group_paged import ApplicationSecurityGroupPaged @@ -575,6 +599,8 @@ from .hub_virtual_network_connection_paged import HubVirtualNetworkConnectionPaged from .vpn_gateway_paged import VpnGatewayPaged from .vpn_connection_paged import VpnConnectionPaged +from .p2_svpn_server_configuration_paged import P2SVpnServerConfigurationPaged +from .p2_svpn_gateway_paged import P2SVpnGatewayPaged from .network_management_client_enums import ( IPAllocationMethod, SecurityRuleProtocol, @@ -653,7 +679,11 @@ AuthenticationMethod, VirtualNetworkGatewayConnectionStatus, VirtualNetworkGatewayConnectionType, + VirtualNetworkGatewayConnectionProtocol, + OfficeTrafficCategory, + VpnGatewayTunnelingProtocol, VpnConnectionStatus, + VirtualWanSecurityProviderType, TunnelConnectionStatus, HubVirtualNetworkConnectionStatus, ) @@ -903,16 +933,28 @@ 'VirtualNetworkConnectionGatewayReference', 'VirtualNetworkGatewayConnectionListEntity', 'VpnDeviceScriptParameters', + 'P2SVpnServerConfigVpnClientRootCertificate', + 'P2SVpnServerConfigVpnClientRevokedCertificate', + 'P2SVpnServerConfigRadiusServerRootCertificate', + 'P2SVpnServerConfigRadiusClientRootCertificate', + 'P2SVpnServerConfiguration', 'VirtualWAN', 'DeviceProperties', 'VpnSite', 'GetVpnSitesConfigurationRequest', 'HubVirtualNetworkConnection', + 'VirtualHubRoute', + 'VirtualHubRouteTable', 'VirtualHub', 'VpnConnection', - 'Policies', 'VpnGateway', 'VpnSiteId', + 'VirtualWanSecurityProvider', + 'VirtualWanSecurityProviders', + 'VpnClientConnectionHealth', + 'P2SVpnGateway', + 'P2SVpnProfileParameters', + 'VpnProfileResponse', 'ApplicationGatewayPaged', 'ApplicationGatewaySslPredefinedPolicyPaged', 'ApplicationSecurityGroupPaged', @@ -969,6 +1011,8 @@ 'HubVirtualNetworkConnectionPaged', 'VpnGatewayPaged', 'VpnConnectionPaged', + 'P2SVpnServerConfigurationPaged', + 'P2SVpnGatewayPaged', 'IPAllocationMethod', 'SecurityRuleProtocol', 'SecurityRuleAccess', @@ -1046,7 +1090,11 @@ 'AuthenticationMethod', 'VirtualNetworkGatewayConnectionStatus', 'VirtualNetworkGatewayConnectionType', + 'VirtualNetworkGatewayConnectionProtocol', + 'OfficeTrafficCategory', + 'VpnGatewayTunnelingProtocol', 'VpnConnectionStatus', + 'VirtualWanSecurityProviderType', 'TunnelConnectionStatus', 'HubVirtualNetworkConnectionStatus', ] diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request.py index 02f8a6e94679..7c8732192d6d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request.py @@ -17,14 +17,14 @@ class GetVpnSitesConfigurationRequest(Model): :param vpn_sites: List of resource-ids of the vpn-sites for which config is to be downloaded. - :type vpn_sites: list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :type vpn_sites: list[str] :param output_blob_sas_url: The sas-url to download the configurations for vpn-sites :type output_blob_sas_url: str """ _attribute_map = { - 'vpn_sites': {'key': 'vpnSites', 'type': '[SubResource]'}, + 'vpn_sites': {'key': 'vpnSites', 'type': '[str]'}, 'output_blob_sas_url': {'key': 'outputBlobSasUrl', 'type': 'str'}, } diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request_py3.py index 8af01e295977..f15efad67f06 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/get_vpn_sites_configuration_request_py3.py @@ -17,14 +17,14 @@ class GetVpnSitesConfigurationRequest(Model): :param vpn_sites: List of resource-ids of the vpn-sites for which config is to be downloaded. - :type vpn_sites: list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :type vpn_sites: list[str] :param output_blob_sas_url: The sas-url to download the configurations for vpn-sites :type output_blob_sas_url: str """ _attribute_map = { - 'vpn_sites': {'key': 'vpnSites', 'type': '[SubResource]'}, + 'vpn_sites': {'key': 'vpnSites', 'type': '[str]'}, 'output_blob_sas_url': {'key': 'outputBlobSasUrl', 'type': 'str'}, } diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection.py index f37c67574072..946fa5bc42a9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .sub_resource import SubResource -class HubVirtualNetworkConnection(Resource): +class HubVirtualNetworkConnection(SubResource): """HubVirtualNetworkConnection Resource. Variables are only populated by the server, and will be ignored when @@ -20,14 +20,6 @@ class HubVirtualNetworkConnection(Resource): :param id: Resource ID. :type id: str - :ivar name: Resource name. - :vartype name: str - :ivar type: Resource type. - :vartype type: str - :param location: Resource location. - :type location: str - :param tags: Resource tags. - :type tags: dict[str, str] :param remote_virtual_network: Reference to the remote virtual network. :type remote_virtual_network: ~azure.mgmt.network.v2018_08_01.models.SubResource @@ -37,31 +29,32 @@ class HubVirtualNetworkConnection(Resource): :param allow_remote_vnet_to_use_hub_vnet_gateways: Allow RemoteVnet to use Virtual Hub's gateways. :type allow_remote_vnet_to_use_hub_vnet_gateways: bool + :param enable_internet_security: Enable internet security + :type enable_internet_security: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param name: The 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: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str """ _validation = { - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'etag': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, 'remote_virtual_network': {'key': 'properties.remoteVirtualNetwork', 'type': 'SubResource'}, 'allow_hub_to_remote_vnet_transit': {'key': 'properties.allowHubToRemoteVnetTransit', 'type': 'bool'}, 'allow_remote_vnet_to_use_hub_vnet_gateways': {'key': 'properties.allowRemoteVnetToUseHubVnetGateways', 'type': 'bool'}, + 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -70,5 +63,7 @@ def __init__(self, **kwargs): self.remote_virtual_network = kwargs.get('remote_virtual_network', None) self.allow_hub_to_remote_vnet_transit = kwargs.get('allow_hub_to_remote_vnet_transit', None) self.allow_remote_vnet_to_use_hub_vnet_gateways = kwargs.get('allow_remote_vnet_to_use_hub_vnet_gateways', None) + self.enable_internet_security = kwargs.get('enable_internet_security', None) self.provisioning_state = kwargs.get('provisioning_state', None) + self.name = kwargs.get('name', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection_py3.py index f7b4f83ac9ff..d822fbb43033 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/hub_virtual_network_connection_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource_py3 import Resource +from .sub_resource_py3 import SubResource -class HubVirtualNetworkConnection(Resource): +class HubVirtualNetworkConnection(SubResource): """HubVirtualNetworkConnection Resource. Variables are only populated by the server, and will be ignored when @@ -20,14 +20,6 @@ class HubVirtualNetworkConnection(Resource): :param id: Resource ID. :type id: str - :ivar name: Resource name. - :vartype name: str - :ivar type: Resource type. - :vartype type: str - :param location: Resource location. - :type location: str - :param tags: Resource tags. - :type tags: dict[str, str] :param remote_virtual_network: Reference to the remote virtual network. :type remote_virtual_network: ~azure.mgmt.network.v2018_08_01.models.SubResource @@ -37,38 +29,41 @@ class HubVirtualNetworkConnection(Resource): :param allow_remote_vnet_to_use_hub_vnet_gateways: Allow RemoteVnet to use Virtual Hub's gateways. :type allow_remote_vnet_to_use_hub_vnet_gateways: bool + :param enable_internet_security: Enable internet security + :type enable_internet_security: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param name: The 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: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str """ _validation = { - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'etag': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, 'remote_virtual_network': {'key': 'properties.remoteVirtualNetwork', 'type': 'SubResource'}, 'allow_hub_to_remote_vnet_transit': {'key': 'properties.allowHubToRemoteVnetTransit', 'type': 'bool'}, 'allow_remote_vnet_to_use_hub_vnet_gateways': {'key': 'properties.allowRemoteVnetToUseHubVnetGateways', 'type': 'bool'}, + 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, remote_virtual_network=None, allow_hub_to_remote_vnet_transit: bool=None, allow_remote_vnet_to_use_hub_vnet_gateways: bool=None, provisioning_state=None, **kwargs) -> None: - super(HubVirtualNetworkConnection, self).__init__(id=id, location=location, tags=tags, **kwargs) + def __init__(self, *, id: str=None, remote_virtual_network=None, allow_hub_to_remote_vnet_transit: bool=None, allow_remote_vnet_to_use_hub_vnet_gateways: bool=None, enable_internet_security: bool=None, provisioning_state=None, name: str=None, **kwargs) -> None: + super(HubVirtualNetworkConnection, self).__init__(id=id, **kwargs) self.remote_virtual_network = remote_virtual_network self.allow_hub_to_remote_vnet_transit = allow_hub_to_remote_vnet_transit self.allow_remote_vnet_to_use_hub_vnet_gateways = allow_remote_vnet_to_use_hub_vnet_gateways + self.enable_internet_security = enable_internet_security self.provisioning_state = provisioning_state + self.name = name self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint.py index 15794d1ca441..0a862d7db1d2 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint.py @@ -45,6 +45,9 @@ class InterfaceEndpoint(Resource): :ivar owner: A read-only property that identifies who created this interface endpoint. :vartype owner: str + :ivar provisioning_state: The provisioning state of the interface + endpoint. Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str :param etag: Gets a unique read-only string that changes whenever the resource is updated. :type etag: str @@ -54,6 +57,7 @@ class InterfaceEndpoint(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'owner': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -67,6 +71,7 @@ class InterfaceEndpoint(Resource): 'subnet': {'key': 'properties.subnet', 'type': 'SubResource'}, 'network_interfaces': {'key': 'properties.networkInterfaces', 'type': '[SubResource]'}, 'owner': {'key': 'properties.owner', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -77,4 +82,5 @@ def __init__(self, **kwargs): self.subnet = kwargs.get('subnet', None) self.network_interfaces = kwargs.get('network_interfaces', None) self.owner = None + self.provisioning_state = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint_py3.py index 796fbd7a5bd8..119318c57236 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/interface_endpoint_py3.py @@ -45,6 +45,9 @@ class InterfaceEndpoint(Resource): :ivar owner: A read-only property that identifies who created this interface endpoint. :vartype owner: str + :ivar provisioning_state: The provisioning state of the interface + endpoint. Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str :param etag: Gets a unique read-only string that changes whenever the resource is updated. :type etag: str @@ -54,6 +57,7 @@ class InterfaceEndpoint(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'owner': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -67,6 +71,7 @@ class InterfaceEndpoint(Resource): 'subnet': {'key': 'properties.subnet', 'type': 'SubResource'}, 'network_interfaces': {'key': 'properties.networkInterfaces', 'type': '[SubResource]'}, 'owner': {'key': 'properties.owner', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -77,4 +82,5 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, fqdn: str=Non self.subnet = subnet self.network_interfaces = network_interfaces self.owner = None + self.provisioning_state = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface.py index bf030be81d63..070703c73fe9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface.py @@ -34,9 +34,9 @@ class NetworkInterface(Resource): resource. :type network_security_group: ~azure.mgmt.network.v2018_08_01.models.NetworkSecurityGroup - :param interface_endpoint: A reference to the interface endpoint to which + :ivar interface_endpoint: A reference to the interface endpoint to which the network interface is linked. - :type interface_endpoint: + :vartype interface_endpoint: ~azure.mgmt.network.v2018_08_01.models.InterfaceEndpoint :param ip_configurations: A list of IPConfigurations of the network interface. @@ -79,6 +79,7 @@ class NetworkInterface(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'interface_endpoint': {'readonly': True}, 'hosted_workloads': {'readonly': True}, } @@ -109,7 +110,7 @@ def __init__(self, **kwargs): super(NetworkInterface, self).__init__(**kwargs) self.virtual_machine = kwargs.get('virtual_machine', None) self.network_security_group = kwargs.get('network_security_group', None) - self.interface_endpoint = kwargs.get('interface_endpoint', None) + self.interface_endpoint = None self.ip_configurations = kwargs.get('ip_configurations', None) self.tap_configurations = kwargs.get('tap_configurations', None) self.dns_settings = kwargs.get('dns_settings', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_py3.py index 06946eb14a2e..b577273519dc 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_py3.py @@ -34,9 +34,9 @@ class NetworkInterface(Resource): resource. :type network_security_group: ~azure.mgmt.network.v2018_08_01.models.NetworkSecurityGroup - :param interface_endpoint: A reference to the interface endpoint to which + :ivar interface_endpoint: A reference to the interface endpoint to which the network interface is linked. - :type interface_endpoint: + :vartype interface_endpoint: ~azure.mgmt.network.v2018_08_01.models.InterfaceEndpoint :param ip_configurations: A list of IPConfigurations of the network interface. @@ -79,6 +79,7 @@ class NetworkInterface(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'interface_endpoint': {'readonly': True}, 'hosted_workloads': {'readonly': True}, } @@ -105,11 +106,11 @@ class NetworkInterface(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_machine=None, network_security_group=None, interface_endpoint=None, ip_configurations=None, tap_configurations=None, dns_settings=None, mac_address: str=None, primary: bool=None, enable_accelerated_networking: bool=None, enable_ip_forwarding: bool=None, linked_resource_type: str=None, resource_guid: str=None, provisioning_state: str=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_machine=None, network_security_group=None, ip_configurations=None, tap_configurations=None, dns_settings=None, mac_address: str=None, primary: bool=None, enable_accelerated_networking: bool=None, enable_ip_forwarding: bool=None, linked_resource_type: str=None, resource_guid: str=None, provisioning_state: str=None, etag: str=None, **kwargs) -> None: super(NetworkInterface, self).__init__(id=id, location=location, tags=tags, **kwargs) self.virtual_machine = virtual_machine self.network_security_group = network_security_group - self.interface_endpoint = interface_endpoint + self.interface_endpoint = None self.ip_configurations = ip_configurations self.tap_configurations = tap_configurations self.dns_settings = dns_settings diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration.py index 4096305a3c55..a2dcf35f26aa 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration.py @@ -24,6 +24,10 @@ class NetworkInterfaceTapConfiguration(SubResource): resource. :type virtual_network_tap: ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkTap + :ivar provisioning_state: The provisioning state of the network interface + tap configuration. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str :param name: The name of the resource that is unique within a resource group. This name can be used to access the resource. :type name: str @@ -35,12 +39,14 @@ class NetworkInterfaceTapConfiguration(SubResource): """ _validation = { + 'provisioning_state': {'readonly': True}, 'type': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'virtual_network_tap': {'key': 'properties.virtualNetworkTap', 'type': 'VirtualNetworkTap'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, @@ -49,6 +55,7 @@ class NetworkInterfaceTapConfiguration(SubResource): def __init__(self, **kwargs): super(NetworkInterfaceTapConfiguration, self).__init__(**kwargs) self.virtual_network_tap = kwargs.get('virtual_network_tap', None) + self.provisioning_state = None self.name = kwargs.get('name', None) self.etag = kwargs.get('etag', None) self.type = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration_py3.py index 0596f7bb2c97..17fc8ee4a1db 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_interface_tap_configuration_py3.py @@ -24,6 +24,10 @@ class NetworkInterfaceTapConfiguration(SubResource): resource. :type virtual_network_tap: ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkTap + :ivar provisioning_state: The provisioning state of the network interface + tap configuration. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str :param name: The name of the resource that is unique within a resource group. This name can be used to access the resource. :type name: str @@ -35,12 +39,14 @@ class NetworkInterfaceTapConfiguration(SubResource): """ _validation = { + 'provisioning_state': {'readonly': True}, 'type': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'virtual_network_tap': {'key': 'properties.virtualNetworkTap', 'type': 'VirtualNetworkTap'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, @@ -49,6 +55,7 @@ class NetworkInterfaceTapConfiguration(SubResource): def __init__(self, *, id: str=None, virtual_network_tap=None, name: str=None, etag: str=None, **kwargs) -> None: super(NetworkInterfaceTapConfiguration, self).__init__(id=id, **kwargs) self.virtual_network_tap = virtual_network_tap + self.provisioning_state = None self.name = name self.etag = etag self.type = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py index ff0e45ed8179..e443490e1126 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py @@ -621,6 +621,26 @@ class VirtualNetworkGatewayConnectionType(str, Enum): vpn_client = "VPNClient" +class VirtualNetworkGatewayConnectionProtocol(str, Enum): + + ik_ev2 = "IKEv2" + ik_ev1 = "IKEv1" + + +class OfficeTrafficCategory(str, Enum): + + optimize = "Optimize" + optimize_and_allow = "OptimizeAndAllow" + all = "All" + none = "None" + + +class VpnGatewayTunnelingProtocol(str, Enum): + + ike_v2 = "IkeV2" + open_vpn = "OpenVPN" + + class VpnConnectionStatus(str, Enum): unknown = "Unknown" @@ -629,6 +649,12 @@ class VpnConnectionStatus(str, Enum): not_connected = "NotConnected" +class VirtualWanSecurityProviderType(str, Enum): + + external = "External" + native = "Native" + + class TunnelConnectionStatus(str, Enum): unknown = "Unknown" diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway.py new file mode 100644 index 000000000000..2a0cc486f365 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway.py @@ -0,0 +1,86 @@ +# 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 .resource import Resource + + +class P2SVpnGateway(Resource): + """P2SVpnGateway Resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param virtual_hub: The VirtualHub to which the gateway belongs + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or + ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param vpn_gateway_scale_unit: The scale unit for this p2s vpn gateway. + :type vpn_gateway_scale_unit: int + :param p2_svpn_server_configuration: The P2SVpnServerConfiguration to + which the p2sVpnGateway is attached to. + :type p2_svpn_server_configuration: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param vpn_client_address_pool: The reference of the address space + resource which represents Address space for P2S VpnClient. + :type vpn_client_address_pool: + ~azure.mgmt.network.v2018_08_01.models.AddressSpace + :ivar vpn_client_connection_health: All P2S vpnclients' connection health + status. + :vartype vpn_client_connection_health: + ~azure.mgmt.network.v2018_08_01.models.VpnClientConnectionHealth + :ivar etag: Gets a unique read-only string that changes whenever the + resource is updated. + :vartype etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'vpn_client_connection_health': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'SubResource'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'vpn_gateway_scale_unit': {'key': 'properties.vpnGatewayScaleUnit', 'type': 'int'}, + 'p2_svpn_server_configuration': {'key': 'properties.p2SVpnServerConfiguration', 'type': 'SubResource'}, + 'vpn_client_address_pool': {'key': 'properties.vpnClientAddressPool', 'type': 'AddressSpace'}, + 'vpn_client_connection_health': {'key': 'properties.vpnClientConnectionHealth', 'type': 'VpnClientConnectionHealth'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnGateway, self).__init__(**kwargs) + self.virtual_hub = kwargs.get('virtual_hub', None) + self.provisioning_state = kwargs.get('provisioning_state', None) + self.vpn_gateway_scale_unit = kwargs.get('vpn_gateway_scale_unit', None) + self.p2_svpn_server_configuration = kwargs.get('p2_svpn_server_configuration', None) + self.vpn_client_address_pool = kwargs.get('vpn_client_address_pool', None) + self.vpn_client_connection_health = None + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_paged.py new file mode 100644 index 000000000000..bcab3232c665 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_paged.py @@ -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 P2SVpnGatewayPaged(Paged): + """ + A paging container for iterating over a list of :class:`P2SVpnGateway ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[P2SVpnGateway]'} + } + + def __init__(self, *args, **kwargs): + + super(P2SVpnGatewayPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_py3.py new file mode 100644 index 000000000000..8ef097f8b9b6 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_gateway_py3.py @@ -0,0 +1,86 @@ +# 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 .resource_py3 import Resource + + +class P2SVpnGateway(Resource): + """P2SVpnGateway Resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param virtual_hub: The VirtualHub to which the gateway belongs + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or + ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param vpn_gateway_scale_unit: The scale unit for this p2s vpn gateway. + :type vpn_gateway_scale_unit: int + :param p2_svpn_server_configuration: The P2SVpnServerConfiguration to + which the p2sVpnGateway is attached to. + :type p2_svpn_server_configuration: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param vpn_client_address_pool: The reference of the address space + resource which represents Address space for P2S VpnClient. + :type vpn_client_address_pool: + ~azure.mgmt.network.v2018_08_01.models.AddressSpace + :ivar vpn_client_connection_health: All P2S vpnclients' connection health + status. + :vartype vpn_client_connection_health: + ~azure.mgmt.network.v2018_08_01.models.VpnClientConnectionHealth + :ivar etag: Gets a unique read-only string that changes whenever the + resource is updated. + :vartype etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'vpn_client_connection_health': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'SubResource'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'vpn_gateway_scale_unit': {'key': 'properties.vpnGatewayScaleUnit', 'type': 'int'}, + 'p2_svpn_server_configuration': {'key': 'properties.p2SVpnServerConfiguration', 'type': 'SubResource'}, + 'vpn_client_address_pool': {'key': 'properties.vpnClientAddressPool', 'type': 'AddressSpace'}, + 'vpn_client_connection_health': {'key': 'properties.vpnClientConnectionHealth', 'type': 'VpnClientConnectionHealth'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_hub=None, provisioning_state=None, vpn_gateway_scale_unit: int=None, p2_svpn_server_configuration=None, vpn_client_address_pool=None, **kwargs) -> None: + super(P2SVpnGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) + self.virtual_hub = virtual_hub + self.provisioning_state = provisioning_state + self.vpn_gateway_scale_unit = vpn_gateway_scale_unit + self.p2_svpn_server_configuration = p2_svpn_server_configuration + self.vpn_client_address_pool = vpn_client_address_pool + self.vpn_client_connection_health = None + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters.py new file mode 100644 index 000000000000..9d5e8ac5f929 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters.py @@ -0,0 +1,31 @@ +# 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.serialization import Model + + +class P2SVpnProfileParameters(Model): + """Vpn Client Parameters for package generation. + + :param authentication_method: VPN client Authentication Method. Possible + values are: 'EAPTLS' and 'EAPMSCHAPv2'. Possible values include: 'EAPTLS', + 'EAPMSCHAPv2' + :type authentication_method: str or + ~azure.mgmt.network.v2018_08_01.models.AuthenticationMethod + """ + + _attribute_map = { + 'authentication_method': {'key': 'authenticationMethod', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnProfileParameters, self).__init__(**kwargs) + self.authentication_method = kwargs.get('authentication_method', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters_py3.py new file mode 100644 index 000000000000..855411734a9e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_profile_parameters_py3.py @@ -0,0 +1,31 @@ +# 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.serialization import Model + + +class P2SVpnProfileParameters(Model): + """Vpn Client Parameters for package generation. + + :param authentication_method: VPN client Authentication Method. Possible + values are: 'EAPTLS' and 'EAPMSCHAPv2'. Possible values include: 'EAPTLS', + 'EAPMSCHAPv2' + :type authentication_method: str or + ~azure.mgmt.network.v2018_08_01.models.AuthenticationMethod + """ + + _attribute_map = { + 'authentication_method': {'key': 'authenticationMethod', 'type': 'str'}, + } + + def __init__(self, *, authentication_method=None, **kwargs) -> None: + super(P2SVpnProfileParameters, self).__init__(**kwargs) + self.authentication_method = authentication_method diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate.py new file mode 100644 index 000000000000..673c6dfc00f4 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate.py @@ -0,0 +1,54 @@ +# 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 P2SVpnServerConfigRadiusClientRootCertificate(SubResource): + """Radius client root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param thumbprint: The Radius client root certificate thumbprint. + :type thumbprint: str + :ivar provisioning_state: The provisioning state of the Radius client root + certificate resource. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnServerConfigRadiusClientRootCertificate, self).__init__(**kwargs) + self.thumbprint = kwargs.get('thumbprint', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate_py3.py new file mode 100644 index 000000000000..32272e60c00a --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_client_root_certificate_py3.py @@ -0,0 +1,54 @@ +# 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_py3 import SubResource + + +class P2SVpnServerConfigRadiusClientRootCertificate(SubResource): + """Radius client root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param thumbprint: The Radius client root certificate thumbprint. + :type thumbprint: str + :ivar provisioning_state: The provisioning state of the Radius client root + certificate resource. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, thumbprint: str=None, name: str=None, etag: str=None, **kwargs) -> None: + super(P2SVpnServerConfigRadiusClientRootCertificate, self).__init__(id=id, **kwargs) + self.thumbprint = thumbprint + self.provisioning_state = None + self.name = name + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate.py new file mode 100644 index 000000000000..6b672a8a3852 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate.py @@ -0,0 +1,57 @@ +# 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 P2SVpnServerConfigRadiusServerRootCertificate(SubResource): + """Radius Server root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param id: Resource ID. + :type id: str + :param public_cert_data: Required. The certificate public data. + :type public_cert_data: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration Radius Server root certificate resource. + Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'public_cert_data': {'required': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'public_cert_data': {'key': 'properties.publicCertData', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnServerConfigRadiusServerRootCertificate, self).__init__(**kwargs) + self.public_cert_data = kwargs.get('public_cert_data', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate_py3.py new file mode 100644 index 000000000000..e64cd1975c4e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_radius_server_root_certificate_py3.py @@ -0,0 +1,57 @@ +# 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_py3 import SubResource + + +class P2SVpnServerConfigRadiusServerRootCertificate(SubResource): + """Radius Server root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param id: Resource ID. + :type id: str + :param public_cert_data: Required. The certificate public data. + :type public_cert_data: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration Radius Server root certificate resource. + Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'public_cert_data': {'required': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'public_cert_data': {'key': 'properties.publicCertData', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, public_cert_data: str, id: str=None, name: str=None, etag: str=None, **kwargs) -> None: + super(P2SVpnServerConfigRadiusServerRootCertificate, self).__init__(id=id, **kwargs) + self.public_cert_data = public_cert_data + self.provisioning_state = None + self.name = name + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate.py new file mode 100644 index 000000000000..d237930f2cec --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate.py @@ -0,0 +1,54 @@ +# 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 P2SVpnServerConfigVpnClientRevokedCertificate(SubResource): + """VPN client revoked certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param thumbprint: The revoked VPN client certificate thumbprint. + :type thumbprint: str + :ivar provisioning_state: The provisioning state of the VPN client revoked + certificate resource. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnServerConfigVpnClientRevokedCertificate, self).__init__(**kwargs) + self.thumbprint = kwargs.get('thumbprint', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate_py3.py new file mode 100644 index 000000000000..90e200a44f84 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_revoked_certificate_py3.py @@ -0,0 +1,54 @@ +# 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_py3 import SubResource + + +class P2SVpnServerConfigVpnClientRevokedCertificate(SubResource): + """VPN client revoked certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param thumbprint: The revoked VPN client certificate thumbprint. + :type thumbprint: str + :ivar provisioning_state: The provisioning state of the VPN client revoked + certificate resource. Possible values are: 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'thumbprint': {'key': 'properties.thumbprint', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, thumbprint: str=None, name: str=None, etag: str=None, **kwargs) -> None: + super(P2SVpnServerConfigVpnClientRevokedCertificate, self).__init__(id=id, **kwargs) + self.thumbprint = thumbprint + self.provisioning_state = None + self.name = name + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate.py new file mode 100644 index 000000000000..0f0dcc8042af --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate.py @@ -0,0 +1,57 @@ +# 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 P2SVpnServerConfigVpnClientRootCertificate(SubResource): + """VPN client root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param id: Resource ID. + :type id: str + :param public_cert_data: Required. The certificate public data. + :type public_cert_data: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration VPN client root certificate resource. Possible + values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'public_cert_data': {'required': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'public_cert_data': {'key': 'properties.publicCertData', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnServerConfigVpnClientRootCertificate, self).__init__(**kwargs) + self.public_cert_data = kwargs.get('public_cert_data', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate_py3.py new file mode 100644 index 000000000000..adc301b576a5 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_config_vpn_client_root_certificate_py3.py @@ -0,0 +1,57 @@ +# 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_py3 import SubResource + + +class P2SVpnServerConfigVpnClientRootCertificate(SubResource): + """VPN client root certificate of P2SVpnServerConfiguration. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param id: Resource ID. + :type id: str + :param public_cert_data: Required. The certificate public data. + :type public_cert_data: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration VPN client root certificate resource. Possible + values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a resource + group. This name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'public_cert_data': {'required': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'public_cert_data': {'key': 'properties.publicCertData', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, public_cert_data: str, id: str=None, name: str=None, etag: str=None, **kwargs) -> None: + super(P2SVpnServerConfigVpnClientRootCertificate, self).__init__(id=id, **kwargs) + self.public_cert_data = public_cert_data + self.provisioning_state = None + self.name = name + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration.py new file mode 100644 index 000000000000..d838ed3938c4 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration.py @@ -0,0 +1,115 @@ +# 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 P2SVpnServerConfiguration(SubResource): + """P2SVpnServerConfiguration Resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param p2_svpn_server_configuration_properties_name: The name of the + P2SVpnServerConfiguration that is unique within a VirtualWan in a resource + 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. + :type vpn_protocols: list[str or + ~azure.mgmt.network.v2018_08_01.models.VpnGatewayTunnelingProtocol] + :param p2_svpn_server_config_vpn_client_root_certificates: VPN client root + certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_vpn_client_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigVpnClientRootCertificate] + :param p2_svpn_server_config_vpn_client_revoked_certificates: VPN client + revoked certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_vpn_client_revoked_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigVpnClientRevokedCertificate] + :param p2_svpn_server_config_radius_server_root_certificates: Radius + Server root certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_radius_server_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigRadiusServerRootCertificate] + :param p2_svpn_server_config_radius_client_root_certificates: Radius + client root certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_radius_client_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigRadiusClientRootCertificate] + :param vpn_client_ipsec_policies: VpnClientIpsecPolicies for + P2SVpnServerConfiguration. + :type vpn_client_ipsec_policies: + list[~azure.mgmt.network.v2018_08_01.models.IpsecPolicy] + :param radius_server_address: The radius server address property of the + P2SVpnServerConfiguration resource for point to site client connection. + :type radius_server_address: str + :param radius_server_secret: The radius secret property of the + P2SVpnServerConfiguration resource for for point to site client + connection. + :type radius_server_secret: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration resource. Possible values are: 'Updating', + 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :ivar p2_svpn_gateways: + :vartype p2_svpn_gateways: + list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :param p2_svpn_server_configuration_properties_etag: A unique read-only + string that changes whenever the resource is updated. + :type p2_svpn_server_configuration_properties_etag: str + :param name: The 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: Gets a unique read-only string that changes whenever the + resource is updated. + :vartype etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + 'p2_svpn_gateways': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'p2_svpn_server_configuration_properties_name': {'key': 'properties.name', 'type': 'str'}, + 'vpn_protocols': {'key': 'properties.vpnProtocols', 'type': '[str]'}, + 'p2_svpn_server_config_vpn_client_root_certificates': {'key': 'properties.p2SVpnServerConfigVpnClientRootCertificates', 'type': '[P2SVpnServerConfigVpnClientRootCertificate]'}, + 'p2_svpn_server_config_vpn_client_revoked_certificates': {'key': 'properties.p2SVpnServerConfigVpnClientRevokedCertificates', 'type': '[P2SVpnServerConfigVpnClientRevokedCertificate]'}, + 'p2_svpn_server_config_radius_server_root_certificates': {'key': 'properties.p2SVpnServerConfigRadiusServerRootCertificates', 'type': '[P2SVpnServerConfigRadiusServerRootCertificate]'}, + 'p2_svpn_server_config_radius_client_root_certificates': {'key': 'properties.p2SVpnServerConfigRadiusClientRootCertificates', 'type': '[P2SVpnServerConfigRadiusClientRootCertificate]'}, + 'vpn_client_ipsec_policies': {'key': 'properties.vpnClientIpsecPolicies', 'type': '[IpsecPolicy]'}, + 'radius_server_address': {'key': 'properties.radiusServerAddress', 'type': 'str'}, + 'radius_server_secret': {'key': 'properties.radiusServerSecret', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'p2_svpn_gateways': {'key': 'properties.p2SVpnGateways', 'type': '[SubResource]'}, + 'p2_svpn_server_configuration_properties_etag': {'key': 'properties.etag', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(P2SVpnServerConfiguration, self).__init__(**kwargs) + self.p2_svpn_server_configuration_properties_name = kwargs.get('p2_svpn_server_configuration_properties_name', None) + self.vpn_protocols = kwargs.get('vpn_protocols', None) + self.p2_svpn_server_config_vpn_client_root_certificates = kwargs.get('p2_svpn_server_config_vpn_client_root_certificates', None) + self.p2_svpn_server_config_vpn_client_revoked_certificates = kwargs.get('p2_svpn_server_config_vpn_client_revoked_certificates', None) + self.p2_svpn_server_config_radius_server_root_certificates = kwargs.get('p2_svpn_server_config_radius_server_root_certificates', None) + self.p2_svpn_server_config_radius_client_root_certificates = kwargs.get('p2_svpn_server_config_radius_client_root_certificates', None) + self.vpn_client_ipsec_policies = kwargs.get('vpn_client_ipsec_policies', None) + self.radius_server_address = kwargs.get('radius_server_address', None) + self.radius_server_secret = kwargs.get('radius_server_secret', None) + self.provisioning_state = None + self.p2_svpn_gateways = None + self.p2_svpn_server_configuration_properties_etag = kwargs.get('p2_svpn_server_configuration_properties_etag', None) + self.name = kwargs.get('name', None) + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_paged.py new file mode 100644 index 000000000000..aebfe8a54ec5 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_paged.py @@ -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 P2SVpnServerConfigurationPaged(Paged): + """ + A paging container for iterating over a list of :class:`P2SVpnServerConfiguration ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[P2SVpnServerConfiguration]'} + } + + def __init__(self, *args, **kwargs): + + super(P2SVpnServerConfigurationPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_py3.py new file mode 100644 index 000000000000..8677f556bcf5 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/p2_svpn_server_configuration_py3.py @@ -0,0 +1,115 @@ +# 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_py3 import SubResource + + +class P2SVpnServerConfiguration(SubResource): + """P2SVpnServerConfiguration Resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param p2_svpn_server_configuration_properties_name: The name of the + P2SVpnServerConfiguration that is unique within a VirtualWan in a resource + 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. + :type vpn_protocols: list[str or + ~azure.mgmt.network.v2018_08_01.models.VpnGatewayTunnelingProtocol] + :param p2_svpn_server_config_vpn_client_root_certificates: VPN client root + certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_vpn_client_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigVpnClientRootCertificate] + :param p2_svpn_server_config_vpn_client_revoked_certificates: VPN client + revoked certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_vpn_client_revoked_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigVpnClientRevokedCertificate] + :param p2_svpn_server_config_radius_server_root_certificates: Radius + Server root certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_radius_server_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigRadiusServerRootCertificate] + :param p2_svpn_server_config_radius_client_root_certificates: Radius + client root certificate of P2SVpnServerConfiguration. + :type p2_svpn_server_config_radius_client_root_certificates: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigRadiusClientRootCertificate] + :param vpn_client_ipsec_policies: VpnClientIpsecPolicies for + P2SVpnServerConfiguration. + :type vpn_client_ipsec_policies: + list[~azure.mgmt.network.v2018_08_01.models.IpsecPolicy] + :param radius_server_address: The radius server address property of the + P2SVpnServerConfiguration resource for point to site client connection. + :type radius_server_address: str + :param radius_server_secret: The radius secret property of the + P2SVpnServerConfiguration resource for for point to site client + connection. + :type radius_server_secret: str + :ivar provisioning_state: The provisioning state of the + P2SVpnServerConfiguration resource. Possible values are: 'Updating', + 'Deleting', and 'Failed'. + :vartype provisioning_state: str + :ivar p2_svpn_gateways: + :vartype p2_svpn_gateways: + list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :param p2_svpn_server_configuration_properties_etag: A unique read-only + string that changes whenever the resource is updated. + :type p2_svpn_server_configuration_properties_etag: str + :param name: The 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: Gets a unique read-only string that changes whenever the + resource is updated. + :vartype etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + 'p2_svpn_gateways': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'p2_svpn_server_configuration_properties_name': {'key': 'properties.name', 'type': 'str'}, + 'vpn_protocols': {'key': 'properties.vpnProtocols', 'type': '[str]'}, + 'p2_svpn_server_config_vpn_client_root_certificates': {'key': 'properties.p2SVpnServerConfigVpnClientRootCertificates', 'type': '[P2SVpnServerConfigVpnClientRootCertificate]'}, + 'p2_svpn_server_config_vpn_client_revoked_certificates': {'key': 'properties.p2SVpnServerConfigVpnClientRevokedCertificates', 'type': '[P2SVpnServerConfigVpnClientRevokedCertificate]'}, + 'p2_svpn_server_config_radius_server_root_certificates': {'key': 'properties.p2SVpnServerConfigRadiusServerRootCertificates', 'type': '[P2SVpnServerConfigRadiusServerRootCertificate]'}, + 'p2_svpn_server_config_radius_client_root_certificates': {'key': 'properties.p2SVpnServerConfigRadiusClientRootCertificates', 'type': '[P2SVpnServerConfigRadiusClientRootCertificate]'}, + 'vpn_client_ipsec_policies': {'key': 'properties.vpnClientIpsecPolicies', 'type': '[IpsecPolicy]'}, + 'radius_server_address': {'key': 'properties.radiusServerAddress', 'type': 'str'}, + 'radius_server_secret': {'key': 'properties.radiusServerSecret', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'p2_svpn_gateways': {'key': 'properties.p2SVpnGateways', 'type': '[SubResource]'}, + 'p2_svpn_server_configuration_properties_etag': {'key': 'properties.etag', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, p2_svpn_server_configuration_properties_name: str=None, vpn_protocols=None, p2_svpn_server_config_vpn_client_root_certificates=None, p2_svpn_server_config_vpn_client_revoked_certificates=None, p2_svpn_server_config_radius_server_root_certificates=None, p2_svpn_server_config_radius_client_root_certificates=None, vpn_client_ipsec_policies=None, radius_server_address: str=None, radius_server_secret: str=None, p2_svpn_server_configuration_properties_etag: str=None, name: str=None, **kwargs) -> None: + super(P2SVpnServerConfiguration, self).__init__(id=id, **kwargs) + self.p2_svpn_server_configuration_properties_name = p2_svpn_server_configuration_properties_name + self.vpn_protocols = vpn_protocols + self.p2_svpn_server_config_vpn_client_root_certificates = p2_svpn_server_config_vpn_client_root_certificates + self.p2_svpn_server_config_vpn_client_revoked_certificates = p2_svpn_server_config_vpn_client_revoked_certificates + self.p2_svpn_server_config_radius_server_root_certificates = p2_svpn_server_config_radius_server_root_certificates + self.p2_svpn_server_config_radius_client_root_certificates = p2_svpn_server_config_radius_client_root_certificates + self.vpn_client_ipsec_policies = vpn_client_ipsec_policies + self.radius_server_address = radius_server_address + self.radius_server_secret = radius_server_secret + self.provisioning_state = None + self.p2_svpn_gateways = None + self.p2_svpn_server_configuration_properties_etag = p2_svpn_server_configuration_properties_etag + self.name = name + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies.py deleted file mode 100644 index 069d98b7c83c..000000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies.py +++ /dev/null @@ -1,34 +0,0 @@ -# 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.serialization import Model - - -class Policies(Model): - """Policies for vpn gateway. - - :param allow_branch_to_branch_traffic: True if branch to branch traffic is - allowed. - :type allow_branch_to_branch_traffic: bool - :param allow_vnet_to_vnet_traffic: True if Vnet to Vnet traffic is - allowed. - :type allow_vnet_to_vnet_traffic: bool - """ - - _attribute_map = { - 'allow_branch_to_branch_traffic': {'key': 'allowBranchToBranchTraffic', 'type': 'bool'}, - 'allow_vnet_to_vnet_traffic': {'key': 'allowVnetToVnetTraffic', 'type': 'bool'}, - } - - def __init__(self, **kwargs): - super(Policies, self).__init__(**kwargs) - self.allow_branch_to_branch_traffic = kwargs.get('allow_branch_to_branch_traffic', None) - self.allow_vnet_to_vnet_traffic = kwargs.get('allow_vnet_to_vnet_traffic', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies_py3.py deleted file mode 100644 index 895c01fcd8a0..000000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/policies_py3.py +++ /dev/null @@ -1,34 +0,0 @@ -# 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.serialization import Model - - -class Policies(Model): - """Policies for vpn gateway. - - :param allow_branch_to_branch_traffic: True if branch to branch traffic is - allowed. - :type allow_branch_to_branch_traffic: bool - :param allow_vnet_to_vnet_traffic: True if Vnet to Vnet traffic is - allowed. - :type allow_vnet_to_vnet_traffic: bool - """ - - _attribute_map = { - 'allow_branch_to_branch_traffic': {'key': 'allowBranchToBranchTraffic', 'type': 'bool'}, - 'allow_vnet_to_vnet_traffic': {'key': 'allowVnetToVnetTraffic', 'type': 'bool'}, - } - - def __init__(self, *, allow_branch_to_branch_traffic: bool=None, allow_vnet_to_vnet_traffic: bool=None, **kwargs) -> None: - super(Policies, self).__init__(**kwargs) - self.allow_branch_to_branch_traffic = allow_branch_to_branch_traffic - self.allow_vnet_to_vnet_traffic = allow_vnet_to_vnet_traffic diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy.py index 685e8eeb928c..a711ba0da779 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy.py @@ -32,12 +32,14 @@ class ServiceEndpointPolicy(Resource): endpoint policy definitions of the service endpoint policy. :type service_endpoint_policy_definitions: list[~azure.mgmt.network.v2018_08_01.models.ServiceEndpointPolicyDefinition] - :param resource_guid: The resource GUID property of the service endpoint + :ivar subnets: A collection of references to subnets. + :vartype subnets: list[~azure.mgmt.network.v2018_08_01.models.Subnet] + :ivar resource_guid: The resource GUID property of the service endpoint policy resource. - :type resource_guid: str - :param provisioning_state: The provisioning state of the service endpoint + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the service endpoint policy. Possible values are: 'Updating', 'Deleting', and 'Failed'. - :type provisioning_state: str + :vartype provisioning_state: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -46,6 +48,9 @@ class ServiceEndpointPolicy(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'subnets': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -55,6 +60,7 @@ class ServiceEndpointPolicy(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'service_endpoint_policy_definitions': {'key': 'properties.serviceEndpointPolicyDefinitions', 'type': '[ServiceEndpointPolicyDefinition]'}, + 'subnets': {'key': 'properties.subnets', 'type': '[Subnet]'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, @@ -63,6 +69,7 @@ class ServiceEndpointPolicy(Resource): def __init__(self, **kwargs): super(ServiceEndpointPolicy, self).__init__(**kwargs) self.service_endpoint_policy_definitions = kwargs.get('service_endpoint_policy_definitions', None) - self.resource_guid = kwargs.get('resource_guid', None) - self.provisioning_state = kwargs.get('provisioning_state', None) + self.subnets = None + self.resource_guid = None + self.provisioning_state = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition.py index 2e8c421e8a11..45d6ab8ff556 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition.py @@ -15,6 +15,9 @@ class ServiceEndpointPolicyDefinition(SubResource): """Service Endpoint policy definitions. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param description: A description for this rule. Restricted to 140 chars. @@ -23,10 +26,10 @@ class ServiceEndpointPolicyDefinition(SubResource): :type service: str :param service_resources: A list of service resources. :type service_resources: list[str] - :param provisioning_state: The provisioning state of the service end point + :ivar provisioning_state: The provisioning state of the service end point policy definition. Possible values are: 'Updating', 'Deleting', and 'Failed'. - :type provisioning_state: str + :vartype provisioning_state: str :param name: The name of the resource that is unique within a resource group. This name can be used to access the resource. :type name: str @@ -35,6 +38,10 @@ class ServiceEndpointPolicyDefinition(SubResource): :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'description': {'key': 'properties.description', 'type': 'str'}, @@ -50,6 +57,6 @@ def __init__(self, **kwargs): self.description = kwargs.get('description', None) self.service = kwargs.get('service', None) self.service_resources = kwargs.get('service_resources', None) - self.provisioning_state = kwargs.get('provisioning_state', None) + self.provisioning_state = None self.name = kwargs.get('name', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition_py3.py index 973e02e6dcdd..e8c274a6a823 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_definition_py3.py @@ -15,6 +15,9 @@ class ServiceEndpointPolicyDefinition(SubResource): """Service Endpoint policy definitions. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param description: A description for this rule. Restricted to 140 chars. @@ -23,10 +26,10 @@ class ServiceEndpointPolicyDefinition(SubResource): :type service: str :param service_resources: A list of service resources. :type service_resources: list[str] - :param provisioning_state: The provisioning state of the service end point + :ivar provisioning_state: The provisioning state of the service end point policy definition. Possible values are: 'Updating', 'Deleting', and 'Failed'. - :type provisioning_state: str + :vartype provisioning_state: str :param name: The name of the resource that is unique within a resource group. This name can be used to access the resource. :type name: str @@ -35,6 +38,10 @@ class ServiceEndpointPolicyDefinition(SubResource): :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'description': {'key': 'properties.description', 'type': 'str'}, @@ -45,11 +52,11 @@ class ServiceEndpointPolicyDefinition(SubResource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, description: str=None, service: str=None, service_resources=None, provisioning_state: str=None, name: str=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, description: str=None, service: str=None, service_resources=None, name: str=None, etag: str=None, **kwargs) -> None: super(ServiceEndpointPolicyDefinition, self).__init__(id=id, **kwargs) self.description = description self.service = service self.service_resources = service_resources - self.provisioning_state = provisioning_state + self.provisioning_state = None self.name = name self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_py3.py index f401be4ff2d3..d67c88ea5ec4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/service_endpoint_policy_py3.py @@ -32,12 +32,14 @@ class ServiceEndpointPolicy(Resource): endpoint policy definitions of the service endpoint policy. :type service_endpoint_policy_definitions: list[~azure.mgmt.network.v2018_08_01.models.ServiceEndpointPolicyDefinition] - :param resource_guid: The resource GUID property of the service endpoint + :ivar subnets: A collection of references to subnets. + :vartype subnets: list[~azure.mgmt.network.v2018_08_01.models.Subnet] + :ivar resource_guid: The resource GUID property of the service endpoint policy resource. - :type resource_guid: str - :param provisioning_state: The provisioning state of the service endpoint + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the service endpoint policy. Possible values are: 'Updating', 'Deleting', and 'Failed'. - :type provisioning_state: str + :vartype provisioning_state: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -46,6 +48,9 @@ class ServiceEndpointPolicy(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'subnets': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -55,14 +60,16 @@ class ServiceEndpointPolicy(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'service_endpoint_policy_definitions': {'key': 'properties.serviceEndpointPolicyDefinitions', 'type': '[ServiceEndpointPolicyDefinition]'}, + 'subnets': {'key': 'properties.subnets', 'type': '[Subnet]'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, service_endpoint_policy_definitions=None, resource_guid: str=None, provisioning_state: str=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, service_endpoint_policy_definitions=None, etag: str=None, **kwargs) -> None: super(ServiceEndpointPolicy, self).__init__(id=id, location=location, tags=tags, **kwargs) self.service_endpoint_policy_definitions = service_endpoint_policy_definitions - self.resource_guid = resource_guid - self.provisioning_state = provisioning_state + self.subnets = None + self.resource_guid = None + self.provisioning_state = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub.py index d0bc83b779ba..6abc530872bc 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub.py @@ -30,12 +30,23 @@ class VirtualHub(Resource): :type tags: dict[str, str] :param virtual_wan: The VirtualWAN to which the VirtualHub belongs :type virtual_wan: ~azure.mgmt.network.v2018_08_01.models.SubResource - :param hub_virtual_network_connections: list of all vnet connections with - this VirtualHub. - :type hub_virtual_network_connections: + :param vpn_gateway: The VpnGateway associated with this VirtualHub + :type vpn_gateway: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param p2_svpn_gateway: The P2SVpnGateway associated with this VirtualHub + :type p2_svpn_gateway: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param express_route_gateway: The expressRouteGateway associated with this + VirtualHub + :type express_route_gateway: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param virtual_network_connections: list of all vnet connections with this + VirtualHub. + :type virtual_network_connections: list[~azure.mgmt.network.v2018_08_01.models.HubVirtualNetworkConnection] :param address_prefix: Address-prefix for this VirtualHub. :type address_prefix: str + :param route_table: The routeTable associated with this virtual hub. + :type route_table: + ~azure.mgmt.network.v2018_08_01.models.VirtualHubRouteTable :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -58,8 +69,12 @@ class VirtualHub(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'virtual_wan': {'key': 'properties.virtualWan', 'type': 'SubResource'}, - 'hub_virtual_network_connections': {'key': 'properties.hubVirtualNetworkConnections', 'type': '[HubVirtualNetworkConnection]'}, + 'vpn_gateway': {'key': 'properties.vpnGateway', 'type': 'SubResource'}, + 'p2_svpn_gateway': {'key': 'properties.p2SVpnGateway', 'type': 'SubResource'}, + 'express_route_gateway': {'key': 'properties.expressRouteGateway', 'type': 'SubResource'}, + 'virtual_network_connections': {'key': 'properties.virtualNetworkConnections', 'type': '[HubVirtualNetworkConnection]'}, 'address_prefix': {'key': 'properties.addressPrefix', 'type': 'str'}, + 'route_table': {'key': 'properties.routeTable', 'type': 'VirtualHubRouteTable'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -67,7 +82,11 @@ class VirtualHub(Resource): def __init__(self, **kwargs): super(VirtualHub, self).__init__(**kwargs) self.virtual_wan = kwargs.get('virtual_wan', None) - self.hub_virtual_network_connections = kwargs.get('hub_virtual_network_connections', None) + self.vpn_gateway = kwargs.get('vpn_gateway', None) + self.p2_svpn_gateway = kwargs.get('p2_svpn_gateway', None) + self.express_route_gateway = kwargs.get('express_route_gateway', None) + self.virtual_network_connections = kwargs.get('virtual_network_connections', None) self.address_prefix = kwargs.get('address_prefix', None) + self.route_table = kwargs.get('route_table', None) self.provisioning_state = kwargs.get('provisioning_state', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_py3.py index 087f234af70c..971fb7e47aea 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_py3.py @@ -30,12 +30,23 @@ class VirtualHub(Resource): :type tags: dict[str, str] :param virtual_wan: The VirtualWAN to which the VirtualHub belongs :type virtual_wan: ~azure.mgmt.network.v2018_08_01.models.SubResource - :param hub_virtual_network_connections: list of all vnet connections with - this VirtualHub. - :type hub_virtual_network_connections: + :param vpn_gateway: The VpnGateway associated with this VirtualHub + :type vpn_gateway: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param p2_svpn_gateway: The P2SVpnGateway associated with this VirtualHub + :type p2_svpn_gateway: ~azure.mgmt.network.v2018_08_01.models.SubResource + :param express_route_gateway: The expressRouteGateway associated with this + VirtualHub + :type express_route_gateway: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param virtual_network_connections: list of all vnet connections with this + VirtualHub. + :type virtual_network_connections: list[~azure.mgmt.network.v2018_08_01.models.HubVirtualNetworkConnection] :param address_prefix: Address-prefix for this VirtualHub. :type address_prefix: str + :param route_table: The routeTable associated with this virtual hub. + :type route_table: + ~azure.mgmt.network.v2018_08_01.models.VirtualHubRouteTable :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -58,16 +69,24 @@ class VirtualHub(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'virtual_wan': {'key': 'properties.virtualWan', 'type': 'SubResource'}, - 'hub_virtual_network_connections': {'key': 'properties.hubVirtualNetworkConnections', 'type': '[HubVirtualNetworkConnection]'}, + 'vpn_gateway': {'key': 'properties.vpnGateway', 'type': 'SubResource'}, + 'p2_svpn_gateway': {'key': 'properties.p2SVpnGateway', 'type': 'SubResource'}, + 'express_route_gateway': {'key': 'properties.expressRouteGateway', 'type': 'SubResource'}, + 'virtual_network_connections': {'key': 'properties.virtualNetworkConnections', 'type': '[HubVirtualNetworkConnection]'}, 'address_prefix': {'key': 'properties.addressPrefix', 'type': 'str'}, + 'route_table': {'key': 'properties.routeTable', 'type': 'VirtualHubRouteTable'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_wan=None, hub_virtual_network_connections=None, address_prefix: str=None, provisioning_state=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_wan=None, vpn_gateway=None, p2_svpn_gateway=None, express_route_gateway=None, virtual_network_connections=None, address_prefix: str=None, route_table=None, provisioning_state=None, **kwargs) -> None: super(VirtualHub, self).__init__(id=id, location=location, tags=tags, **kwargs) self.virtual_wan = virtual_wan - self.hub_virtual_network_connections = hub_virtual_network_connections + self.vpn_gateway = vpn_gateway + self.p2_svpn_gateway = p2_svpn_gateway + self.express_route_gateway = express_route_gateway + self.virtual_network_connections = virtual_network_connections self.address_prefix = address_prefix + self.route_table = route_table self.provisioning_state = provisioning_state self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route.py new file mode 100644 index 000000000000..d25fdb71ad64 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route.py @@ -0,0 +1,32 @@ +# 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.serialization import Model + + +class VirtualHubRoute(Model): + """VirtualHub route. + + :param address_prefixes: list of all addressPrefixes. + :type address_prefixes: list[str] + :param next_hop_ip_address: NextHop ip address. + :type next_hop_ip_address: str + """ + + _attribute_map = { + 'address_prefixes': {'key': 'addressPrefixes', 'type': '[str]'}, + 'next_hop_ip_address': {'key': 'nextHopIpAddress', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(VirtualHubRoute, self).__init__(**kwargs) + self.address_prefixes = kwargs.get('address_prefixes', None) + self.next_hop_ip_address = kwargs.get('next_hop_ip_address', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_py3.py new file mode 100644 index 000000000000..b5430f758c76 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_py3.py @@ -0,0 +1,32 @@ +# 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.serialization import Model + + +class VirtualHubRoute(Model): + """VirtualHub route. + + :param address_prefixes: list of all addressPrefixes. + :type address_prefixes: list[str] + :param next_hop_ip_address: NextHop ip address. + :type next_hop_ip_address: str + """ + + _attribute_map = { + 'address_prefixes': {'key': 'addressPrefixes', 'type': '[str]'}, + 'next_hop_ip_address': {'key': 'nextHopIpAddress', 'type': 'str'}, + } + + def __init__(self, *, address_prefixes=None, next_hop_ip_address: str=None, **kwargs) -> None: + super(VirtualHubRoute, self).__init__(**kwargs) + self.address_prefixes = address_prefixes + self.next_hop_ip_address = next_hop_ip_address diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table.py new file mode 100644 index 000000000000..79c1550f98a1 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table.py @@ -0,0 +1,28 @@ +# 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.serialization import Model + + +class VirtualHubRouteTable(Model): + """VirtualHub route table. + + :param routes: list of all routes. + :type routes: list[~azure.mgmt.network.v2018_08_01.models.VirtualHubRoute] + """ + + _attribute_map = { + 'routes': {'key': 'routes', 'type': '[VirtualHubRoute]'}, + } + + def __init__(self, **kwargs): + super(VirtualHubRouteTable, self).__init__(**kwargs) + self.routes = kwargs.get('routes', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table_py3.py new file mode 100644 index 000000000000..1d49b1563f49 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_route_table_py3.py @@ -0,0 +1,28 @@ +# 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.serialization import Model + + +class VirtualHubRouteTable(Model): + """VirtualHub route table. + + :param routes: list of all routes. + :type routes: list[~azure.mgmt.network.v2018_08_01.models.VirtualHubRoute] + """ + + _attribute_map = { + 'routes': {'key': 'routes', 'type': '[VirtualHubRoute]'}, + } + + def __init__(self, *, routes=None, **kwargs) -> None: + super(VirtualHubRouteTable, self).__init__(**kwargs) + self.routes = routes diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection.py index 8a062c1ac4b8..23978c600c0e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection.py @@ -49,6 +49,10 @@ class VirtualNetworkGatewayConnection(Resource): include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionType + :param connection_protocol: Connection protocol used for this connection. + Possible values include: 'IKEv2', 'IKEv1' + :type connection_protocol: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :param routing_weight: The routing weight. :type routing_weight: int :param shared_key: The IPSec shared key. @@ -118,6 +122,7 @@ class VirtualNetworkGatewayConnection(Resource): 'virtual_network_gateway2': {'key': 'properties.virtualNetworkGateway2', 'type': 'VirtualNetworkGateway'}, 'local_network_gateway2': {'key': 'properties.localNetworkGateway2', 'type': 'LocalNetworkGateway'}, 'connection_type': {'key': 'properties.connectionType', 'type': 'str'}, + 'connection_protocol': {'key': 'properties.connectionProtocol', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, @@ -141,6 +146,7 @@ def __init__(self, **kwargs): self.virtual_network_gateway2 = kwargs.get('virtual_network_gateway2', None) self.local_network_gateway2 = kwargs.get('local_network_gateway2', None) self.connection_type = kwargs.get('connection_type', None) + self.connection_protocol = kwargs.get('connection_protocol', None) self.routing_weight = kwargs.get('routing_weight', None) self.shared_key = kwargs.get('shared_key', None) self.connection_status = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity.py index 708002e4c94d..97a5f924d2dd 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity.py @@ -49,6 +49,10 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionType + :param connection_protocol: Connection protocol used for this connection. + Possible values include: 'IKEv2', 'IKEv1' + :type connection_protocol: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :param routing_weight: The routing weight. :type routing_weight: int :param shared_key: The IPSec shared key. @@ -118,6 +122,7 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): 'virtual_network_gateway2': {'key': 'properties.virtualNetworkGateway2', 'type': 'VirtualNetworkConnectionGatewayReference'}, 'local_network_gateway2': {'key': 'properties.localNetworkGateway2', 'type': 'VirtualNetworkConnectionGatewayReference'}, 'connection_type': {'key': 'properties.connectionType', 'type': 'str'}, + 'connection_protocol': {'key': 'properties.connectionProtocol', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, @@ -141,6 +146,7 @@ def __init__(self, **kwargs): self.virtual_network_gateway2 = kwargs.get('virtual_network_gateway2', None) self.local_network_gateway2 = kwargs.get('local_network_gateway2', None) self.connection_type = kwargs.get('connection_type', None) + self.connection_protocol = kwargs.get('connection_protocol', None) self.routing_weight = kwargs.get('routing_weight', None) self.shared_key = kwargs.get('shared_key', None) self.connection_status = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity_py3.py index 1e29e7118891..248cdc63a1dd 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_list_entity_py3.py @@ -49,6 +49,10 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionType + :param connection_protocol: Connection protocol used for this connection. + Possible values include: 'IKEv2', 'IKEv1' + :type connection_protocol: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :param routing_weight: The routing weight. :type routing_weight: int :param shared_key: The IPSec shared key. @@ -118,6 +122,7 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): 'virtual_network_gateway2': {'key': 'properties.virtualNetworkGateway2', 'type': 'VirtualNetworkConnectionGatewayReference'}, 'local_network_gateway2': {'key': 'properties.localNetworkGateway2', 'type': 'VirtualNetworkConnectionGatewayReference'}, 'connection_type': {'key': 'properties.connectionType', 'type': 'str'}, + 'connection_protocol': {'key': 'properties.connectionProtocol', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, @@ -134,13 +139,14 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, virtual_network_gateway1, connection_type, id: str=None, location: str=None, tags=None, authorization_key: str=None, virtual_network_gateway2=None, local_network_gateway2=None, routing_weight: int=None, shared_key: str=None, peer=None, enable_bgp: bool=None, use_policy_based_traffic_selectors: bool=None, ipsec_policies=None, resource_guid: str=None, express_route_gateway_bypass: bool=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, virtual_network_gateway1, connection_type, id: str=None, location: str=None, tags=None, authorization_key: str=None, virtual_network_gateway2=None, local_network_gateway2=None, connection_protocol=None, routing_weight: int=None, shared_key: str=None, peer=None, enable_bgp: bool=None, use_policy_based_traffic_selectors: bool=None, ipsec_policies=None, resource_guid: str=None, express_route_gateway_bypass: bool=None, etag: str=None, **kwargs) -> None: super(VirtualNetworkGatewayConnectionListEntity, self).__init__(id=id, location=location, tags=tags, **kwargs) self.authorization_key = authorization_key self.virtual_network_gateway1 = virtual_network_gateway1 self.virtual_network_gateway2 = virtual_network_gateway2 self.local_network_gateway2 = local_network_gateway2 self.connection_type = connection_type + self.connection_protocol = connection_protocol self.routing_weight = routing_weight self.shared_key = shared_key self.connection_status = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_py3.py index 1f87dff2a7f1..f07637a15682 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_gateway_connection_py3.py @@ -49,6 +49,10 @@ class VirtualNetworkGatewayConnection(Resource): include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionType + :param connection_protocol: Connection protocol used for this connection. + Possible values include: 'IKEv2', 'IKEv1' + :type connection_protocol: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :param routing_weight: The routing weight. :type routing_weight: int :param shared_key: The IPSec shared key. @@ -118,6 +122,7 @@ class VirtualNetworkGatewayConnection(Resource): 'virtual_network_gateway2': {'key': 'properties.virtualNetworkGateway2', 'type': 'VirtualNetworkGateway'}, 'local_network_gateway2': {'key': 'properties.localNetworkGateway2', 'type': 'LocalNetworkGateway'}, 'connection_type': {'key': 'properties.connectionType', 'type': 'str'}, + 'connection_protocol': {'key': 'properties.connectionProtocol', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, @@ -134,13 +139,14 @@ class VirtualNetworkGatewayConnection(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, virtual_network_gateway1, connection_type, id: str=None, location: str=None, tags=None, authorization_key: str=None, virtual_network_gateway2=None, local_network_gateway2=None, routing_weight: int=None, shared_key: str=None, peer=None, enable_bgp: bool=None, use_policy_based_traffic_selectors: bool=None, ipsec_policies=None, resource_guid: str=None, express_route_gateway_bypass: bool=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, virtual_network_gateway1, connection_type, id: str=None, location: str=None, tags=None, authorization_key: str=None, virtual_network_gateway2=None, local_network_gateway2=None, connection_protocol=None, routing_weight: int=None, shared_key: str=None, peer=None, enable_bgp: bool=None, use_policy_based_traffic_selectors: bool=None, ipsec_policies=None, resource_guid: str=None, express_route_gateway_bypass: bool=None, etag: str=None, **kwargs) -> None: super(VirtualNetworkGatewayConnection, self).__init__(id=id, location=location, tags=tags, **kwargs) self.authorization_key = authorization_key self.virtual_network_gateway1 = virtual_network_gateway1 self.virtual_network_gateway2 = virtual_network_gateway2 self.local_network_gateway2 = local_network_gateway2 self.connection_type = connection_type + self.connection_protocol = connection_protocol self.routing_weight = routing_weight self.shared_key = shared_key self.connection_status = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap.py index ad148f2c124a..6f89b1a46ffd 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap.py @@ -32,6 +32,11 @@ class VirtualNetworkTap(Resource): IDs for the network interface IP configuration that needs to be tapped. :vartype network_interface_tap_configurations: list[~azure.mgmt.network.v2018_08_01.models.NetworkInterfaceTapConfiguration] + :ivar resource_guid: The resourceGuid property of the virtual network tap. + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the virtual network + tap. Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str :param destination_network_interface_ip_configuration: The reference to the private IP Address of the collector nic that will receive the tap :type destination_network_interface_ip_configuration: @@ -53,6 +58,8 @@ class VirtualNetworkTap(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'network_interface_tap_configurations': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -62,6 +69,8 @@ class VirtualNetworkTap(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'network_interface_tap_configurations': {'key': 'properties.networkInterfaceTapConfigurations', 'type': '[NetworkInterfaceTapConfiguration]'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'destination_network_interface_ip_configuration': {'key': 'properties.destinationNetworkInterfaceIPConfiguration', 'type': 'NetworkInterfaceIPConfiguration'}, 'destination_load_balancer_front_end_ip_configuration': {'key': 'properties.destinationLoadBalancerFrontEndIPConfiguration', 'type': 'FrontendIPConfiguration'}, 'destination_port': {'key': 'properties.destinationPort', 'type': 'int'}, @@ -71,6 +80,8 @@ class VirtualNetworkTap(Resource): def __init__(self, **kwargs): super(VirtualNetworkTap, self).__init__(**kwargs) self.network_interface_tap_configurations = None + self.resource_guid = None + self.provisioning_state = None self.destination_network_interface_ip_configuration = kwargs.get('destination_network_interface_ip_configuration', None) self.destination_load_balancer_front_end_ip_configuration = kwargs.get('destination_load_balancer_front_end_ip_configuration', None) self.destination_port = kwargs.get('destination_port', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap_py3.py index f8f3a81b0403..adf3e2a95f96 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_network_tap_py3.py @@ -32,6 +32,11 @@ class VirtualNetworkTap(Resource): IDs for the network interface IP configuration that needs to be tapped. :vartype network_interface_tap_configurations: list[~azure.mgmt.network.v2018_08_01.models.NetworkInterfaceTapConfiguration] + :ivar resource_guid: The resourceGuid property of the virtual network tap. + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the virtual network + tap. Possible values are: 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str :param destination_network_interface_ip_configuration: The reference to the private IP Address of the collector nic that will receive the tap :type destination_network_interface_ip_configuration: @@ -53,6 +58,8 @@ class VirtualNetworkTap(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'network_interface_tap_configurations': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -62,6 +69,8 @@ class VirtualNetworkTap(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'network_interface_tap_configurations': {'key': 'properties.networkInterfaceTapConfigurations', 'type': '[NetworkInterfaceTapConfiguration]'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'destination_network_interface_ip_configuration': {'key': 'properties.destinationNetworkInterfaceIPConfiguration', 'type': 'NetworkInterfaceIPConfiguration'}, 'destination_load_balancer_front_end_ip_configuration': {'key': 'properties.destinationLoadBalancerFrontEndIPConfiguration', 'type': 'FrontendIPConfiguration'}, 'destination_port': {'key': 'properties.destinationPort', 'type': 'int'}, @@ -71,6 +80,8 @@ class VirtualNetworkTap(Resource): def __init__(self, *, id: str=None, location: str=None, tags=None, destination_network_interface_ip_configuration=None, destination_load_balancer_front_end_ip_configuration=None, destination_port: int=None, etag: str=None, **kwargs) -> None: super(VirtualNetworkTap, self).__init__(id=id, location=location, tags=tags, **kwargs) self.network_interface_tap_configurations = None + self.resource_guid = None + self.provisioning_state = None self.destination_network_interface_ip_configuration = destination_network_interface_ip_configuration self.destination_load_balancer_front_end_ip_configuration = destination_load_balancer_front_end_ip_configuration self.destination_port = destination_port diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan.py index 2a479133d76d..536a04214568 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan.py @@ -36,6 +36,23 @@ class VirtualWAN(Resource): :ivar vpn_sites: :vartype vpn_sites: list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :param security_provider_name: The Security Provider name. + :type security_provider_name: str + :param allow_branch_to_branch_traffic: True if branch to branch traffic is + allowed. + :type allow_branch_to_branch_traffic: bool + :param allow_vnet_to_vnet_traffic: True if Vnet to Vnet traffic is + allowed. + :type allow_vnet_to_vnet_traffic: bool + :param office365_local_breakout_category: The office local breakout + category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', + 'None' + :type office365_local_breakout_category: str or + ~azure.mgmt.network.v2018_08_01.models.OfficeTrafficCategory + :param p2_svpn_server_configurations: list of all + P2SVpnServerConfigurations associated with the virtual wan. + :type p2_svpn_server_configurations: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration] :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -62,6 +79,11 @@ class VirtualWAN(Resource): 'disable_vpn_encryption': {'key': 'properties.disableVpnEncryption', 'type': 'bool'}, 'virtual_hubs': {'key': 'properties.virtualHubs', 'type': '[SubResource]'}, 'vpn_sites': {'key': 'properties.vpnSites', 'type': '[SubResource]'}, + 'security_provider_name': {'key': 'properties.securityProviderName', 'type': 'str'}, + 'allow_branch_to_branch_traffic': {'key': 'properties.allowBranchToBranchTraffic', 'type': 'bool'}, + 'allow_vnet_to_vnet_traffic': {'key': 'properties.allowVnetToVnetTraffic', 'type': 'bool'}, + 'office365_local_breakout_category': {'key': 'properties.office365LocalBreakoutCategory', 'type': 'str'}, + 'p2_svpn_server_configurations': {'key': 'properties.p2SVpnServerConfigurations', 'type': '[P2SVpnServerConfiguration]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -71,5 +93,10 @@ def __init__(self, **kwargs): self.disable_vpn_encryption = kwargs.get('disable_vpn_encryption', None) self.virtual_hubs = None self.vpn_sites = None + self.security_provider_name = kwargs.get('security_provider_name', None) + self.allow_branch_to_branch_traffic = kwargs.get('allow_branch_to_branch_traffic', None) + self.allow_vnet_to_vnet_traffic = kwargs.get('allow_vnet_to_vnet_traffic', None) + self.office365_local_breakout_category = kwargs.get('office365_local_breakout_category', None) + self.p2_svpn_server_configurations = kwargs.get('p2_svpn_server_configurations', None) self.provisioning_state = kwargs.get('provisioning_state', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_py3.py index 51b89c2d0ce9..41eb4b89c4c7 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_py3.py @@ -36,6 +36,23 @@ class VirtualWAN(Resource): :ivar vpn_sites: :vartype vpn_sites: list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :param security_provider_name: The Security Provider name. + :type security_provider_name: str + :param allow_branch_to_branch_traffic: True if branch to branch traffic is + allowed. + :type allow_branch_to_branch_traffic: bool + :param allow_vnet_to_vnet_traffic: True if Vnet to Vnet traffic is + allowed. + :type allow_vnet_to_vnet_traffic: bool + :param office365_local_breakout_category: The office local breakout + category. Possible values include: 'Optimize', 'OptimizeAndAllow', 'All', + 'None' + :type office365_local_breakout_category: str or + ~azure.mgmt.network.v2018_08_01.models.OfficeTrafficCategory + :param p2_svpn_server_configurations: list of all + P2SVpnServerConfigurations associated with the virtual wan. + :type p2_svpn_server_configurations: + list[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration] :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -62,14 +79,24 @@ class VirtualWAN(Resource): 'disable_vpn_encryption': {'key': 'properties.disableVpnEncryption', 'type': 'bool'}, 'virtual_hubs': {'key': 'properties.virtualHubs', 'type': '[SubResource]'}, 'vpn_sites': {'key': 'properties.vpnSites', 'type': '[SubResource]'}, + 'security_provider_name': {'key': 'properties.securityProviderName', 'type': 'str'}, + 'allow_branch_to_branch_traffic': {'key': 'properties.allowBranchToBranchTraffic', 'type': 'bool'}, + 'allow_vnet_to_vnet_traffic': {'key': 'properties.allowVnetToVnetTraffic', 'type': 'bool'}, + 'office365_local_breakout_category': {'key': 'properties.office365LocalBreakoutCategory', 'type': 'str'}, + 'p2_svpn_server_configurations': {'key': 'properties.p2SVpnServerConfigurations', 'type': '[P2SVpnServerConfiguration]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, disable_vpn_encryption: bool=None, provisioning_state=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, disable_vpn_encryption: bool=None, security_provider_name: str=None, allow_branch_to_branch_traffic: bool=None, allow_vnet_to_vnet_traffic: bool=None, office365_local_breakout_category=None, p2_svpn_server_configurations=None, provisioning_state=None, **kwargs) -> None: super(VirtualWAN, self).__init__(id=id, location=location, tags=tags, **kwargs) self.disable_vpn_encryption = disable_vpn_encryption self.virtual_hubs = None self.vpn_sites = None + self.security_provider_name = security_provider_name + self.allow_branch_to_branch_traffic = allow_branch_to_branch_traffic + self.allow_vnet_to_vnet_traffic = allow_vnet_to_vnet_traffic + self.office365_local_breakout_category = office365_local_breakout_category + self.p2_svpn_server_configurations = p2_svpn_server_configurations self.provisioning_state = provisioning_state self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider.py new file mode 100644 index 000000000000..d81738442474 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider.py @@ -0,0 +1,38 @@ +# 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.serialization import Model + + +class VirtualWanSecurityProvider(Model): + """Collection of SecurityProviders. + + :param name: Name of the security provider. + :type name: str + :param url: Url of the security provider. + :type url: str + :param type: Name of the security provider. Possible values include: + 'External', 'Native' + :type type: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualWanSecurityProviderType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(VirtualWanSecurityProvider, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.url = kwargs.get('url', None) + self.type = kwargs.get('type', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider_py3.py new file mode 100644 index 000000000000..049088cd2f2b --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_provider_py3.py @@ -0,0 +1,38 @@ +# 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.serialization import Model + + +class VirtualWanSecurityProvider(Model): + """Collection of SecurityProviders. + + :param name: Name of the security provider. + :type name: str + :param url: Url of the security provider. + :type url: str + :param type: Name of the security provider. Possible values include: + 'External', 'Native' + :type type: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualWanSecurityProviderType + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, url: str=None, type=None, **kwargs) -> None: + super(VirtualWanSecurityProvider, self).__init__(**kwargs) + self.name = name + self.url = url + self.type = type diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers.py new file mode 100644 index 000000000000..706c93fce665 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers.py @@ -0,0 +1,29 @@ +# 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.serialization import Model + + +class VirtualWanSecurityProviders(Model): + """Collection of SecurityProviders. + + :param supported_providers: + :type supported_providers: + list[~azure.mgmt.network.v2018_08_01.models.VirtualWanSecurityProvider] + """ + + _attribute_map = { + 'supported_providers': {'key': 'supportedProviders', 'type': '[VirtualWanSecurityProvider]'}, + } + + def __init__(self, **kwargs): + super(VirtualWanSecurityProviders, self).__init__(**kwargs) + self.supported_providers = kwargs.get('supported_providers', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers_py3.py new file mode 100644 index 000000000000..ea87fd73d971 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_wan_security_providers_py3.py @@ -0,0 +1,29 @@ +# 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.serialization import Model + + +class VirtualWanSecurityProviders(Model): + """Collection of SecurityProviders. + + :param supported_providers: + :type supported_providers: + list[~azure.mgmt.network.v2018_08_01.models.VirtualWanSecurityProvider] + """ + + _attribute_map = { + 'supported_providers': {'key': 'supportedProviders', 'type': '[VirtualWanSecurityProvider]'}, + } + + def __init__(self, *, supported_providers=None, **kwargs) -> None: + super(VirtualWanSecurityProviders, self).__init__(**kwargs) + self.supported_providers = supported_providers diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health.py new file mode 100644 index 000000000000..ae4271c388f9 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health.py @@ -0,0 +1,52 @@ +# 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.serialization import Model + + +class VpnClientConnectionHealth(Model): + """VpnClientConnectionHealth properties. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar total_ingress_bytes_transferred: Total of the Ingress Bytes + Transferred in this P2S Vpn connection + :vartype total_ingress_bytes_transferred: long + :ivar total_egress_bytes_transferred: Total of the Egress Bytes + Transferred in this connection + :vartype total_egress_bytes_transferred: long + :param vpn_client_connections_count: The total of p2s vpn clients + connected at this time to this P2SVpnGateway. + :type vpn_client_connections_count: int + :param allocated_ip_addresses: List of allocated ip addresses to the + connected p2s vpn clients. + :type allocated_ip_addresses: list[str] + """ + + _validation = { + 'total_ingress_bytes_transferred': {'readonly': True}, + 'total_egress_bytes_transferred': {'readonly': True}, + } + + _attribute_map = { + 'total_ingress_bytes_transferred': {'key': 'totalIngressBytesTransferred', 'type': 'long'}, + 'total_egress_bytes_transferred': {'key': 'totalEgressBytesTransferred', 'type': 'long'}, + 'vpn_client_connections_count': {'key': 'vpnClientConnectionsCount', 'type': 'int'}, + 'allocated_ip_addresses': {'key': 'allocatedIpAddresses', 'type': '[str]'}, + } + + def __init__(self, **kwargs): + super(VpnClientConnectionHealth, self).__init__(**kwargs) + self.total_ingress_bytes_transferred = None + self.total_egress_bytes_transferred = None + self.vpn_client_connections_count = kwargs.get('vpn_client_connections_count', None) + self.allocated_ip_addresses = kwargs.get('allocated_ip_addresses', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health_py3.py new file mode 100644 index 000000000000..13a73f383808 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_client_connection_health_py3.py @@ -0,0 +1,52 @@ +# 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.serialization import Model + + +class VpnClientConnectionHealth(Model): + """VpnClientConnectionHealth properties. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar total_ingress_bytes_transferred: Total of the Ingress Bytes + Transferred in this P2S Vpn connection + :vartype total_ingress_bytes_transferred: long + :ivar total_egress_bytes_transferred: Total of the Egress Bytes + Transferred in this connection + :vartype total_egress_bytes_transferred: long + :param vpn_client_connections_count: The total of p2s vpn clients + connected at this time to this P2SVpnGateway. + :type vpn_client_connections_count: int + :param allocated_ip_addresses: List of allocated ip addresses to the + connected p2s vpn clients. + :type allocated_ip_addresses: list[str] + """ + + _validation = { + 'total_ingress_bytes_transferred': {'readonly': True}, + 'total_egress_bytes_transferred': {'readonly': True}, + } + + _attribute_map = { + 'total_ingress_bytes_transferred': {'key': 'totalIngressBytesTransferred', 'type': 'long'}, + 'total_egress_bytes_transferred': {'key': 'totalEgressBytesTransferred', 'type': 'long'}, + 'vpn_client_connections_count': {'key': 'vpnClientConnectionsCount', 'type': 'int'}, + 'allocated_ip_addresses': {'key': 'allocatedIpAddresses', 'type': '[str]'}, + } + + def __init__(self, *, vpn_client_connections_count: int=None, allocated_ip_addresses=None, **kwargs) -> None: + super(VpnClientConnectionHealth, self).__init__(**kwargs) + self.total_ingress_bytes_transferred = None + self.total_egress_bytes_transferred = None + self.vpn_client_connections_count = vpn_client_connections_count + self.allocated_ip_addresses = allocated_ip_addresses diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection.py index 438a54532019..535e4b1d2570 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .sub_resource import SubResource -class VpnConnection(Resource): +class VpnConnection(SubResource): """VpnConnection Resource. Variables are only populated by the server, and will be ignored when @@ -20,14 +20,6 @@ class VpnConnection(Resource): :param id: Resource ID. :type id: str - :ivar name: Resource name. - :vartype name: str - :ivar type: Resource type. - :vartype type: str - :param location: Resource location. - :type location: str - :param tags: Resource tags. - :type tags: dict[str, str] :param remote_vpn_site: Id of the connected vpn site. :type remote_vpn_site: ~azure.mgmt.network.v2018_08_01.models.SubResource :param routing_weight: routing weight for vpn connection. @@ -36,12 +28,16 @@ class VpnConnection(Resource): 'Unknown', 'Connecting', 'Connected', 'NotConnected' :type connection_status: str or ~azure.mgmt.network.v2018_08_01.models.VpnConnectionStatus + :param vpn_connection_protocol_type: Connection protocol used for this + connection. Possible values include: 'IKEv2', 'IKEv1' + :type vpn_connection_protocol_type: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :ivar ingress_bytes_transferred: Ingress bytes transferred. :vartype ingress_bytes_transferred: long :ivar egress_bytes_transferred: Egress bytes transferred. :vartype egress_bytes_transferred: long - :ivar connection_bandwidth_in_mbps: Expected bandwidth in MBPS. - :vartype connection_bandwidth_in_mbps: int + :param connection_bandwidth: Expected bandwidth in MBPS. + :type connection_bandwidth: int :param shared_key: SharedKey for the vpn connection. :type shared_key: str :param enable_bgp: EnableBgp flag @@ -50,40 +46,44 @@ class VpnConnection(Resource): connection. :type ipsec_policies: list[~azure.mgmt.network.v2018_08_01.models.IpsecPolicy] + :param enable_rate_limiting: EnableBgp flag + :type enable_rate_limiting: bool + :param enable_internet_security: Enable internet security + :type enable_internet_security: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param name: The 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: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str """ _validation = { - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'ingress_bytes_transferred': {'readonly': True}, 'egress_bytes_transferred': {'readonly': True}, - 'connection_bandwidth_in_mbps': {'readonly': True}, 'etag': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, 'remote_vpn_site': {'key': 'properties.remoteVpnSite', 'type': 'SubResource'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, + 'vpn_connection_protocol_type': {'key': 'properties.vpnConnectionProtocolType', 'type': 'str'}, 'ingress_bytes_transferred': {'key': 'properties.ingressBytesTransferred', 'type': 'long'}, 'egress_bytes_transferred': {'key': 'properties.egressBytesTransferred', 'type': 'long'}, - 'connection_bandwidth_in_mbps': {'key': 'properties.connectionBandwidthInMbps', 'type': 'int'}, + 'connection_bandwidth': {'key': 'properties.connectionBandwidth', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'enable_bgp': {'key': 'properties.enableBgp', 'type': 'bool'}, 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, + 'enable_rate_limiting': {'key': 'properties.enableRateLimiting', 'type': 'bool'}, + 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -92,11 +92,15 @@ def __init__(self, **kwargs): self.remote_vpn_site = kwargs.get('remote_vpn_site', None) self.routing_weight = kwargs.get('routing_weight', None) self.connection_status = kwargs.get('connection_status', None) + self.vpn_connection_protocol_type = kwargs.get('vpn_connection_protocol_type', None) self.ingress_bytes_transferred = None self.egress_bytes_transferred = None - self.connection_bandwidth_in_mbps = None + self.connection_bandwidth = kwargs.get('connection_bandwidth', None) self.shared_key = kwargs.get('shared_key', None) self.enable_bgp = kwargs.get('enable_bgp', None) self.ipsec_policies = kwargs.get('ipsec_policies', None) + self.enable_rate_limiting = kwargs.get('enable_rate_limiting', None) + self.enable_internet_security = kwargs.get('enable_internet_security', None) self.provisioning_state = kwargs.get('provisioning_state', None) + self.name = kwargs.get('name', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection_py3.py index 8959f83ef019..4b93dc0be0b1 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_connection_py3.py @@ -9,10 +9,10 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource_py3 import Resource +from .sub_resource_py3 import SubResource -class VpnConnection(Resource): +class VpnConnection(SubResource): """VpnConnection Resource. Variables are only populated by the server, and will be ignored when @@ -20,14 +20,6 @@ class VpnConnection(Resource): :param id: Resource ID. :type id: str - :ivar name: Resource name. - :vartype name: str - :ivar type: Resource type. - :vartype type: str - :param location: Resource location. - :type location: str - :param tags: Resource tags. - :type tags: dict[str, str] :param remote_vpn_site: Id of the connected vpn site. :type remote_vpn_site: ~azure.mgmt.network.v2018_08_01.models.SubResource :param routing_weight: routing weight for vpn connection. @@ -36,12 +28,16 @@ class VpnConnection(Resource): 'Unknown', 'Connecting', 'Connected', 'NotConnected' :type connection_status: str or ~azure.mgmt.network.v2018_08_01.models.VpnConnectionStatus + :param vpn_connection_protocol_type: Connection protocol used for this + connection. Possible values include: 'IKEv2', 'IKEv1' + :type vpn_connection_protocol_type: str or + ~azure.mgmt.network.v2018_08_01.models.VirtualNetworkGatewayConnectionProtocol :ivar ingress_bytes_transferred: Ingress bytes transferred. :vartype ingress_bytes_transferred: long :ivar egress_bytes_transferred: Egress bytes transferred. :vartype egress_bytes_transferred: long - :ivar connection_bandwidth_in_mbps: Expected bandwidth in MBPS. - :vartype connection_bandwidth_in_mbps: int + :param connection_bandwidth: Expected bandwidth in MBPS. + :type connection_bandwidth: int :param shared_key: SharedKey for the vpn connection. :type shared_key: str :param enable_bgp: EnableBgp flag @@ -50,53 +46,61 @@ class VpnConnection(Resource): connection. :type ipsec_policies: list[~azure.mgmt.network.v2018_08_01.models.IpsecPolicy] + :param enable_rate_limiting: EnableBgp flag + :type enable_rate_limiting: bool + :param enable_internet_security: Enable internet security + :type enable_internet_security: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param name: The 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: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str """ _validation = { - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'ingress_bytes_transferred': {'readonly': True}, 'egress_bytes_transferred': {'readonly': True}, - 'connection_bandwidth_in_mbps': {'readonly': True}, 'etag': {'readonly': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, 'remote_vpn_site': {'key': 'properties.remoteVpnSite', 'type': 'SubResource'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'connection_status': {'key': 'properties.connectionStatus', 'type': 'str'}, + 'vpn_connection_protocol_type': {'key': 'properties.vpnConnectionProtocolType', 'type': 'str'}, 'ingress_bytes_transferred': {'key': 'properties.ingressBytesTransferred', 'type': 'long'}, 'egress_bytes_transferred': {'key': 'properties.egressBytesTransferred', 'type': 'long'}, - 'connection_bandwidth_in_mbps': {'key': 'properties.connectionBandwidthInMbps', 'type': 'int'}, + 'connection_bandwidth': {'key': 'properties.connectionBandwidth', 'type': 'int'}, 'shared_key': {'key': 'properties.sharedKey', 'type': 'str'}, 'enable_bgp': {'key': 'properties.enableBgp', 'type': 'bool'}, 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, + 'enable_rate_limiting': {'key': 'properties.enableRateLimiting', 'type': 'bool'}, + 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, remote_vpn_site=None, routing_weight: int=None, connection_status=None, shared_key: str=None, enable_bgp: bool=None, ipsec_policies=None, provisioning_state=None, **kwargs) -> None: - super(VpnConnection, self).__init__(id=id, location=location, tags=tags, **kwargs) + def __init__(self, *, id: str=None, remote_vpn_site=None, routing_weight: int=None, connection_status=None, vpn_connection_protocol_type=None, connection_bandwidth: int=None, shared_key: str=None, enable_bgp: bool=None, ipsec_policies=None, enable_rate_limiting: bool=None, enable_internet_security: bool=None, provisioning_state=None, name: str=None, **kwargs) -> None: + super(VpnConnection, self).__init__(id=id, **kwargs) self.remote_vpn_site = remote_vpn_site self.routing_weight = routing_weight self.connection_status = connection_status + self.vpn_connection_protocol_type = vpn_connection_protocol_type self.ingress_bytes_transferred = None self.egress_bytes_transferred = None - self.connection_bandwidth_in_mbps = None + self.connection_bandwidth = connection_bandwidth self.shared_key = shared_key self.enable_bgp = enable_bgp self.ipsec_policies = ipsec_policies + self.enable_rate_limiting = enable_rate_limiting + self.enable_internet_security = enable_internet_security self.provisioning_state = provisioning_state + self.name = name self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway.py index 7ddaffc03e81..43ee984e5f7a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway.py @@ -39,8 +39,8 @@ class VpnGateway(Resource): Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param policies: The policies applied to this vpn gateway. - :type policies: ~azure.mgmt.network.v2018_08_01.models.Policies + :param vpn_gateway_scale_unit: The scale unit for this vpn gateway. + :type vpn_gateway_scale_unit: int :ivar etag: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -62,7 +62,7 @@ class VpnGateway(Resource): 'connections': {'key': 'properties.connections', 'type': '[VpnConnection]'}, 'bgp_settings': {'key': 'properties.bgpSettings', 'type': 'BgpSettings'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'policies': {'key': 'properties.policies', 'type': 'Policies'}, + 'vpn_gateway_scale_unit': {'key': 'properties.vpnGatewayScaleUnit', 'type': 'int'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -72,5 +72,5 @@ def __init__(self, **kwargs): self.connections = kwargs.get('connections', None) self.bgp_settings = kwargs.get('bgp_settings', None) self.provisioning_state = kwargs.get('provisioning_state', None) - self.policies = kwargs.get('policies', None) + self.vpn_gateway_scale_unit = kwargs.get('vpn_gateway_scale_unit', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway_py3.py index dd0acdbf31c9..e478b830bc48 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_gateway_py3.py @@ -39,8 +39,8 @@ class VpnGateway(Resource): Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param policies: The policies applied to this vpn gateway. - :type policies: ~azure.mgmt.network.v2018_08_01.models.Policies + :param vpn_gateway_scale_unit: The scale unit for this vpn gateway. + :type vpn_gateway_scale_unit: int :ivar etag: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -62,15 +62,15 @@ class VpnGateway(Resource): 'connections': {'key': 'properties.connections', 'type': '[VpnConnection]'}, 'bgp_settings': {'key': 'properties.bgpSettings', 'type': 'BgpSettings'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'policies': {'key': 'properties.policies', 'type': 'Policies'}, + 'vpn_gateway_scale_unit': {'key': 'properties.vpnGatewayScaleUnit', 'type': 'int'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_hub=None, connections=None, bgp_settings=None, provisioning_state=None, policies=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_hub=None, connections=None, bgp_settings=None, provisioning_state=None, vpn_gateway_scale_unit: int=None, **kwargs) -> None: super(VpnGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) self.virtual_hub = virtual_hub self.connections = connections self.bgp_settings = bgp_settings self.provisioning_state = provisioning_state - self.policies = policies + self.vpn_gateway_scale_unit = vpn_gateway_scale_unit self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response.py new file mode 100644 index 000000000000..ec8320a2d0cf --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response.py @@ -0,0 +1,28 @@ +# 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.serialization import Model + + +class VpnProfileResponse(Model): + """Vpn Profile Response for package generation. + + :param profile_url: URL to the VPN profile + :type profile_url: str + """ + + _attribute_map = { + 'profile_url': {'key': 'profileUrl', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(VpnProfileResponse, self).__init__(**kwargs) + self.profile_url = kwargs.get('profile_url', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response_py3.py new file mode 100644 index 000000000000..96fb208bf55d --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_profile_response_py3.py @@ -0,0 +1,28 @@ +# 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.serialization import Model + + +class VpnProfileResponse(Model): + """Vpn Profile Response for package generation. + + :param profile_url: URL to the VPN profile + :type profile_url: str + """ + + _attribute_map = { + 'profile_url': {'key': 'profileUrl', 'type': 'str'}, + } + + def __init__(self, *, profile_url: str=None, **kwargs) -> None: + super(VpnProfileResponse, self).__init__(**kwargs) + self.profile_url = profile_url diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site.py index 92a757d6cb3b..9a55f2b4e4e4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site.py @@ -46,6 +46,8 @@ class VpnSite(Resource): Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param is_security_site: IsSecuritySite flag + :type is_security_site: bool :ivar etag: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -63,13 +65,14 @@ class VpnSite(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'virtual_wan': {'key': 'properties.virtualWAN', 'type': 'SubResource'}, + 'virtual_wan': {'key': 'properties.virtualWan', 'type': 'SubResource'}, 'device_properties': {'key': 'properties.deviceProperties', 'type': 'DeviceProperties'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, 'site_key': {'key': 'properties.siteKey', 'type': 'str'}, 'address_space': {'key': 'properties.addressSpace', 'type': 'AddressSpace'}, 'bgp_properties': {'key': 'properties.bgpProperties', 'type': 'BgpSettings'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'is_security_site': {'key': 'properties.isSecuritySite', 'type': 'bool'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -82,4 +85,5 @@ def __init__(self, **kwargs): self.address_space = kwargs.get('address_space', None) self.bgp_properties = kwargs.get('bgp_properties', None) self.provisioning_state = kwargs.get('provisioning_state', None) + self.is_security_site = kwargs.get('is_security_site', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site_py3.py index 67f5fc410107..4f11fddebe62 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/vpn_site_py3.py @@ -46,6 +46,8 @@ class VpnSite(Resource): Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState + :param is_security_site: IsSecuritySite flag + :type is_security_site: bool :ivar etag: Gets a unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -63,17 +65,18 @@ class VpnSite(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'virtual_wan': {'key': 'properties.virtualWAN', 'type': 'SubResource'}, + 'virtual_wan': {'key': 'properties.virtualWan', 'type': 'SubResource'}, 'device_properties': {'key': 'properties.deviceProperties', 'type': 'DeviceProperties'}, 'ip_address': {'key': 'properties.ipAddress', 'type': 'str'}, 'site_key': {'key': 'properties.siteKey', 'type': 'str'}, 'address_space': {'key': 'properties.addressSpace', 'type': 'AddressSpace'}, 'bgp_properties': {'key': 'properties.bgpProperties', 'type': 'BgpSettings'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'is_security_site': {'key': 'properties.isSecuritySite', 'type': 'bool'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_wan=None, device_properties=None, ip_address: str=None, site_key: str=None, address_space=None, bgp_properties=None, provisioning_state=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_wan=None, device_properties=None, ip_address: str=None, site_key: str=None, address_space=None, bgp_properties=None, provisioning_state=None, is_security_site: bool=None, **kwargs) -> None: super(VpnSite, self).__init__(id=id, location=location, tags=tags, **kwargs) self.virtual_wan = virtual_wan self.device_properties = device_properties @@ -82,4 +85,5 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, virtual_wan=N self.address_space = address_space self.bgp_properties = bgp_properties self.provisioning_state = provisioning_state + self.is_security_site = is_security_site self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py index a95d19ca02ca..0dfdd698071d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py @@ -79,6 +79,8 @@ 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 . import models @@ -244,6 +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 :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials @@ -387,6 +393,10 @@ 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._client, self.config, self._serialize, self._deserialize) + self.p2_svpn_gateways = P2SVpnGatewaysOperations( + self._client, self.config, self._serialize, self._deserialize) def check_dns_name_availability( self, location, domain_name_label, custom_headers=None, raw=False, **operation_config): @@ -455,3 +465,68 @@ def check_dns_name_availability( return deserialized check_dns_name_availability.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability'} + + def supported_security_providers( + self, resource_group_name, virtual_wan_name, custom_headers=None, raw=False, **operation_config): + """Gives the supported security providers for the virtual wan. + + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param virtual_wan_name: The name of the VirtualWAN for which + supported security providers are needed. + :type virtual_wan_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: VirtualWanSecurityProviders or ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.network.v2018_08_01.models.VirtualWanSecurityProviders or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorException` + """ + api_version = "2018-08-01" + + # Construct URL + url = self.supported_security_providers.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualWANName': self._serialize.url("virtual_wan_name", virtual_wan_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("api_version", api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('VirtualWanSecurityProviders', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + supported_security_providers.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/supportedSecurityProviders'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py index 8c6751fce9f0..a2e9f1bef872 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py @@ -70,6 +70,8 @@ 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 __all__ = [ 'ApplicationGatewaysOperations', @@ -133,4 +135,6 @@ 'HubVirtualNetworkConnectionsOperations', 'VpnGatewaysOperations', 'VpnConnectionsOperations', + 'P2SVpnServerConfigurationsOperations', + 'P2SVpnGatewaysOperations', ] diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_gateways_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_gateways_operations.py new file mode 100644 index 000000000000..828547f985ab --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_gateways_operations.py @@ -0,0 +1,626 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class P2SVpnGatewaysOperations(object): + """P2SVpnGatewaysOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def get( + self, resource_group_name, gateway_name, custom_headers=None, raw=False, **operation_config): + """Retrieves the details of a virtual wan p2s vpn gateway. + + :param resource_group_name: The resource group name of the + P2SVpnGateway. + :type resource_group_name: str + :param gateway_name: The name of the gateway. + :type gateway_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: P2SVpnGateway or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorException` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('P2SVpnGateway', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}'} + + + def _create_or_update_initial( + self, resource_group_name, gateway_name, p2_svpn_gateway_parameters, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.create_or_update.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(p2_svpn_gateway_parameters, 'P2SVpnGateway') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 201]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('P2SVpnGateway', response) + if response.status_code == 201: + deserialized = self._deserialize('P2SVpnGateway', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def create_or_update( + self, resource_group_name, gateway_name, p2_svpn_gateway_parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates a virtual wan p2s vpn gateway if it doesn't exist else updates + the existing gateway. + + :param resource_group_name: The resource group name of the + P2SVpnGateway. + :type resource_group_name: str + :param gateway_name: The name of the gateway. + :type gateway_name: str + :param p2_svpn_gateway_parameters: Parameters supplied to create or + Update a virtual wan p2s vpn gateway. + :type p2_svpn_gateway_parameters: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns P2SVpnGateway or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway]] + :raises: + :class:`ErrorException` + """ + raw_result = self._create_or_update_initial( + resource_group_name=resource_group_name, + gateway_name=gateway_name, + p2_svpn_gateway_parameters=p2_svpn_gateway_parameters, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('P2SVpnGateway', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}'} + + + def _update_tags_initial( + self, resource_group_name, gateway_name, tags=None, custom_headers=None, raw=False, **operation_config): + p2_svpn_gateway_parameters = models.TagsObject(tags=tags) + + # Construct URL + url = self.update_tags.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(p2_svpn_gateway_parameters, 'TagsObject') + + # Construct and send request + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 201]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('P2SVpnGateway', response) + if response.status_code == 201: + deserialized = self._deserialize('P2SVpnGateway', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def update_tags( + self, resource_group_name, gateway_name, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Updates virtual wan p2s vpn gateway tags. + + :param resource_group_name: The resource group name of the + P2SVpnGateway. + :type resource_group_name: str + :param gateway_name: The name of the gateway. + :type gateway_name: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns P2SVpnGateway or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway]] + :raises: + :class:`ErrorException` + """ + raw_result = self._update_tags_initial( + resource_group_name=resource_group_name, + gateway_name=gateway_name, + tags=tags, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('P2SVpnGateway', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + update_tags.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}'} + + + def _delete_initial( + self, resource_group_name, gateway_name, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202, 204]: + raise models.ErrorException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def delete( + self, resource_group_name, gateway_name, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes a virtual wan p2s vpn gateway. + + :param resource_group_name: The resource group name of the + P2SVpnGateway. + :type resource_group_name: str + :param gateway_name: The name of the gateway. + :type gateway_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: + :class:`ErrorException` + """ + raw_result = self._delete_initial( + resource_group_name=resource_group_name, + gateway_name=gateway_name, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}'} + + def list_by_resource_group( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """Lists all the P2SVpnGateways in a resource group. + + :param resource_group_name: The resource group name of the + P2SVpnGateway. + :type resource_group_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of P2SVpnGateway + :rtype: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnGatewayPaged[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway] + :raises: + :class:`ErrorException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_resource_group.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.P2SVpnGatewayPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.P2SVpnGatewayPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways'} + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Lists all the P2SVpnGateways in a subscription. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of P2SVpnGateway + :rtype: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnGatewayPaged[~azure.mgmt.network.v2018_08_01.models.P2SVpnGateway] + :raises: + :class:`ErrorException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.P2SVpnGatewayPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.P2SVpnGatewayPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/p2svpnGateways'} + + + def _generate_vpn_profile_initial( + self, resource_group_name, gateway_name, authentication_method=None, custom_headers=None, raw=False, **operation_config): + parameters = models.P2SVpnProfileParameters(authentication_method=authentication_method) + + # Construct URL + url = self.generate_vpn_profile.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'gatewayName': self._serialize.url("gateway_name", gateway_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'P2SVpnProfileParameters') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('VpnProfileResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def generate_vpn_profile( + self, resource_group_name, gateway_name, authentication_method=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Generates VPN profile for P2S client of the P2SVpnGateway in the + specified resource group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param gateway_name: The name of the P2SVpnGateway. + :type gateway_name: str + :param authentication_method: VPN client Authentication Method. + Possible values are: 'EAPTLS' and 'EAPMSCHAPv2'. Possible values + include: 'EAPTLS', 'EAPMSCHAPv2' + :type authentication_method: str or + ~azure.mgmt.network.v2018_08_01.models.AuthenticationMethod + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns VpnProfileResponse or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.VpnProfileResponse] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.VpnProfileResponse]] + :raises: :class:`CloudError` + """ + raw_result = self._generate_vpn_profile_initial( + resource_group_name=resource_group_name, + gateway_name=gateway_name, + authentication_method=authentication_method, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('VpnProfileResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + generate_vpn_profile.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/generatevpnprofile'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_server_configurations_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_server_configurations_operations.py new file mode 100644 index 000000000000..b81f34811eef --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/p2_svpn_server_configurations_operations.py @@ -0,0 +1,369 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class P2SVpnServerConfigurationsOperations(object): + """P2SVpnServerConfigurationsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def get( + self, resource_group_name, virtual_wan_name, p2_svpn_server_configuration_name, custom_headers=None, raw=False, **operation_config): + """Retrieves the details of a P2SVpnServerConfiguration. + + :param resource_group_name: The resource group name of the + P2SVpnServerConfiguration. + :type resource_group_name: str + :param virtual_wan_name: The name of the VirtualWan. + :type virtual_wan_name: str + :param p2_svpn_server_configuration_name: The name of the + P2SVpnServerConfiguration. + :type p2_svpn_server_configuration_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: P2SVpnServerConfiguration or ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorException` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualWanName': self._serialize.url("virtual_wan_name", virtual_wan_name, 'str'), + 'p2SVpnServerConfigurationName': self._serialize.url("p2_svpn_server_configuration_name", p2_svpn_server_configuration_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('P2SVpnServerConfiguration', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWanName}/p2sVpnServerConfigurations/{p2SVpnServerConfigurationName}'} + + + def _create_or_update_initial( + self, resource_group_name, virtual_wan_name, p2_svpn_server_configuration_name, p2_svpn_server_configuration_parameters, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.create_or_update.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualWanName': self._serialize.url("virtual_wan_name", virtual_wan_name, 'str'), + 'p2SVpnServerConfigurationName': self._serialize.url("p2_svpn_server_configuration_name", p2_svpn_server_configuration_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(p2_svpn_server_configuration_parameters, 'P2SVpnServerConfiguration') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 201]: + raise models.ErrorException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('P2SVpnServerConfiguration', response) + if response.status_code == 201: + deserialized = self._deserialize('P2SVpnServerConfiguration', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def create_or_update( + self, resource_group_name, virtual_wan_name, p2_svpn_server_configuration_name, p2_svpn_server_configuration_parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates a P2SVpnServerConfiguration to associate with a VirtualWan if + it doesn't exist else updates the existing P2SVpnServerConfiguration. + + :param resource_group_name: The resource group name of the VirtualWan. + :type resource_group_name: str + :param virtual_wan_name: The name of the VirtualWan. + :type virtual_wan_name: str + :param p2_svpn_server_configuration_name: The name of the + P2SVpnServerConfiguration. + :type p2_svpn_server_configuration_name: str + :param p2_svpn_server_configuration_parameters: Parameters supplied to + create or Update a P2SVpnServerConfiguration. + :type p2_svpn_server_configuration_parameters: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns + P2SVpnServerConfiguration or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration]] + :raises: + :class:`ErrorException` + """ + raw_result = self._create_or_update_initial( + resource_group_name=resource_group_name, + virtual_wan_name=virtual_wan_name, + p2_svpn_server_configuration_name=p2_svpn_server_configuration_name, + p2_svpn_server_configuration_parameters=p2_svpn_server_configuration_parameters, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('P2SVpnServerConfiguration', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWanName}/p2sVpnServerConfigurations/{p2SVpnServerConfigurationName}'} + + + def _delete_initial( + self, resource_group_name, virtual_wan_name, p2_svpn_server_configuration_name, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualWanName': self._serialize.url("virtual_wan_name", virtual_wan_name, 'str'), + 'p2SVpnServerConfigurationName': self._serialize.url("p2_svpn_server_configuration_name", p2_svpn_server_configuration_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202, 204]: + raise models.ErrorException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def delete( + self, resource_group_name, virtual_wan_name, p2_svpn_server_configuration_name, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes a P2SVpnServerConfiguration. + + :param resource_group_name: The resource group name of the + P2SVpnServerConfiguration. + :type resource_group_name: str + :param virtual_wan_name: The name of the VirtualWan. + :type virtual_wan_name: str + :param p2_svpn_server_configuration_name: The name of the + P2SVpnServerConfiguration. + :type p2_svpn_server_configuration_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: + :class:`ErrorException` + """ + raw_result = self._delete_initial( + resource_group_name=resource_group_name, + virtual_wan_name=virtual_wan_name, + p2_svpn_server_configuration_name=p2_svpn_server_configuration_name, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWanName}/p2sVpnServerConfigurations/{p2SVpnServerConfigurationName}'} + + def list_by_virtual_wan( + self, resource_group_name, virtual_wan_name, custom_headers=None, raw=False, **operation_config): + """Retrieves all P2SVpnServerConfigurations for a particular VirtualWan. + + :param resource_group_name: The resource group name of the VirtualWan. + :type resource_group_name: str + :param virtual_wan_name: The name of the VirtualWan. + :type virtual_wan_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of P2SVpnServerConfiguration + :rtype: + ~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfigurationPaged[~azure.mgmt.network.v2018_08_01.models.P2SVpnServerConfiguration] + :raises: + :class:`ErrorException` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_virtual_wan.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualWanName': self._serialize.url("virtual_wan_name", virtual_wan_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorException(self._deserialize, response) + + return response + + # Deserialize response + deserialized = models.P2SVpnServerConfigurationPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.P2SVpnServerConfigurationPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_virtual_wan.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWanName}/p2sVpnServerConfigurations'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/vpn_sites_configuration_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/vpn_sites_configuration_operations.py index 860e5f20691d..2d325254f479 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/vpn_sites_configuration_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/vpn_sites_configuration_operations.py @@ -92,8 +92,7 @@ def download( :type virtual_wan_name: str :param vpn_sites: List of resource-ids of the vpn-sites for which config is to be downloaded. - :type vpn_sites: - list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :type vpn_sites: list[str] :param output_blob_sas_url: The sas-url to download the configurations for vpn-sites :type output_blob_sas_url: str