diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/__init__.py index 5e02d5873d65..05d4ccf3c0aa 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/__init__.py @@ -10,6 +10,8 @@ # -------------------------------------------------------------------------- try: + from .application_gateway_probe_health_response_match_py3 import ApplicationGatewayProbeHealthResponseMatch + from .application_gateway_on_demand_probe_py3 import ApplicationGatewayOnDemandProbe from .network_interface_tap_configuration_py3 import NetworkInterfaceTapConfiguration from .sub_resource_py3 import SubResource from .application_security_group_py3 import ApplicationSecurityGroup @@ -46,6 +48,7 @@ from .application_gateway_backend_http_settings_py3 import ApplicationGatewayBackendHttpSettings from .application_gateway_backend_health_server_py3 import ApplicationGatewayBackendHealthServer from .application_gateway_backend_health_http_settings_py3 import ApplicationGatewayBackendHealthHttpSettings + from .application_gateway_backend_health_on_demand_py3 import ApplicationGatewayBackendHealthOnDemand from .application_gateway_backend_health_pool_py3 import ApplicationGatewayBackendHealthPool from .application_gateway_backend_health_py3 import ApplicationGatewayBackendHealth from .application_gateway_sku_py3 import ApplicationGatewaySku @@ -59,7 +62,6 @@ from .application_gateway_custom_error_py3 import ApplicationGatewayCustomError from .application_gateway_http_listener_py3 import ApplicationGatewayHttpListener from .application_gateway_path_rule_py3 import ApplicationGatewayPathRule - from .application_gateway_probe_health_response_match_py3 import ApplicationGatewayProbeHealthResponseMatch from .application_gateway_probe_py3 import ApplicationGatewayProbe from .application_gateway_request_routing_rule_py3 import ApplicationGatewayRequestRoutingRule from .application_gateway_rewrite_rule_condition_py3 import ApplicationGatewayRewriteRuleCondition @@ -305,6 +307,8 @@ from .web_application_firewall_custom_rule_py3 import WebApplicationFirewallCustomRule from .web_application_firewall_policy_py3 import WebApplicationFirewallPolicy except (SyntaxError, ImportError): + from .application_gateway_probe_health_response_match import ApplicationGatewayProbeHealthResponseMatch + from .application_gateway_on_demand_probe import ApplicationGatewayOnDemandProbe from .network_interface_tap_configuration import NetworkInterfaceTapConfiguration from .sub_resource import SubResource from .application_security_group import ApplicationSecurityGroup @@ -341,6 +345,7 @@ from .application_gateway_backend_http_settings import ApplicationGatewayBackendHttpSettings from .application_gateway_backend_health_server import ApplicationGatewayBackendHealthServer from .application_gateway_backend_health_http_settings import ApplicationGatewayBackendHealthHttpSettings + from .application_gateway_backend_health_on_demand import ApplicationGatewayBackendHealthOnDemand from .application_gateway_backend_health_pool import ApplicationGatewayBackendHealthPool from .application_gateway_backend_health import ApplicationGatewayBackendHealth from .application_gateway_sku import ApplicationGatewaySku @@ -354,7 +359,6 @@ from .application_gateway_custom_error import ApplicationGatewayCustomError from .application_gateway_http_listener import ApplicationGatewayHttpListener from .application_gateway_path_rule import ApplicationGatewayPathRule - from .application_gateway_probe_health_response_match import ApplicationGatewayProbeHealthResponseMatch from .application_gateway_probe import ApplicationGatewayProbe from .application_gateway_request_routing_rule import ApplicationGatewayRequestRoutingRule from .application_gateway_rewrite_rule_condition import ApplicationGatewayRewriteRuleCondition @@ -666,6 +670,7 @@ from .p2_svpn_gateway_paged import P2SVpnGatewayPaged from .web_application_firewall_policy_paged import WebApplicationFirewallPolicyPaged from .network_management_client_enums import ( + ApplicationGatewayProtocol, IPAllocationMethod, SecurityRuleProtocol, SecurityRuleAccess, @@ -675,7 +680,6 @@ IPVersion, DdosSettingsProtectionCoverage, TransportProtocol, - ApplicationGatewayProtocol, ApplicationGatewayCookieBasedAffinity, ApplicationGatewayBackendHealthServerHealth, ApplicationGatewaySkuName, @@ -717,6 +721,7 @@ LoadBalancerOutboundRuleProtocol, NatGatewaySkuName, NetworkOperationStatus, + AuthenticationMethod, EffectiveSecurityRuleProtocol, EffectiveRouteSource, EffectiveRouteState, @@ -753,7 +758,6 @@ PfsGroup, BgpPeerState, ProcessorArchitecture, - AuthenticationMethod, VirtualNetworkGatewayConnectionStatus, VirtualNetworkGatewayConnectionType, VirtualNetworkGatewayConnectionProtocol, @@ -774,6 +778,8 @@ ) __all__ = [ + 'ApplicationGatewayProbeHealthResponseMatch', + 'ApplicationGatewayOnDemandProbe', 'NetworkInterfaceTapConfiguration', 'SubResource', 'ApplicationSecurityGroup', @@ -810,6 +816,7 @@ 'ApplicationGatewayBackendHttpSettings', 'ApplicationGatewayBackendHealthServer', 'ApplicationGatewayBackendHealthHttpSettings', + 'ApplicationGatewayBackendHealthOnDemand', 'ApplicationGatewayBackendHealthPool', 'ApplicationGatewayBackendHealth', 'ApplicationGatewaySku', @@ -823,7 +830,6 @@ 'ApplicationGatewayCustomError', 'ApplicationGatewayHttpListener', 'ApplicationGatewayPathRule', - 'ApplicationGatewayProbeHealthResponseMatch', 'ApplicationGatewayProbe', 'ApplicationGatewayRequestRoutingRule', 'ApplicationGatewayRewriteRuleCondition', @@ -1134,6 +1140,7 @@ 'P2SVpnServerConfigurationPaged', 'P2SVpnGatewayPaged', 'WebApplicationFirewallPolicyPaged', + 'ApplicationGatewayProtocol', 'IPAllocationMethod', 'SecurityRuleProtocol', 'SecurityRuleAccess', @@ -1143,7 +1150,6 @@ 'IPVersion', 'DdosSettingsProtectionCoverage', 'TransportProtocol', - 'ApplicationGatewayProtocol', 'ApplicationGatewayCookieBasedAffinity', 'ApplicationGatewayBackendHealthServerHealth', 'ApplicationGatewaySkuName', @@ -1185,6 +1191,7 @@ 'LoadBalancerOutboundRuleProtocol', 'NatGatewaySkuName', 'NetworkOperationStatus', + 'AuthenticationMethod', 'EffectiveSecurityRuleProtocol', 'EffectiveRouteSource', 'EffectiveRouteState', @@ -1221,7 +1228,6 @@ 'PfsGroup', 'BgpPeerState', 'ProcessorArchitecture', - 'AuthenticationMethod', 'VirtualNetworkGatewayConnectionStatus', 'VirtualNetworkGatewayConnectionType', 'VirtualNetworkGatewayConnectionProtocol', diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand.py new file mode 100644 index 000000000000..3192a6cf6a11 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand.py @@ -0,0 +1,36 @@ +# 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 ApplicationGatewayBackendHealthOnDemand(Model): + """Result of on demand test probe. + + :param backend_address_pool: Reference of an + ApplicationGatewayBackendAddressPool resource. + :type backend_address_pool: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendAddressPool + :param backend_health_http_settings: Application gateway BackendHealthHttp + settings. + :type backend_health_http_settings: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendHealthHttpSettings + """ + + _attribute_map = { + 'backend_address_pool': {'key': 'backendAddressPool', 'type': 'ApplicationGatewayBackendAddressPool'}, + 'backend_health_http_settings': {'key': 'backendHealthHttpSettings', 'type': 'ApplicationGatewayBackendHealthHttpSettings'}, + } + + def __init__(self, **kwargs): + super(ApplicationGatewayBackendHealthOnDemand, self).__init__(**kwargs) + self.backend_address_pool = kwargs.get('backend_address_pool', None) + self.backend_health_http_settings = kwargs.get('backend_health_http_settings', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand_py3.py new file mode 100644 index 000000000000..e5c4810b342e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_health_on_demand_py3.py @@ -0,0 +1,36 @@ +# 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 ApplicationGatewayBackendHealthOnDemand(Model): + """Result of on demand test probe. + + :param backend_address_pool: Reference of an + ApplicationGatewayBackendAddressPool resource. + :type backend_address_pool: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendAddressPool + :param backend_health_http_settings: Application gateway BackendHealthHttp + settings. + :type backend_health_http_settings: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendHealthHttpSettings + """ + + _attribute_map = { + 'backend_address_pool': {'key': 'backendAddressPool', 'type': 'ApplicationGatewayBackendAddressPool'}, + 'backend_health_http_settings': {'key': 'backendHealthHttpSettings', 'type': 'ApplicationGatewayBackendHealthHttpSettings'}, + } + + def __init__(self, *, backend_address_pool=None, backend_health_http_settings=None, **kwargs) -> None: + super(ApplicationGatewayBackendHealthOnDemand, self).__init__(**kwargs) + self.backend_address_pool = backend_address_pool + self.backend_health_http_settings = backend_health_http_settings diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings.py index 471582ef3723..40fe45de8eaf 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings.py @@ -20,8 +20,7 @@ class ApplicationGatewayBackendHttpSettings(SubResource): :param port: The destination port on the backend. :type port: int :param protocol: The protocol used to communicate with the backend. - Possible values are 'Http' and 'Https'. Possible values include: 'Http', - 'Https' + Possible values include: 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param cookie_based_affinity: Cookie based affinity. Possible values diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings_py3.py index af64bbf4a714..54b88e5de666 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_backend_http_settings_py3.py @@ -20,8 +20,7 @@ class ApplicationGatewayBackendHttpSettings(SubResource): :param port: The destination port on the backend. :type port: int :param protocol: The protocol used to communicate with the backend. - Possible values are 'Http' and 'Https'. Possible values include: 'Http', - 'Https' + Possible values include: 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param cookie_based_affinity: Cookie based affinity. Possible values diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration.py index 15f769a0018e..4be4adf8dd09 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration.py @@ -20,8 +20,8 @@ class ApplicationGatewayFrontendIPConfiguration(SubResource): :param private_ip_address: PrivateIPAddress of the network interface IP Configuration. :type private_ip_address: str - :param private_ip_allocation_method: PrivateIP allocation method. Possible - values include: 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: Reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration_py3.py index 2e018ea42a61..47c1bfb3fddd 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_frontend_ip_configuration_py3.py @@ -20,8 +20,8 @@ class ApplicationGatewayFrontendIPConfiguration(SubResource): :param private_ip_address: PrivateIPAddress of the network interface IP Configuration. :type private_ip_address: str - :param private_ip_allocation_method: PrivateIP allocation method. Possible - values include: 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: Reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener.py index 5bf854c91c6f..8b38583d4dfa 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener.py @@ -23,8 +23,8 @@ class ApplicationGatewayHttpListener(SubResource): ~azure.mgmt.network.v2019_02_01.models.SubResource :param frontend_port: Frontend port resource of an application gateway. :type frontend_port: ~azure.mgmt.network.v2019_02_01.models.SubResource - :param protocol: Protocol of the HTTP listener. Possible values are 'Http' - and 'Https'. Possible values include: 'Http', 'Https' + :param protocol: Protocol of the HTTP listener. Possible values include: + 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param host_name: Host name of HTTP listener. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener_py3.py index 1af89d690e5d..17c6340e7c34 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_http_listener_py3.py @@ -23,8 +23,8 @@ class ApplicationGatewayHttpListener(SubResource): ~azure.mgmt.network.v2019_02_01.models.SubResource :param frontend_port: Frontend port resource of an application gateway. :type frontend_port: ~azure.mgmt.network.v2019_02_01.models.SubResource - :param protocol: Protocol of the HTTP listener. Possible values are 'Http' - and 'Https'. Possible values include: 'Http', 'Https' + :param protocol: Protocol of the HTTP listener. Possible values include: + 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param host_name: Host name of HTTP listener. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe.py new file mode 100644 index 000000000000..d71363055bdd --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe.py @@ -0,0 +1,65 @@ +# 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 ApplicationGatewayOnDemandProbe(Model): + """Details of on demand test probe request. + + :param protocol: The protocol used for the probe. Possible values are + 'Http' and 'Https'. Possible values include: 'Http', 'Https' + :type protocol: str or + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol + :param host: Host name to send the probe to. + :type host: str + :param path: Relative path of probe. Valid path starts from '/'. Probe is + sent to ://: + :type path: str + :param timeout: The probe timeout in seconds. Probe marked as failed if + valid response is not received with this timeout period. Acceptable values + are from 1 second to 86400 seconds. + :type timeout: int + :param pick_host_name_from_backend_http_settings: Whether the host header + should be picked from the backend http settings. Default value is false. + :type pick_host_name_from_backend_http_settings: bool + :param match: Criterion for classifying a healthy probe response. + :type match: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProbeHealthResponseMatch + :param backend_pool_name: Name of backend pool of application gateway to + which probe request will be sent. + :type backend_pool_name: str + :param backend_http_setting_name: Name of backend http setting of + application gateway to be used for test probe + :type backend_http_setting_name: str + """ + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'host': {'key': 'host', 'type': 'str'}, + 'path': {'key': 'path', 'type': 'str'}, + 'timeout': {'key': 'timeout', 'type': 'int'}, + 'pick_host_name_from_backend_http_settings': {'key': 'pickHostNameFromBackendHttpSettings', 'type': 'bool'}, + 'match': {'key': 'match', 'type': 'ApplicationGatewayProbeHealthResponseMatch'}, + 'backend_pool_name': {'key': 'backendPoolName', 'type': 'str'}, + 'backend_http_setting_name': {'key': 'backendHttpSettingName', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ApplicationGatewayOnDemandProbe, self).__init__(**kwargs) + self.protocol = kwargs.get('protocol', None) + self.host = kwargs.get('host', None) + self.path = kwargs.get('path', None) + self.timeout = kwargs.get('timeout', None) + self.pick_host_name_from_backend_http_settings = kwargs.get('pick_host_name_from_backend_http_settings', None) + self.match = kwargs.get('match', None) + self.backend_pool_name = kwargs.get('backend_pool_name', None) + self.backend_http_setting_name = kwargs.get('backend_http_setting_name', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe_py3.py new file mode 100644 index 000000000000..424baaa1bc1d --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_on_demand_probe_py3.py @@ -0,0 +1,65 @@ +# 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 ApplicationGatewayOnDemandProbe(Model): + """Details of on demand test probe request. + + :param protocol: The protocol used for the probe. Possible values are + 'Http' and 'Https'. Possible values include: 'Http', 'Https' + :type protocol: str or + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol + :param host: Host name to send the probe to. + :type host: str + :param path: Relative path of probe. Valid path starts from '/'. Probe is + sent to ://: + :type path: str + :param timeout: The probe timeout in seconds. Probe marked as failed if + valid response is not received with this timeout period. Acceptable values + are from 1 second to 86400 seconds. + :type timeout: int + :param pick_host_name_from_backend_http_settings: Whether the host header + should be picked from the backend http settings. Default value is false. + :type pick_host_name_from_backend_http_settings: bool + :param match: Criterion for classifying a healthy probe response. + :type match: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProbeHealthResponseMatch + :param backend_pool_name: Name of backend pool of application gateway to + which probe request will be sent. + :type backend_pool_name: str + :param backend_http_setting_name: Name of backend http setting of + application gateway to be used for test probe + :type backend_http_setting_name: str + """ + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'host': {'key': 'host', 'type': 'str'}, + 'path': {'key': 'path', 'type': 'str'}, + 'timeout': {'key': 'timeout', 'type': 'int'}, + 'pick_host_name_from_backend_http_settings': {'key': 'pickHostNameFromBackendHttpSettings', 'type': 'bool'}, + 'match': {'key': 'match', 'type': 'ApplicationGatewayProbeHealthResponseMatch'}, + 'backend_pool_name': {'key': 'backendPoolName', 'type': 'str'}, + 'backend_http_setting_name': {'key': 'backendHttpSettingName', 'type': 'str'}, + } + + def __init__(self, *, protocol=None, host: str=None, path: str=None, timeout: int=None, pick_host_name_from_backend_http_settings: bool=None, match=None, backend_pool_name: str=None, backend_http_setting_name: str=None, **kwargs) -> None: + super(ApplicationGatewayOnDemandProbe, self).__init__(**kwargs) + self.protocol = protocol + self.host = host + self.path = path + self.timeout = timeout + self.pick_host_name_from_backend_http_settings = pick_host_name_from_backend_http_settings + self.match = match + self.backend_pool_name = backend_pool_name + self.backend_http_setting_name = backend_http_setting_name diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe.py index 9c0b79836f52..0401d24b5666 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe.py @@ -17,8 +17,8 @@ class ApplicationGatewayProbe(SubResource): :param id: Resource ID. :type id: str - :param protocol: The protocol used for the probe. Possible values are - 'Http' and 'Https'. Possible values include: 'Http', 'Https' + :param protocol: The protocol used for the probe. Possible values include: + 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param host: Host name to send the probe to. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe_py3.py index 11343415b2a9..c577312a9798 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/application_gateway_probe_py3.py @@ -17,8 +17,8 @@ class ApplicationGatewayProbe(SubResource): :param id: Resource ID. :type id: str - :param protocol: The protocol used for the probe. Possible values are - 'Http' and 'Https'. Possible values include: 'Http', 'Https' + :param protocol: The protocol used for the probe. Possible values include: + 'Http', 'Https' :type protocol: str or ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayProtocol :param host: Host name to send the probe to. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule.py index 8524dae130bd..c261e0ff60b3 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule.py @@ -53,13 +53,13 @@ class EffectiveNetworkSecurityRule(Model): prefix. :type expanded_destination_address_prefix: list[str] :param access: Whether network traffic is allowed or denied. Possible - values are: 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny' + values include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :param priority: The priority of the rule. :type priority: int - :param direction: The direction of the rule. Possible values are: 'Inbound - and Outbound'. Possible values include: 'Inbound', 'Outbound' + :param direction: The direction of the rule. Possible values include: + 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleDirection """ diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule_py3.py index b8efdc9823c5..39fb788162a8 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_network_security_rule_py3.py @@ -53,13 +53,13 @@ class EffectiveNetworkSecurityRule(Model): prefix. :type expanded_destination_address_prefix: list[str] :param access: Whether network traffic is allowed or denied. Possible - values are: 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny' + values include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :param priority: The priority of the rule. :type priority: int - :param direction: The direction of the rule. Possible values are: 'Inbound - and Outbound'. Possible values include: 'Inbound', 'Outbound' + :param direction: The direction of the rule. Possible values include: + 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleDirection """ diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route.py index 80965a238ab6..adb06ee8186a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route.py @@ -17,6 +17,9 @@ class EffectiveRoute(Model): :param name: The name of the user defined route. This is optional. :type name: str + :param disable_bgp_route_propagation: If true, on-premises routes are not + propagated to the network interfaces in the subnet. + :type disable_bgp_route_propagation: bool :param source: Who created the route. Possible values are: 'Unknown', 'User', 'VirtualNetworkGateway', and 'Default'. Possible values include: 'Unknown', 'User', 'VirtualNetworkGateway', 'Default' @@ -33,16 +36,15 @@ class EffectiveRoute(Model): effective route. :type next_hop_ip_address: list[str] :param next_hop_type: The type of Azure hop the packet should be sent to. - Possible values are: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', - 'VirtualAppliance', and 'None'. Possible values include: - 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', - 'None' + Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', + 'VirtualAppliance', 'None' :type next_hop_type: str or ~azure.mgmt.network.v2019_02_01.models.RouteNextHopType """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, + 'disable_bgp_route_propagation': {'key': 'disableBgpRoutePropagation', 'type': 'bool'}, 'source': {'key': 'source', 'type': 'str'}, 'state': {'key': 'state', 'type': 'str'}, 'address_prefix': {'key': 'addressPrefix', 'type': '[str]'}, @@ -53,6 +55,7 @@ class EffectiveRoute(Model): def __init__(self, **kwargs): super(EffectiveRoute, self).__init__(**kwargs) self.name = kwargs.get('name', None) + self.disable_bgp_route_propagation = kwargs.get('disable_bgp_route_propagation', None) self.source = kwargs.get('source', None) self.state = kwargs.get('state', None) self.address_prefix = kwargs.get('address_prefix', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route_py3.py index b7a8dcf546be..d95605288458 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/effective_route_py3.py @@ -17,6 +17,9 @@ class EffectiveRoute(Model): :param name: The name of the user defined route. This is optional. :type name: str + :param disable_bgp_route_propagation: If true, on-premises routes are not + propagated to the network interfaces in the subnet. + :type disable_bgp_route_propagation: bool :param source: Who created the route. Possible values are: 'Unknown', 'User', 'VirtualNetworkGateway', and 'Default'. Possible values include: 'Unknown', 'User', 'VirtualNetworkGateway', 'Default' @@ -33,16 +36,15 @@ class EffectiveRoute(Model): effective route. :type next_hop_ip_address: list[str] :param next_hop_type: The type of Azure hop the packet should be sent to. - Possible values are: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', - 'VirtualAppliance', and 'None'. Possible values include: - 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', - 'None' + Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', + 'VirtualAppliance', 'None' :type next_hop_type: str or ~azure.mgmt.network.v2019_02_01.models.RouteNextHopType """ _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, + 'disable_bgp_route_propagation': {'key': 'disableBgpRoutePropagation', 'type': 'bool'}, 'source': {'key': 'source', 'type': 'str'}, 'state': {'key': 'state', 'type': 'str'}, 'address_prefix': {'key': 'addressPrefix', 'type': '[str]'}, @@ -50,9 +52,10 @@ class EffectiveRoute(Model): 'next_hop_type': {'key': 'nextHopType', 'type': 'str'}, } - def __init__(self, *, name: str=None, source=None, state=None, address_prefix=None, next_hop_ip_address=None, next_hop_type=None, **kwargs) -> None: + def __init__(self, *, name: str=None, disable_bgp_route_propagation: bool=None, source=None, state=None, address_prefix=None, next_hop_ip_address=None, next_hop_type=None, **kwargs) -> None: super(EffectiveRoute, self).__init__(**kwargs) self.name = name + self.disable_bgp_route_propagation = disable_bgp_route_propagation self.source = source self.state = state self.address_prefix = address_prefix diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit.py index 6935c2d22183..6935e95db9c4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit.py @@ -37,9 +37,7 @@ class ExpressRouteCircuit(Resource): :type circuit_provisioning_state: str :param service_provider_provisioning_state: The ServiceProviderProvisioningState state of the resource. Possible values - are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. - Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', - 'Deprovisioning' + include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning' :type service_provider_provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ServiceProviderProvisioningState :param authorizations: The list of authorizations. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection.py index 75556d726129..4db58dd5e9c3 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection.py @@ -33,10 +33,9 @@ class ExpressRouteCircuitConnection(SubResource): :type address_prefix: str :param authorization_key: The authorization key. :type authorization_key: str - :ivar circuit_connection_status: Express Route Circuit Connection State. - Possible values are: 'Connected' and 'Disconnected'. Possible values - include: 'Connected', 'Connecting', 'Disconnected' - :vartype circuit_connection_status: str or + :param circuit_connection_status: Express Route Circuit connection state. + Possible values include: 'Connected', 'Connecting', 'Disconnected' + :type circuit_connection_status: str or ~azure.mgmt.network.v2019_02_01.models.CircuitConnectionStatus :ivar provisioning_state: Provisioning state of the circuit connection resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and @@ -51,7 +50,6 @@ class ExpressRouteCircuitConnection(SubResource): """ _validation = { - 'circuit_connection_status': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'etag': {'readonly': True}, } @@ -74,7 +72,7 @@ def __init__(self, **kwargs): self.peer_express_route_circuit_peering = kwargs.get('peer_express_route_circuit_peering', None) self.address_prefix = kwargs.get('address_prefix', None) self.authorization_key = kwargs.get('authorization_key', None) - self.circuit_connection_status = None + self.circuit_connection_status = kwargs.get('circuit_connection_status', None) self.provisioning_state = None self.name = kwargs.get('name', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection_py3.py index db13df461616..b76a6186b7c7 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_connection_py3.py @@ -33,10 +33,9 @@ class ExpressRouteCircuitConnection(SubResource): :type address_prefix: str :param authorization_key: The authorization key. :type authorization_key: str - :ivar circuit_connection_status: Express Route Circuit Connection State. - Possible values are: 'Connected' and 'Disconnected'. Possible values - include: 'Connected', 'Connecting', 'Disconnected' - :vartype circuit_connection_status: str or + :param circuit_connection_status: Express Route Circuit connection state. + Possible values include: 'Connected', 'Connecting', 'Disconnected' + :type circuit_connection_status: str or ~azure.mgmt.network.v2019_02_01.models.CircuitConnectionStatus :ivar provisioning_state: Provisioning state of the circuit connection resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and @@ -51,7 +50,6 @@ class ExpressRouteCircuitConnection(SubResource): """ _validation = { - 'circuit_connection_status': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'etag': {'readonly': True}, } @@ -68,13 +66,13 @@ class ExpressRouteCircuitConnection(SubResource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, express_route_circuit_peering=None, peer_express_route_circuit_peering=None, address_prefix: str=None, authorization_key: str=None, name: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, express_route_circuit_peering=None, peer_express_route_circuit_peering=None, address_prefix: str=None, authorization_key: str=None, circuit_connection_status=None, name: str=None, **kwargs) -> None: super(ExpressRouteCircuitConnection, self).__init__(id=id, **kwargs) self.express_route_circuit_peering = express_route_circuit_peering self.peer_express_route_circuit_peering = peer_express_route_circuit_peering self.address_prefix = address_prefix self.authorization_key = authorization_key - self.circuit_connection_status = None + self.circuit_connection_status = circuit_connection_status self.provisioning_state = None self.name = name self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_py3.py index 26192f5fb5d0..8e06f8fab06d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_circuit_py3.py @@ -37,9 +37,7 @@ class ExpressRouteCircuit(Resource): :type circuit_provisioning_state: str :param service_provider_provisioning_state: The ServiceProviderProvisioningState state of the resource. Possible values - are 'NotProvisioned', 'Provisioning', 'Provisioned', and 'Deprovisioning'. - Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', - 'Deprovisioning' + include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning' :type service_provider_provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ServiceProviderProvisioningState :param authorizations: The list of authorizations. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection.py index 62cdbe73f178..ea1c9e62c7be 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection.py @@ -15,16 +15,13 @@ class ExpressRouteConnection(SubResource): """ExpressRouteConnection resource. - 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 - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. @@ -39,7 +36,6 @@ class ExpressRouteConnection(SubResource): """ _validation = { - 'provisioning_state': {'readonly': True}, 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } @@ -55,7 +51,7 @@ class ExpressRouteConnection(SubResource): def __init__(self, **kwargs): super(ExpressRouteConnection, self).__init__(**kwargs) - self.provisioning_state = None + self.provisioning_state = kwargs.get('provisioning_state', None) self.express_route_circuit_peering = kwargs.get('express_route_circuit_peering', None) self.authorization_key = kwargs.get('authorization_key', None) self.routing_weight = kwargs.get('routing_weight', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection_py3.py index f2f972bab89e..0d78ed76ac96 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_connection_py3.py @@ -15,16 +15,13 @@ class ExpressRouteConnection(SubResource): """ExpressRouteConnection resource. - 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 - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. @@ -39,7 +36,6 @@ class ExpressRouteConnection(SubResource): """ _validation = { - 'provisioning_state': {'readonly': True}, 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } @@ -53,9 +49,9 @@ class ExpressRouteConnection(SubResource): 'name': {'key': 'name', 'type': 'str'}, } - def __init__(self, *, express_route_circuit_peering, name: str, id: str=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: + def __init__(self, *, express_route_circuit_peering, name: str, id: str=None, provisioning_state=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: super(ExpressRouteConnection, self).__init__(id=id, **kwargs) - self.provisioning_state = None + self.provisioning_state = provisioning_state self.express_route_circuit_peering = express_route_circuit_peering self.authorization_key = authorization_key self.routing_weight = routing_weight diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection.py index 5ce7bbfd3a4f..326f06b8b36a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection.py @@ -42,8 +42,7 @@ class ExpressRouteCrossConnection(Resource): :type express_route_circuit: ~azure.mgmt.network.v2019_02_01.models.ExpressRouteCircuitReference :param service_provider_provisioning_state: The provisioning state of the - circuit in the connectivity provider system. Possible values are - 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: + circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning' :type service_provider_provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ServiceProviderProvisioningState diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection_py3.py index 6a5d8f837067..032e89cb910e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_cross_connection_py3.py @@ -42,8 +42,7 @@ class ExpressRouteCrossConnection(Resource): :type express_route_circuit: ~azure.mgmt.network.v2019_02_01.models.ExpressRouteCircuitReference :param service_provider_provisioning_state: The provisioning state of the - circuit in the connectivity provider system. Possible values are - 'NotProvisioned', 'Provisioning', 'Provisioned'. Possible values include: + circuit in the connectivity provider system. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning' :type service_provider_provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ServiceProviderProvisioningState diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway.py index 1c32446e8447..f7690667fc27 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway.py @@ -37,9 +37,9 @@ class ExpressRouteGateway(Resource): ExpressRoute gateway. :vartype express_route_connections: list[~azure.mgmt.network.v2019_02_01.models.ExpressRouteConnection] - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState :param virtual_hub: Required. The Virtual Hub where the ExpressRoute gateway is or will be deployed. @@ -53,7 +53,6 @@ class ExpressRouteGateway(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, - 'provisioning_state': {'readonly': True}, 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -75,6 +74,6 @@ def __init__(self, **kwargs): super(ExpressRouteGateway, self).__init__(**kwargs) self.auto_scale_configuration = kwargs.get('auto_scale_configuration', None) self.express_route_connections = None - self.provisioning_state = None + self.provisioning_state = kwargs.get('provisioning_state', None) self.virtual_hub = kwargs.get('virtual_hub', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway_py3.py index d63683b9f520..225680810f53 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/express_route_gateway_py3.py @@ -37,9 +37,9 @@ class ExpressRouteGateway(Resource): ExpressRoute gateway. :vartype express_route_connections: list[~azure.mgmt.network.v2019_02_01.models.ExpressRouteConnection] - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState :param virtual_hub: Required. The Virtual Hub where the ExpressRoute gateway is or will be deployed. @@ -53,7 +53,6 @@ class ExpressRouteGateway(Resource): 'name': {'readonly': True}, 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, - 'provisioning_state': {'readonly': True}, 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -71,10 +70,10 @@ class ExpressRouteGateway(Resource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, virtual_hub, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, **kwargs) -> None: + def __init__(self, *, virtual_hub, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, provisioning_state=None, **kwargs) -> None: super(ExpressRouteGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) self.auto_scale_configuration = auto_scale_configuration self.express_route_connections = None - self.provisioning_state = None + self.provisioning_state = provisioning_state self.virtual_hub = virtual_hub self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration.py index ff01949f4ada..931e03190e53 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration.py @@ -39,8 +39,7 @@ class FrontendIPConfiguration(SubResource): :param private_ip_address: The private IP address of the IP configuration. :type private_ip_address: str :param private_ip_allocation_method: The Private IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration_py3.py index 8c7d3400dda8..9679a0e0f140 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/frontend_ip_configuration_py3.py @@ -39,8 +39,7 @@ class FrontendIPConfiguration(SubResource): :param private_ip_address: The private IP address of the IP configuration. :type private_ip_address: str :param private_ip_allocation_method: The Private IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration.py index f5d638f19f69..a1fbd3e7c36d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration.py @@ -19,9 +19,8 @@ class IPConfiguration(SubResource): :type id: str :param private_ip_address: The private IP address of the IP configuration. :type private_ip_address: str - :param private_ip_allocation_method: The private IP allocation method. - Possible values are 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP adress allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration_py3.py index 870b05fb8042..b9ec7f68065a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ip_configuration_py3.py @@ -19,9 +19,8 @@ class IPConfiguration(SubResource): :type id: str :param private_ip_address: The private IP address of the IP configuration. :type private_ip_address: str - :param private_ip_allocation_method: The private IP allocation method. - Possible values are 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP adress allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy.py index 8d5b0c23a133..556569c8ef61 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy.py @@ -45,11 +45,11 @@ class IpsecPolicy(Model): 'GCMAES128' :type ike_integrity: str or ~azure.mgmt.network.v2019_02_01.models.IkeIntegrity - :param dh_group: Required. The DH Groups used in IKE Phase 1 for initial + :param dh_group: Required. The DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24' :type dh_group: str or ~azure.mgmt.network.v2019_02_01.models.DhGroup - :param pfs_group: Required. The Pfs Groups used in IKE Phase 2 for new + :param pfs_group: Required. The Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM' :type pfs_group: str or ~azure.mgmt.network.v2019_02_01.models.PfsGroup diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy_py3.py index 8ee28c4fab2b..01ca9b86cbbf 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/ipsec_policy_py3.py @@ -45,11 +45,11 @@ class IpsecPolicy(Model): 'GCMAES128' :type ike_integrity: str or ~azure.mgmt.network.v2019_02_01.models.IkeIntegrity - :param dh_group: Required. The DH Groups used in IKE Phase 1 for initial + :param dh_group: Required. The DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24' :type dh_group: str or ~azure.mgmt.network.v2019_02_01.models.DhGroup - :param pfs_group: Required. The Pfs Groups used in IKE Phase 2 for new + :param pfs_group: Required. The Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM' :type pfs_group: str or ~azure.mgmt.network.v2019_02_01.models.PfsGroup diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile.py index 758314f37568..91f661fc5ff6 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile.py @@ -17,9 +17,8 @@ class NetworkConfigurationDiagnosticProfile(Model): All required parameters must be populated in order to send to Azure. - :param direction: Required. The direction of the traffic. Accepted values - are 'Inbound' and 'Outbound'. Possible values include: 'Inbound', - 'Outbound' + :param direction: Required. The direction of the traffic. Possible values + include: 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.Direction :param protocol: Required. Protocol to be verified on. Accepted values are '*', TCP, UDP. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile_py3.py index db0753cece4c..abd310b150a8 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_configuration_diagnostic_profile_py3.py @@ -17,9 +17,8 @@ class NetworkConfigurationDiagnosticProfile(Model): All required parameters must be populated in order to send to Azure. - :param direction: Required. The direction of the traffic. Accepted values - are 'Inbound' and 'Outbound'. Possible values include: 'Inbound', - 'Outbound' + :param direction: Required. The direction of the traffic. Possible values + include: 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.Direction :param protocol: Required. Protocol to be verified on. Accepted values are '*', TCP, UDP. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration.py index aa5fc5f1b9b6..a6a3fa1d83f6 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration.py @@ -34,15 +34,13 @@ class NetworkInterfaceIPConfiguration(SubResource): list[~azure.mgmt.network.v2019_02_01.models.InboundNatRule] :param private_ip_address: Private IP address of the IP configuration. :type private_ip_address: str - :param private_ip_allocation_method: Defines how a private IP address is - assigned. Possible values are: 'Static' and 'Dynamic'. Possible values - include: 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param private_ip_address_version: Available from Api-Version 2016-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or - IPv6. Default is taken as IPv4. Possible values are: 'IPv4' and 'IPv6'. - Possible values include: 'IPv4', 'IPv6' + IPv6. Default is taken as IPv4. Possible values include: 'IPv4', 'IPv6' :type private_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :param subnet: Subnet bound to the IP configuration. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration_py3.py index 8da0b009a593..bdf2fa35e88e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_interface_ip_configuration_py3.py @@ -34,15 +34,13 @@ class NetworkInterfaceIPConfiguration(SubResource): list[~azure.mgmt.network.v2019_02_01.models.InboundNatRule] :param private_ip_address: Private IP address of the IP configuration. :type private_ip_address: str - :param private_ip_allocation_method: Defines how a private IP address is - assigned. Possible values are: 'Static' and 'Dynamic'. Possible values - include: 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param private_ip_address_version: Available from Api-Version 2016-03-30 onwards, it represents whether the specific ipconfiguration is IPv4 or - IPv6. Default is taken as IPv4. Possible values are: 'IPv4' and 'IPv6'. - Possible values include: 'IPv4', 'IPv6' + IPv6. Default is taken as IPv4. Possible values include: 'IPv4', 'IPv6' :type private_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :param subnet: Subnet bound to the IP configuration. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_management_client_enums.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_management_client_enums.py index 8748d85ad98f..dc156dedb1c9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_management_client_enums.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_management_client_enums.py @@ -12,6 +12,12 @@ from enum import Enum +class ApplicationGatewayProtocol(str, Enum): + + http = "Http" + https = "Https" + + class IPAllocationMethod(str, Enum): static = "Static" @@ -73,12 +79,6 @@ class TransportProtocol(str, Enum): all = "All" -class ApplicationGatewayProtocol(str, Enum): - - http = "Http" - https = "Https" - - class ApplicationGatewayCookieBasedAffinity(str, Enum): enabled = "Enabled" @@ -385,6 +385,12 @@ class NetworkOperationStatus(str, Enum): failed = "Failed" +class AuthenticationMethod(str, Enum): + + eaptls = "EAPTLS" + eapmscha_pv2 = "EAPMSCHAPv2" + + class EffectiveSecurityRuleProtocol(str, Enum): tcp = "Tcp" @@ -688,12 +694,6 @@ class ProcessorArchitecture(str, Enum): x86 = "X86" -class AuthenticationMethod(str, Enum): - - eaptls = "EAPTLS" - eapmscha_pv2 = "EAPMSCHAPv2" - - class VirtualNetworkGatewayConnectionStatus(str, Enum): unknown = "Unknown" diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result.py index 2ece3269b892..90fed2476035 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result.py @@ -20,8 +20,7 @@ class NetworkSecurityGroupResult(Model): sending a request. :param security_rule_access_result: The network traffic is allowed or - denied. Possible values are 'Allow' and 'Deny'. Possible values include: - 'Allow', 'Deny' + denied. Possible values include: 'Allow', 'Deny' :type security_rule_access_result: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :ivar evaluated_network_security_groups: List of results network security diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result_py3.py index 60cef828b1f6..615b57c32cef 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_security_group_result_py3.py @@ -20,8 +20,7 @@ class NetworkSecurityGroupResult(Model): sending a request. :param security_rule_access_result: The network traffic is allowed or - denied. Possible values are 'Allow' and 'Deny'. Possible values include: - 'Allow', 'Deny' + denied. Possible values include: 'Allow', 'Deny' :type security_rule_access_result: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :ivar evaluated_network_security_groups: List of results network security diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher.py index 128f0ebc217e..07d6e17220ae 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher.py @@ -31,16 +31,15 @@ class NetworkWatcher(Resource): :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState """ _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, - 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -56,4 +55,4 @@ class NetworkWatcher(Resource): def __init__(self, **kwargs): super(NetworkWatcher, self).__init__(**kwargs) self.etag = kwargs.get('etag', None) - self.provisioning_state = None + self.provisioning_state = kwargs.get('provisioning_state', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher_py3.py index 5f3fd79fbd38..bb0664d36c96 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/network_watcher_py3.py @@ -31,16 +31,15 @@ class NetworkWatcher(Resource): :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str - :ivar provisioning_state: The provisioning state of the resource. Possible - values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' - :vartype provisioning_state: str or + :param provisioning_state: The provisioning state of the resource. + Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' + :type provisioning_state: str or ~azure.mgmt.network.v2019_02_01.models.ProvisioningState """ _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, - 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -53,7 +52,7 @@ class NetworkWatcher(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, etag: str=None, provisioning_state=None, **kwargs) -> None: super(NetworkWatcher, self).__init__(id=id, location=location, tags=tags, **kwargs) self.etag = etag - self.provisioning_state = None + self.provisioning_state = provisioning_state diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters.py index b05495345965..3044fc214aa0 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters.py @@ -15,9 +15,8 @@ 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' + :param authentication_method: VPN client authentication method. Possible + values include: 'EAPTLS', 'EAPMSCHAPv2' :type authentication_method: str or ~azure.mgmt.network.v2019_02_01.models.AuthenticationMethod """ diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters_py3.py index c9c032905fb9..16c60c13134c 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/p2_svpn_profile_parameters_py3.py @@ -15,9 +15,8 @@ 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' + :param authentication_method: VPN client authentication method. Possible + values include: 'EAPTLS', 'EAPMSCHAPv2' :type authentication_method: str or ~azure.mgmt.network.v2019_02_01.models.AuthenticationMethod """ diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule.py index ba0f63d0dc94..de5e5c11fd85 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule.py @@ -22,8 +22,8 @@ class PatchRouteFilterRule(SubResource): :param id: Resource ID. :type id: str - :param access: Required. The access type of the rule. Valid values are: - 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny' + :param access: Required. The access type of the rule. Possible values + include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.Access :ivar route_filter_rule_type: Required. The rule type of the rule. Valid value is: 'Community'. Default value: "Community" . diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule_py3.py index bd7ce69bbe57..06bedf8cab04 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/patch_route_filter_rule_py3.py @@ -22,8 +22,8 @@ class PatchRouteFilterRule(SubResource): :param id: Resource ID. :type id: str - :param access: Required. The access type of the rule. Valid values are: - 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny' + :param access: Required. The access type of the rule. Possible values + include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.Access :ivar route_filter_rule_type: Required. The rule type of the rule. Valid value is: 'Community'. Default value: "Community" . diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection.py index f9c845bcde67..4891261e902d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection.py @@ -32,10 +32,9 @@ class PeerExpressRouteCircuitConnection(SubResource): :param address_prefix: /29 IP address space to carve out Customer addresses for tunnels. :type address_prefix: str - :ivar circuit_connection_status: Express Route Circuit Connection State. - Possible values are: 'Connected' and 'Disconnected'. Possible values - include: 'Connected', 'Connecting', 'Disconnected' - :vartype circuit_connection_status: str or + :param circuit_connection_status: Express Route Circuit connection state. + Possible values include: 'Connected', 'Connecting', 'Disconnected' + :type circuit_connection_status: str or ~azure.mgmt.network.v2019_02_01.models.CircuitConnectionStatus :param connection_name: The name of the express route circuit connection resource. @@ -56,7 +55,6 @@ class PeerExpressRouteCircuitConnection(SubResource): """ _validation = { - 'circuit_connection_status': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'etag': {'readonly': True}, } @@ -79,7 +77,7 @@ def __init__(self, **kwargs): self.express_route_circuit_peering = kwargs.get('express_route_circuit_peering', None) self.peer_express_route_circuit_peering = kwargs.get('peer_express_route_circuit_peering', None) self.address_prefix = kwargs.get('address_prefix', None) - self.circuit_connection_status = None + self.circuit_connection_status = kwargs.get('circuit_connection_status', None) self.connection_name = kwargs.get('connection_name', None) self.auth_resource_guid = kwargs.get('auth_resource_guid', None) self.provisioning_state = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection_py3.py index 3752baf23cf3..4a14a6755721 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/peer_express_route_circuit_connection_py3.py @@ -32,10 +32,9 @@ class PeerExpressRouteCircuitConnection(SubResource): :param address_prefix: /29 IP address space to carve out Customer addresses for tunnels. :type address_prefix: str - :ivar circuit_connection_status: Express Route Circuit Connection State. - Possible values are: 'Connected' and 'Disconnected'. Possible values - include: 'Connected', 'Connecting', 'Disconnected' - :vartype circuit_connection_status: str or + :param circuit_connection_status: Express Route Circuit connection state. + Possible values include: 'Connected', 'Connecting', 'Disconnected' + :type circuit_connection_status: str or ~azure.mgmt.network.v2019_02_01.models.CircuitConnectionStatus :param connection_name: The name of the express route circuit connection resource. @@ -56,7 +55,6 @@ class PeerExpressRouteCircuitConnection(SubResource): """ _validation = { - 'circuit_connection_status': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'etag': {'readonly': True}, } @@ -74,12 +72,12 @@ class PeerExpressRouteCircuitConnection(SubResource): 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, express_route_circuit_peering=None, peer_express_route_circuit_peering=None, address_prefix: str=None, connection_name: str=None, auth_resource_guid: str=None, name: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, express_route_circuit_peering=None, peer_express_route_circuit_peering=None, address_prefix: str=None, circuit_connection_status=None, connection_name: str=None, auth_resource_guid: str=None, name: str=None, **kwargs) -> None: super(PeerExpressRouteCircuitConnection, self).__init__(id=id, **kwargs) self.express_route_circuit_peering = express_route_circuit_peering self.peer_express_route_circuit_peering = peer_express_route_circuit_peering self.address_prefix = address_prefix - self.circuit_connection_status = None + self.circuit_connection_status = circuit_connection_status self.connection_name = connection_name self.auth_resource_guid = auth_resource_guid self.provisioning_state = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address.py index 716403c4a44c..502847b029d9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address.py @@ -30,13 +30,12 @@ class PublicIPAddress(Resource): :type tags: dict[str, str] :param sku: The public IP address SKU. :type sku: ~azure.mgmt.network.v2019_02_01.models.PublicIPAddressSku - :param public_ip_allocation_method: The public IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param public_ip_allocation_method: The public IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type public_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param public_ip_address_version: The public IP address version. Possible - values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6' + values include: 'IPv4', 'IPv6' :type public_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :ivar ip_configuration: The IP configuration associated with the public IP diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address_py3.py index 5e8d133c246b..b6208a16496a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_address_py3.py @@ -30,13 +30,12 @@ class PublicIPAddress(Resource): :type tags: dict[str, str] :param sku: The public IP address SKU. :type sku: ~azure.mgmt.network.v2019_02_01.models.PublicIPAddressSku - :param public_ip_allocation_method: The public IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param public_ip_allocation_method: The public IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type public_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param public_ip_address_version: The public IP address version. Possible - values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6' + values include: 'IPv4', 'IPv6' :type public_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :ivar ip_configuration: The IP configuration associated with the public IP diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix.py index 71384d15089b..cbfb7d4e79b9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix.py @@ -31,7 +31,7 @@ class PublicIPPrefix(Resource): :param sku: The public IP prefix SKU. :type sku: ~azure.mgmt.network.v2019_02_01.models.PublicIPPrefixSku :param public_ip_address_version: The public IP address version. Possible - values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6' + values include: 'IPv4', 'IPv6' :type public_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :param ip_tags: The list of tags associated with the public IP prefix. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix_py3.py index 1c13f427fc96..861bacc69e93 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/public_ip_prefix_py3.py @@ -31,7 +31,7 @@ class PublicIPPrefix(Resource): :param sku: The public IP prefix SKU. :type sku: ~azure.mgmt.network.v2019_02_01.models.PublicIPPrefixSku :param public_ip_address_version: The public IP address version. Possible - values are: 'IPv4' and 'IPv6'. Possible values include: 'IPv4', 'IPv6' + values include: 'IPv4', 'IPv6' :type public_ip_address_version: str or ~azure.mgmt.network.v2019_02_01.models.IPVersion :param ip_tags: The list of tags associated with the public IP prefix. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route.py index 968d2792a9c4..d6d7675b364c 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route.py @@ -22,10 +22,8 @@ class Route(SubResource): :param address_prefix: The destination CIDR to which the route applies. :type address_prefix: str :param next_hop_type: Required. The type of Azure hop the packet should be - sent to. Possible values are: 'VirtualNetworkGateway', 'VnetLocal', - 'Internet', 'VirtualAppliance', and 'None'. Possible values include: - 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', - 'None' + sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', + 'Internet', 'VirtualAppliance', 'None' :type next_hop_type: str or ~azure.mgmt.network.v2019_02_01.models.RouteNextHopType :param next_hop_ip_address: The IP address packets should be forwarded to. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule.py index 4ca961cd52bc..5b7a8c511cd1 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule.py @@ -22,8 +22,8 @@ class RouteFilterRule(SubResource): :param id: Resource ID. :type id: str - :param access: Required. The access type of the rule. Valid values are: - 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny' + :param access: Required. The access type of the rule. Possible values + include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.Access :ivar route_filter_rule_type: Required. The rule type of the rule. Valid value is: 'Community'. Default value: "Community" . diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule_py3.py index d1606b4162e1..81c4a22726ca 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_filter_rule_py3.py @@ -22,8 +22,8 @@ class RouteFilterRule(SubResource): :param id: Resource ID. :type id: str - :param access: Required. The access type of the rule. Valid values are: - 'Allow', 'Deny'. Possible values include: 'Allow', 'Deny' + :param access: Required. The access type of the rule. Possible values + include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.Access :ivar route_filter_rule_type: Required. The rule type of the rule. Valid value is: 'Community'. Default value: "Community" . diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_py3.py index 483e79e5f364..9db25d85b049 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/route_py3.py @@ -22,10 +22,8 @@ class Route(SubResource): :param address_prefix: The destination CIDR to which the route applies. :type address_prefix: str :param next_hop_type: Required. The type of Azure hop the packet should be - sent to. Possible values are: 'VirtualNetworkGateway', 'VnetLocal', - 'Internet', 'VirtualAppliance', and 'None'. Possible values include: - 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', - 'None' + sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', + 'Internet', 'VirtualAppliance', 'None' :type next_hop_type: str or ~azure.mgmt.network.v2019_02_01.models.RouteNextHopType :param next_hop_ip_address: The IP address packets should be forwarded to. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule.py index 611bcc177faa..1eb5ea05ea43 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule.py @@ -61,8 +61,7 @@ class SecurityRule(SubResource): :param destination_port_ranges: The destination port ranges. :type destination_port_ranges: list[str] :param access: Required. The network traffic is allowed or denied. - Possible values are: 'Allow' and 'Deny'. Possible values include: 'Allow', - 'Deny' + Possible values include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :param priority: The priority of the rule. The value can be between 100 @@ -72,8 +71,7 @@ class SecurityRule(SubResource): :type priority: int :param direction: Required. The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. - Possible values are: 'Inbound' and 'Outbound'. Possible values include: - 'Inbound', 'Outbound' + Possible values include: 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleDirection :param provisioning_state: The provisioning state of the public IP diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule_py3.py index 134d19a675b4..4e3626fb4458 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/security_rule_py3.py @@ -61,8 +61,7 @@ class SecurityRule(SubResource): :param destination_port_ranges: The destination port ranges. :type destination_port_ranges: list[str] :param access: Required. The network traffic is allowed or denied. - Possible values are: 'Allow' and 'Deny'. Possible values include: 'Allow', - 'Deny' + Possible values include: 'Allow', 'Deny' :type access: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleAccess :param priority: The priority of the rule. The value can be between 100 @@ -72,8 +71,7 @@ class SecurityRule(SubResource): :type priority: int :param direction: Required. The direction of the rule. The direction specifies if rule will be evaluated on incoming or outgoing traffic. - Possible values are: 'Inbound' and 'Outbound'. Possible values include: - 'Inbound', 'Outbound' + Possible values include: 'Inbound', 'Outbound' :type direction: str or ~azure.mgmt.network.v2019_02_01.models.SecurityRuleDirection :param provisioning_state: The provisioning state of the public IP diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health.py index bbae62fd92e5..d178334576ad 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health.py @@ -20,7 +20,7 @@ class TunnelConnectionHealth(Model): :ivar tunnel: Tunnel name. :vartype tunnel: str - :ivar connection_status: Virtual network Gateway connection status. + :ivar connection_status: Virtual Network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected' :vartype connection_status: str or diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health_py3.py index f959d5e6d962..c37b3b97ccd2 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/tunnel_connection_health_py3.py @@ -20,7 +20,7 @@ class TunnelConnectionHealth(Model): :ivar tunnel: Tunnel name. :vartype tunnel: str - :ivar connection_status: Virtual network Gateway connection status. + :ivar connection_status: Virtual Network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected' :vartype connection_status: str or diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection.py index 996786ebcda2..8636232f6dd5 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection.py @@ -45,7 +45,6 @@ class VirtualNetworkGatewayConnection(Resource): :type local_network_gateway2: ~azure.mgmt.network.v2019_02_01.models.LocalNetworkGateway :param connection_type: Required. Gateway connection type. Possible values - are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionType @@ -57,10 +56,9 @@ class VirtualNetworkGatewayConnection(Resource): :type routing_weight: int :param shared_key: The IPSec shared key. :type shared_key: str - :ivar connection_status: Virtual network Gateway connection status. - Possible values are 'Unknown', 'Connecting', 'Connected' and - 'NotConnected'. Possible values include: 'Unknown', 'Connecting', - 'Connected', 'NotConnected' + :ivar connection_status: Virtual Network Gateway connection status. + Possible values include: 'Unknown', 'Connecting', 'Connected', + 'NotConnected' :vartype connection_status: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionStatus :ivar tunnel_connection_status: Collection of all tunnels' connection diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity.py index 7494e708291d..cda12c812eb2 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity.py @@ -45,7 +45,6 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): :type local_network_gateway2: ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkConnectionGatewayReference :param connection_type: Required. Gateway connection type. Possible values - are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionType @@ -57,10 +56,9 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): :type routing_weight: int :param shared_key: The IPSec shared key. :type shared_key: str - :ivar connection_status: Virtual network Gateway connection status. - Possible values are 'Unknown', 'Connecting', 'Connected' and - 'NotConnected'. Possible values include: 'Unknown', 'Connecting', - 'Connected', 'NotConnected' + :ivar connection_status: Virtual Network Gateway connection status. + Possible values include: 'Unknown', 'Connecting', 'Connected', + 'NotConnected' :vartype connection_status: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionStatus :ivar tunnel_connection_status: Collection of all tunnels' connection diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity_py3.py index add70b78a20e..b472446dd298 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_list_entity_py3.py @@ -45,7 +45,6 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): :type local_network_gateway2: ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkConnectionGatewayReference :param connection_type: Required. Gateway connection type. Possible values - are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionType @@ -57,10 +56,9 @@ class VirtualNetworkGatewayConnectionListEntity(Resource): :type routing_weight: int :param shared_key: The IPSec shared key. :type shared_key: str - :ivar connection_status: Virtual network Gateway connection status. - Possible values are 'Unknown', 'Connecting', 'Connected' and - 'NotConnected'. Possible values include: 'Unknown', 'Connecting', - 'Connected', 'NotConnected' + :ivar connection_status: Virtual Network Gateway connection status. + Possible values include: 'Unknown', 'Connecting', 'Connected', + 'NotConnected' :vartype connection_status: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionStatus :ivar tunnel_connection_status: Collection of all tunnels' connection diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_py3.py index ee4297b6b0fc..95a319d9f9e0 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_connection_py3.py @@ -45,7 +45,6 @@ class VirtualNetworkGatewayConnection(Resource): :type local_network_gateway2: ~azure.mgmt.network.v2019_02_01.models.LocalNetworkGateway :param connection_type: Required. Gateway connection type. Possible values - are: 'Ipsec','Vnet2Vnet','ExpressRoute', and 'VPNClient. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient' :type connection_type: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionType @@ -57,10 +56,9 @@ class VirtualNetworkGatewayConnection(Resource): :type routing_weight: int :param shared_key: The IPSec shared key. :type shared_key: str - :ivar connection_status: Virtual network Gateway connection status. - Possible values are 'Unknown', 'Connecting', 'Connected' and - 'NotConnected'. Possible values include: 'Unknown', 'Connecting', - 'Connected', 'NotConnected' + :ivar connection_status: Virtual Network Gateway connection status. + Possible values include: 'Unknown', 'Connecting', 'Connected', + 'NotConnected' :vartype connection_status: str or ~azure.mgmt.network.v2019_02_01.models.VirtualNetworkGatewayConnectionStatus :ivar tunnel_connection_status: Collection of all tunnels' connection diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration.py index 331b9c3adc67..1c10f7662b28 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration.py @@ -20,9 +20,8 @@ class VirtualNetworkGatewayIPConfiguration(SubResource): :param id: Resource ID. :type id: str - :param private_ip_allocation_method: The private IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration_py3.py index 8aaebf639dde..f9416a8346e4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_gateway_ip_configuration_py3.py @@ -20,9 +20,8 @@ class VirtualNetworkGatewayIPConfiguration(SubResource): :param id: Resource ID. :type id: str - :param private_ip_allocation_method: The private IP allocation method. - Possible values are: 'Static' and 'Dynamic'. Possible values include: - 'Static', 'Dynamic' + :param private_ip_allocation_method: The private IP address allocation + method. Possible values include: 'Static', 'Dynamic' :type private_ip_allocation_method: str or ~azure.mgmt.network.v2019_02_01.models.IPAllocationMethod :param subnet: The reference of the subnet resource. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering.py index f205a534f7d6..03873f91c65d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering.py @@ -17,12 +17,13 @@ class VirtualNetworkPeering(SubResource): :param id: Resource ID. :type id: str - :param allow_virtual_network_access: Whether the VMs in the linked virtual - network space would be able to access all the VMs in local Virtual network + :param allow_virtual_network_access: Whether the VMs in the local virtual + network space would be able to access the VMs in remote virtual network space. :type allow_virtual_network_access: bool :param allow_forwarded_traffic: Whether the forwarded traffic from the VMs - in the remote virtual network will be allowed/disallowed. + in the local virtual network will be allowed/disallowed in remote virtual + network. :type allow_forwarded_traffic: bool :param allow_gateway_transit: If gateway links can be used in remote virtual networking to link to this virtual network. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering_py3.py index 49643b7036f7..2a6e89247a59 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/virtual_network_peering_py3.py @@ -17,12 +17,13 @@ class VirtualNetworkPeering(SubResource): :param id: Resource ID. :type id: str - :param allow_virtual_network_access: Whether the VMs in the linked virtual - network space would be able to access all the VMs in local Virtual network + :param allow_virtual_network_access: Whether the VMs in the local virtual + network space would be able to access the VMs in remote virtual network space. :type allow_virtual_network_access: bool :param allow_forwarded_traffic: Whether the forwarded traffic from the VMs - in the remote virtual network will be allowed/disallowed. + in the local virtual network will be allowed/disallowed in remote virtual + network. :type allow_forwarded_traffic: bool :param allow_gateway_transit: If gateway links can be used in remote virtual networking to link to this virtual network. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters.py index b273539a8b00..2ac18babb840 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters.py @@ -43,11 +43,11 @@ class VpnClientIPsecParameters(Model): 'GCMAES128' :type ike_integrity: str or ~azure.mgmt.network.v2019_02_01.models.IkeIntegrity - :param dh_group: Required. The DH Groups used in IKE Phase 1 for initial + :param dh_group: Required. The DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24' :type dh_group: str or ~azure.mgmt.network.v2019_02_01.models.DhGroup - :param pfs_group: Required. The Pfs Groups used in IKE Phase 2 for new + :param pfs_group: Required. The Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM' :type pfs_group: str or ~azure.mgmt.network.v2019_02_01.models.PfsGroup diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters_py3.py index 4a37cef89f24..c93734193931 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_ipsec_parameters_py3.py @@ -43,11 +43,11 @@ class VpnClientIPsecParameters(Model): 'GCMAES128' :type ike_integrity: str or ~azure.mgmt.network.v2019_02_01.models.IkeIntegrity - :param dh_group: Required. The DH Groups used in IKE Phase 1 for initial + :param dh_group: Required. The DH Group used in IKE Phase 1 for initial SA. Possible values include: 'None', 'DHGroup1', 'DHGroup2', 'DHGroup14', 'DHGroup2048', 'ECP256', 'ECP384', 'DHGroup24' :type dh_group: str or ~azure.mgmt.network.v2019_02_01.models.DhGroup - :param pfs_group: Required. The Pfs Groups used in IKE Phase 2 for new + :param pfs_group: Required. The Pfs Group used in IKE Phase 2 for new child SA. Possible values include: 'None', 'PFS1', 'PFS2', 'PFS2048', 'ECP256', 'ECP384', 'PFS24', 'PFS14', 'PFSMM' :type pfs_group: str or ~azure.mgmt.network.v2019_02_01.models.PfsGroup diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters.py index 2630695566a7..5a060557a3a9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters.py @@ -19,9 +19,8 @@ class VpnClientParameters(Model): values are: 'AMD64' and 'X86'. Possible values include: 'Amd64', 'X86' :type processor_architecture: str or ~azure.mgmt.network.v2019_02_01.models.ProcessorArchitecture - :param authentication_method: VPN client Authentication Method. Possible - values are: 'EAPTLS' and 'EAPMSCHAPv2'. Possible values include: 'EAPTLS', - 'EAPMSCHAPv2' + :param authentication_method: VPN client authentication method. Possible + values include: 'EAPTLS', 'EAPMSCHAPv2' :type authentication_method: str or ~azure.mgmt.network.v2019_02_01.models.AuthenticationMethod :param radius_server_auth_certificate: The public certificate data for the diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters_py3.py index 89f88a316685..4239fe8416f0 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_client_parameters_py3.py @@ -19,9 +19,8 @@ class VpnClientParameters(Model): values are: 'AMD64' and 'X86'. Possible values include: 'Amd64', 'X86' :type processor_architecture: str or ~azure.mgmt.network.v2019_02_01.models.ProcessorArchitecture - :param authentication_method: VPN client Authentication Method. Possible - values are: 'EAPTLS' and 'EAPMSCHAPv2'. Possible values include: 'EAPTLS', - 'EAPMSCHAPv2' + :param authentication_method: VPN client authentication method. Possible + values include: 'EAPTLS', 'EAPMSCHAPv2' :type authentication_method: str or ~azure.mgmt.network.v2019_02_01.models.AuthenticationMethod :param radius_server_auth_certificate: The public certificate data for the diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection.py index 2be27718772f..8db4f14440bb 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection.py @@ -50,6 +50,9 @@ class VpnConnection(SubResource): :type enable_rate_limiting: bool :param enable_internet_security: Enable internet security :type enable_internet_security: bool + :param use_local_azure_ip_address: Use local azure ip to initiate + connection + :type use_local_azure_ip_address: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -82,6 +85,7 @@ class VpnConnection(SubResource): 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, 'enable_rate_limiting': {'key': 'properties.enableRateLimiting', 'type': 'bool'}, 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, + 'use_local_azure_ip_address': {'key': 'properties.useLocalAzureIpAddress', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, @@ -101,6 +105,7 @@ def __init__(self, **kwargs): 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.use_local_azure_ip_address = kwargs.get('use_local_azure_ip_address', 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/v2019_02_01/models/vpn_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection_py3.py index a1285baeea48..26ff43fae326 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/models/vpn_connection_py3.py @@ -50,6 +50,9 @@ class VpnConnection(SubResource): :type enable_rate_limiting: bool :param enable_internet_security: Enable internet security :type enable_internet_security: bool + :param use_local_azure_ip_address: Use local azure ip to initiate + connection + :type use_local_azure_ip_address: bool :param provisioning_state: The provisioning state of the resource. Possible values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :type provisioning_state: str or @@ -82,12 +85,13 @@ class VpnConnection(SubResource): 'ipsec_policies': {'key': 'properties.ipsecPolicies', 'type': '[IpsecPolicy]'}, 'enable_rate_limiting': {'key': 'properties.enableRateLimiting', 'type': 'bool'}, 'enable_internet_security': {'key': 'properties.enableInternetSecurity', 'type': 'bool'}, + 'use_local_azure_ip_address': {'key': 'properties.useLocalAzureIpAddress', '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, 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: + 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, use_local_azure_ip_address: 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 @@ -101,6 +105,7 @@ def __init__(self, *, id: str=None, remote_vpn_site=None, routing_weight: int=No self.ipsec_policies = ipsec_policies self.enable_rate_limiting = enable_rate_limiting self.enable_internet_security = enable_internet_security + self.use_local_azure_ip_address = use_local_azure_ip_address self.provisioning_state = provisioning_state self.name = name self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/application_gateways_operations.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/application_gateways_operations.py index 84bbc7ef6841..3a802c9f1f47 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/application_gateways_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/application_gateways_operations.py @@ -776,6 +776,116 @@ def get_long_running_output(response): return LROPoller(self._client, raw_result, get_long_running_output, polling_method) backend_health.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendhealth'} + + def _backend_health_on_demand_initial( + self, resource_group_name, application_gateway_name, probe_request, expand=None, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.backend_health_on_demand.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'applicationGatewayName': self._serialize.url("application_gateway_name", application_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') + if expand is not None: + query_parameters['$expand'] = self._serialize.query("expand", expand, '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(probe_request, 'ApplicationGatewayOnDemandProbe') + + # 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('ApplicationGatewayBackendHealthOnDemand', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def backend_health_on_demand( + self, resource_group_name, application_gateway_name, probe_request, expand=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Gets the backend health for given combination of backend pool and http + setting of the specified application gateway in a resource group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param application_gateway_name: The name of the application gateway. + :type application_gateway_name: str + :param probe_request: Request body for on-demand test probe operation. + :type probe_request: + ~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayOnDemandProbe + :param expand: Expands BackendAddressPool and BackendHttpSettings + referenced in backend health. + :type expand: 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 + ApplicationGatewayBackendHealthOnDemand or + ClientRawResponse if + raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendHealthOnDemand] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2019_02_01.models.ApplicationGatewayBackendHealthOnDemand]] + :raises: :class:`CloudError` + """ + raw_result = self._backend_health_on_demand_initial( + resource_group_name=resource_group_name, + application_gateway_name=application_gateway_name, + probe_request=probe_request, + expand=expand, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('ApplicationGatewayBackendHealthOnDemand', 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, lro_options={'final-state-via': 'location'}, **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) + backend_health_on_demand.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/getBackendHealthOnDemand'} + def list_available_server_variables( self, custom_headers=None, raw=False, **operation_config): """Lists all available server variables. diff --git a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/p2s_vpn_gateways_operations.py b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/p2s_vpn_gateways_operations.py index 9ad7d4b1550e..2d5d4966d621 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/p2s_vpn_gateways_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2019_02_01/operations/p2s_vpn_gateways_operations.py @@ -580,9 +580,8 @@ def generate_vpn_profile( :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' + :param authentication_method: VPN client authentication method. + Possible values include: 'EAPTLS', 'EAPMSCHAPv2' :type authentication_method: str or ~azure.mgmt.network.v2019_02_01.models.AuthenticationMethod :param dict custom_headers: headers that will be added to the request