From c54b9a35abf7818d827ede23b36e3e462d4126c4 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 1 Nov 2018 09:58:21 -0700 Subject: [PATCH] [AutoPR network/resource-manager] Move parameter to keep order in SDK (#3731) * Generated from 911ebf46a4a178cdcc6aaa9695f6792f4c64ab89 Move parameter to keep order in SDK * Packaging update of azure-mgmt-network --- azure-mgmt-network/MANIFEST.in | 3 + .../mgmt/network/network_management_client.py | 52 ++ .../network/v2018_08_01/models/__init__.py | 42 +- .../v2018_08_01/models/application_gateway.py | 6 + .../application_gateway_custom_error.py | 35 ++ .../application_gateway_custom_error_py3.py | 35 ++ .../application_gateway_firewall_exclusion.py | 48 ++ ...lication_gateway_firewall_exclusion_py3.py | 48 ++ .../application_gateway_http_listener.py | 6 + .../application_gateway_http_listener_py3.py | 8 +- .../models/application_gateway_py3.py | 8 +- ..._web_application_firewall_configuration.py | 16 + ..._application_firewall_configuration_py3.py | 18 +- .../evaluated_network_security_group.py | 5 + .../evaluated_network_security_group_py3.py | 7 +- .../models/express_route_circuit.py | 17 + .../models/express_route_circuit_py3.py | 19 +- .../models/express_route_circuit_sku.py | 5 +- .../models/express_route_circuit_sku_py3.py | 5 +- .../v2018_08_01/models/express_route_link.py | 86 +++ .../models/express_route_link_paged.py | 27 + .../models/express_route_link_py3.py | 86 +++ .../v2018_08_01/models/express_route_port.py | 116 ++++ .../models/express_route_port_paged.py | 27 + .../models/express_route_port_py3.py | 116 ++++ .../models/express_route_ports_location.py | 72 +++ ...express_route_ports_location_bandwidths.py | 42 ++ ...ess_route_ports_location_bandwidths_py3.py | 42 ++ .../express_route_ports_location_paged.py | 27 + .../express_route_ports_location_py3.py | 72 +++ ...ork_configuration_diagnostic_parameters.py | 18 +- ...configuration_diagnostic_parameters_py3.py | 20 +- ...twork_configuration_diagnostic_profile.py} | 4 +- ...k_configuration_diagnostic_profile_py3.py} | 4 +- ...network_configuration_diagnostic_result.py | 9 +- ...ork_configuration_diagnostic_result_py3.py | 11 +- .../models/network_management_client_enums.py | 33 ++ .../v2018_08_01/models/outbound_rule_paged.py | 27 + .../v2018_08_01/network_management_client.py | 20 + .../v2018_08_01/operations/__init__.py | 8 + .../express_route_links_operations.py | 176 ++++++ ...xpress_route_ports_locations_operations.py | 166 ++++++ .../express_route_ports_operations.py | 522 ++++++++++++++++++ ...load_balancer_outbound_rules_operations.py | 173 ++++++ .../operations/network_watchers_operations.py | 19 +- .../operations/virtual_networks_operations.py | 5 +- 46 files changed, 2259 insertions(+), 52 deletions(-) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_paged.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_paged.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_paged.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_py3.py rename azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/{traffic_query.py => network_configuration_diagnostic_profile.py} (94%) rename azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/{traffic_query_py3.py => network_configuration_diagnostic_profile_py3.py} (94%) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/outbound_rule_paged.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_links_operations.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_locations_operations.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_operations.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/load_balancer_outbound_rules_operations.py diff --git a/azure-mgmt-network/MANIFEST.in b/azure-mgmt-network/MANIFEST.in index bb37a2723dae..6ceb27f7a96e 100644 --- a/azure-mgmt-network/MANIFEST.in +++ b/azure-mgmt-network/MANIFEST.in @@ -1 +1,4 @@ include *.rst +include azure/__init__.py +include azure/mgmt/__init__.py + diff --git a/azure-mgmt-network/azure/mgmt/network/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/network_management_client.py index 1d13d18293f8..4693a070b758 100644 --- a/azure-mgmt-network/azure/mgmt/network/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/network_management_client.py @@ -848,6 +848,45 @@ def express_route_gateways(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def express_route_links(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`ExpressRouteLinksOperations` + """ + api_version = self._get_api_version('express_route_links') + if api_version == '2018-08-01': + from .v2018_08_01.operations import ExpressRouteLinksOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + @property + def express_route_ports(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`ExpressRoutePortsOperations` + """ + api_version = self._get_api_version('express_route_ports') + if api_version == '2018-08-01': + from .v2018_08_01.operations import ExpressRoutePortsOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + + @property + def express_route_ports_locations(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`ExpressRoutePortsLocationsOperations` + """ + api_version = self._get_api_version('express_route_ports_locations') + if api_version == '2018-08-01': + from .v2018_08_01.operations import ExpressRoutePortsLocationsOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property def express_route_service_providers(self): """Instance depends on the API version: @@ -1153,6 +1192,19 @@ def load_balancer_network_interfaces(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def load_balancer_outbound_rules(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`LoadBalancerOutboundRulesOperations` + """ + api_version = self._get_api_version('load_balancer_outbound_rules') + if api_version == '2018-08-01': + from .v2018_08_01.operations import LoadBalancerOutboundRulesOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property def load_balancer_probes(self): """Instance depends on the API version: diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index 4c5a7e5cb869..7686c7a4d438 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -55,6 +55,7 @@ from .application_gateway_ssl_certificate_py3 import ApplicationGatewaySslCertificate from .application_gateway_frontend_ip_configuration_py3 import ApplicationGatewayFrontendIPConfiguration from .application_gateway_frontend_port_py3 import ApplicationGatewayFrontendPort + 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 @@ -63,6 +64,7 @@ from .application_gateway_redirect_configuration_py3 import ApplicationGatewayRedirectConfiguration from .application_gateway_url_path_map_py3 import ApplicationGatewayUrlPathMap from .application_gateway_firewall_disabled_rule_group_py3 import ApplicationGatewayFirewallDisabledRuleGroup + from .application_gateway_firewall_exclusion_py3 import ApplicationGatewayFirewallExclusion from .application_gateway_web_application_firewall_configuration_py3 import ApplicationGatewayWebApplicationFirewallConfiguration from .application_gateway_autoscale_configuration_py3 import ApplicationGatewayAutoscaleConfiguration from .application_gateway_py3 import ApplicationGateway @@ -123,6 +125,10 @@ from .express_route_gateway_py3 import ExpressRouteGateway from .express_route_gateway_list_py3 import ExpressRouteGatewayList from .express_route_connection_list_py3 import ExpressRouteConnectionList + from .express_route_ports_location_bandwidths_py3 import ExpressRoutePortsLocationBandwidths + from .express_route_ports_location_py3 import ExpressRoutePortsLocation + from .express_route_link_py3 import ExpressRouteLink + from .express_route_port_py3 import ExpressRoutePort from .load_balancer_sku_py3 import LoadBalancerSku from .load_balancing_rule_py3 import LoadBalancingRule from .probe_py3 import Probe @@ -201,7 +207,7 @@ from .connection_monitor_result_py3 import ConnectionMonitorResult from .connection_state_snapshot_py3 import ConnectionStateSnapshot from .connection_monitor_query_result_py3 import ConnectionMonitorQueryResult - from .traffic_query_py3 import TrafficQuery + from .network_configuration_diagnostic_profile_py3 import NetworkConfigurationDiagnosticProfile from .network_configuration_diagnostic_parameters_py3 import NetworkConfigurationDiagnosticParameters from .matched_rule_py3 import MatchedRule from .network_security_rules_evaluation_result_py3 import NetworkSecurityRulesEvaluationResult @@ -322,6 +328,7 @@ from .application_gateway_ssl_certificate import ApplicationGatewaySslCertificate from .application_gateway_frontend_ip_configuration import ApplicationGatewayFrontendIPConfiguration from .application_gateway_frontend_port import ApplicationGatewayFrontendPort + 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 @@ -330,6 +337,7 @@ from .application_gateway_redirect_configuration import ApplicationGatewayRedirectConfiguration from .application_gateway_url_path_map import ApplicationGatewayUrlPathMap from .application_gateway_firewall_disabled_rule_group import ApplicationGatewayFirewallDisabledRuleGroup + from .application_gateway_firewall_exclusion import ApplicationGatewayFirewallExclusion from .application_gateway_web_application_firewall_configuration import ApplicationGatewayWebApplicationFirewallConfiguration from .application_gateway_autoscale_configuration import ApplicationGatewayAutoscaleConfiguration from .application_gateway import ApplicationGateway @@ -390,6 +398,10 @@ from .express_route_gateway import ExpressRouteGateway from .express_route_gateway_list import ExpressRouteGatewayList from .express_route_connection_list import ExpressRouteConnectionList + from .express_route_ports_location_bandwidths import ExpressRoutePortsLocationBandwidths + from .express_route_ports_location import ExpressRoutePortsLocation + from .express_route_link import ExpressRouteLink + from .express_route_port import ExpressRoutePort from .load_balancer_sku import LoadBalancerSku from .load_balancing_rule import LoadBalancingRule from .probe import Probe @@ -468,7 +480,7 @@ from .connection_monitor_result import ConnectionMonitorResult from .connection_state_snapshot import ConnectionStateSnapshot from .connection_monitor_query_result import ConnectionMonitorQueryResult - from .traffic_query import TrafficQuery + from .network_configuration_diagnostic_profile import NetworkConfigurationDiagnosticProfile from .network_configuration_diagnostic_parameters import NetworkConfigurationDiagnosticParameters from .matched_rule import MatchedRule from .network_security_rules_evaluation_result import NetworkSecurityRulesEvaluationResult @@ -557,12 +569,16 @@ from .express_route_service_provider_paged import ExpressRouteServiceProviderPaged from .express_route_cross_connection_paged import ExpressRouteCrossConnectionPaged from .express_route_cross_connection_peering_paged import ExpressRouteCrossConnectionPeeringPaged +from .express_route_ports_location_paged import ExpressRoutePortsLocationPaged +from .express_route_port_paged import ExpressRoutePortPaged +from .express_route_link_paged import ExpressRouteLinkPaged from .interface_endpoint_paged import InterfaceEndpointPaged from .load_balancer_paged import LoadBalancerPaged from .backend_address_pool_paged import BackendAddressPoolPaged from .frontend_ip_configuration_paged import FrontendIPConfigurationPaged from .inbound_nat_rule_paged import InboundNatRulePaged from .load_balancing_rule_paged import LoadBalancingRulePaged +from .outbound_rule_paged import OutboundRulePaged from .network_interface_paged import NetworkInterfacePaged from .probe_paged import ProbePaged from .network_interface_ip_configuration_paged import NetworkInterfaceIPConfigurationPaged @@ -619,6 +635,7 @@ ApplicationGatewaySslPolicyType, ApplicationGatewaySslPolicyName, ApplicationGatewaySslCipherSuite, + ApplicationGatewayCustomErrorStatusCode, ApplicationGatewayRequestRoutingRuleType, ApplicationGatewayRedirectType, ApplicationGatewayOperationalState, @@ -638,6 +655,9 @@ ExpressRouteCircuitSkuTier, ExpressRouteCircuitSkuFamily, ServiceProviderProvisioningState, + ExpressRouteLinkConnectorType, + ExpressRouteLinkAdminState, + ExpressRoutePortsEncapsulation, LoadBalancerSkuName, LoadDistribution, ProbeProtocol, @@ -661,6 +681,7 @@ ConnectionMonitorSourceStatus, ConnectionState, EvaluationState, + VerbosityLevel, PublicIPPrefixSkuName, VirtualNetworkPeeringState, VirtualNetworkGatewayType, @@ -734,6 +755,7 @@ 'ApplicationGatewaySslCertificate', 'ApplicationGatewayFrontendIPConfiguration', 'ApplicationGatewayFrontendPort', + 'ApplicationGatewayCustomError', 'ApplicationGatewayHttpListener', 'ApplicationGatewayPathRule', 'ApplicationGatewayProbeHealthResponseMatch', @@ -742,6 +764,7 @@ 'ApplicationGatewayRedirectConfiguration', 'ApplicationGatewayUrlPathMap', 'ApplicationGatewayFirewallDisabledRuleGroup', + 'ApplicationGatewayFirewallExclusion', 'ApplicationGatewayWebApplicationFirewallConfiguration', 'ApplicationGatewayAutoscaleConfiguration', 'ApplicationGateway', @@ -802,6 +825,10 @@ 'ExpressRouteGateway', 'ExpressRouteGatewayList', 'ExpressRouteConnectionList', + 'ExpressRoutePortsLocationBandwidths', + 'ExpressRoutePortsLocation', + 'ExpressRouteLink', + 'ExpressRoutePort', 'LoadBalancerSku', 'LoadBalancingRule', 'Probe', @@ -880,7 +907,7 @@ 'ConnectionMonitorResult', 'ConnectionStateSnapshot', 'ConnectionMonitorQueryResult', - 'TrafficQuery', + 'NetworkConfigurationDiagnosticProfile', 'NetworkConfigurationDiagnosticParameters', 'MatchedRule', 'NetworkSecurityRulesEvaluationResult', @@ -969,12 +996,16 @@ 'ExpressRouteServiceProviderPaged', 'ExpressRouteCrossConnectionPaged', 'ExpressRouteCrossConnectionPeeringPaged', + 'ExpressRoutePortsLocationPaged', + 'ExpressRoutePortPaged', + 'ExpressRouteLinkPaged', 'InterfaceEndpointPaged', 'LoadBalancerPaged', 'BackendAddressPoolPaged', 'FrontendIPConfigurationPaged', 'InboundNatRulePaged', 'LoadBalancingRulePaged', + 'OutboundRulePaged', 'NetworkInterfacePaged', 'ProbePaged', 'NetworkInterfaceIPConfigurationPaged', @@ -1030,6 +1061,7 @@ 'ApplicationGatewaySslPolicyType', 'ApplicationGatewaySslPolicyName', 'ApplicationGatewaySslCipherSuite', + 'ApplicationGatewayCustomErrorStatusCode', 'ApplicationGatewayRequestRoutingRuleType', 'ApplicationGatewayRedirectType', 'ApplicationGatewayOperationalState', @@ -1049,6 +1081,9 @@ 'ExpressRouteCircuitSkuTier', 'ExpressRouteCircuitSkuFamily', 'ServiceProviderProvisioningState', + 'ExpressRouteLinkConnectorType', + 'ExpressRouteLinkAdminState', + 'ExpressRoutePortsEncapsulation', 'LoadBalancerSkuName', 'LoadDistribution', 'ProbeProtocol', @@ -1072,6 +1107,7 @@ 'ConnectionMonitorSourceStatus', 'ConnectionState', 'EvaluationState', + 'VerbosityLevel', 'PublicIPPrefixSkuName', 'VirtualNetworkPeeringState', 'VirtualNetworkGatewayType', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway.py index b0e63598a14d..4f104e2e4f1f 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway.py @@ -105,6 +105,10 @@ class ApplicationGateway(Resource): :param provisioning_state: Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str + :param custom_error_configurations: Custom error configurations of the + application gateway resource. + :type custom_error_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomError] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -147,6 +151,7 @@ class ApplicationGateway(Resource): 'autoscale_configuration': {'key': 'properties.autoscaleConfiguration', 'type': 'ApplicationGatewayAutoscaleConfiguration'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'custom_error_configurations': {'key': 'properties.customErrorConfigurations', 'type': '[ApplicationGatewayCustomError]'}, 'etag': {'key': 'etag', 'type': 'str'}, 'zones': {'key': 'zones', 'type': '[str]'}, } @@ -175,5 +180,6 @@ def __init__(self, **kwargs): self.autoscale_configuration = kwargs.get('autoscale_configuration', None) self.resource_guid = kwargs.get('resource_guid', None) self.provisioning_state = kwargs.get('provisioning_state', None) + self.custom_error_configurations = kwargs.get('custom_error_configurations', None) self.etag = kwargs.get('etag', None) self.zones = kwargs.get('zones', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error.py new file mode 100644 index 000000000000..da1da7a67bef --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error.py @@ -0,0 +1,35 @@ +# 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 ApplicationGatewayCustomError(Model): + """Customer error of an application gateway. + + :param status_code: Status code of the application gateway customer error. + Possible values include: 'HttpStatus403', 'HttpStatus502' + :type status_code: str or + ~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomErrorStatusCode + :param custom_error_page_url: Error page URL of the application gateway + customer error. + :type custom_error_page_url: str + """ + + _attribute_map = { + 'status_code': {'key': 'statusCode', 'type': 'str'}, + 'custom_error_page_url': {'key': 'customErrorPageUrl', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ApplicationGatewayCustomError, self).__init__(**kwargs) + self.status_code = kwargs.get('status_code', None) + self.custom_error_page_url = kwargs.get('custom_error_page_url', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error_py3.py new file mode 100644 index 000000000000..adc214f5265c --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_custom_error_py3.py @@ -0,0 +1,35 @@ +# 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 ApplicationGatewayCustomError(Model): + """Customer error of an application gateway. + + :param status_code: Status code of the application gateway customer error. + Possible values include: 'HttpStatus403', 'HttpStatus502' + :type status_code: str or + ~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomErrorStatusCode + :param custom_error_page_url: Error page URL of the application gateway + customer error. + :type custom_error_page_url: str + """ + + _attribute_map = { + 'status_code': {'key': 'statusCode', 'type': 'str'}, + 'custom_error_page_url': {'key': 'customErrorPageUrl', 'type': 'str'}, + } + + def __init__(self, *, status_code=None, custom_error_page_url: str=None, **kwargs) -> None: + super(ApplicationGatewayCustomError, self).__init__(**kwargs) + self.status_code = status_code + self.custom_error_page_url = custom_error_page_url diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion.py new file mode 100644 index 000000000000..93de07754023 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion.py @@ -0,0 +1,48 @@ +# 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 ApplicationGatewayFirewallExclusion(Model): + """Allow to exclude some variable satisfy the condition for the WAF check. + + All required parameters must be populated in order to send to Azure. + + :param match_variable: Required. The variable to be excluded. + :type match_variable: str + :param selector_match_operator: Required. When matchVariable is a + collection, operate on the selector to specify which elements in the + collection this exclusion applies to. + :type selector_match_operator: str + :param selector: Required. When matchVariable is a collection, operator + used to specify which elements in the collection this exclusion applies + to. + :type selector: str + """ + + _validation = { + 'match_variable': {'required': True}, + 'selector_match_operator': {'required': True}, + 'selector': {'required': True}, + } + + _attribute_map = { + 'match_variable': {'key': 'matchVariable', 'type': 'str'}, + 'selector_match_operator': {'key': 'selectorMatchOperator', 'type': 'str'}, + 'selector': {'key': 'selector', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ApplicationGatewayFirewallExclusion, self).__init__(**kwargs) + self.match_variable = kwargs.get('match_variable', None) + self.selector_match_operator = kwargs.get('selector_match_operator', None) + self.selector = kwargs.get('selector', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion_py3.py new file mode 100644 index 000000000000..75fa2cdbcf29 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_firewall_exclusion_py3.py @@ -0,0 +1,48 @@ +# 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 ApplicationGatewayFirewallExclusion(Model): + """Allow to exclude some variable satisfy the condition for the WAF check. + + All required parameters must be populated in order to send to Azure. + + :param match_variable: Required. The variable to be excluded. + :type match_variable: str + :param selector_match_operator: Required. When matchVariable is a + collection, operate on the selector to specify which elements in the + collection this exclusion applies to. + :type selector_match_operator: str + :param selector: Required. When matchVariable is a collection, operator + used to specify which elements in the collection this exclusion applies + to. + :type selector: str + """ + + _validation = { + 'match_variable': {'required': True}, + 'selector_match_operator': {'required': True}, + 'selector': {'required': True}, + } + + _attribute_map = { + 'match_variable': {'key': 'matchVariable', 'type': 'str'}, + 'selector_match_operator': {'key': 'selectorMatchOperator', 'type': 'str'}, + 'selector': {'key': 'selector', 'type': 'str'}, + } + + def __init__(self, *, match_variable: str, selector_match_operator: str, selector: str, **kwargs) -> None: + super(ApplicationGatewayFirewallExclusion, self).__init__(**kwargs) + self.match_variable = match_variable + self.selector_match_operator = selector_match_operator + self.selector = selector diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener.py index 76292850ac5b..7169600bb488 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener.py @@ -38,6 +38,10 @@ class ApplicationGatewayHttpListener(SubResource): :param provisioning_state: Provisioning state of the HTTP listener resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str + :param custom_error_configurations: Custom error configurations of the + HTTP listener. + :type custom_error_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomError] :param name: Name of the HTTP listener that is unique within an Application Gateway. :type name: str @@ -57,6 +61,7 @@ class ApplicationGatewayHttpListener(SubResource): 'ssl_certificate': {'key': 'properties.sslCertificate', 'type': 'SubResource'}, 'require_server_name_indication': {'key': 'properties.requireServerNameIndication', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'custom_error_configurations': {'key': 'properties.customErrorConfigurations', 'type': '[ApplicationGatewayCustomError]'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, @@ -71,6 +76,7 @@ def __init__(self, **kwargs): self.ssl_certificate = kwargs.get('ssl_certificate', None) self.require_server_name_indication = kwargs.get('require_server_name_indication', None) self.provisioning_state = kwargs.get('provisioning_state', None) + self.custom_error_configurations = kwargs.get('custom_error_configurations', None) self.name = kwargs.get('name', None) self.etag = kwargs.get('etag', None) self.type = kwargs.get('type', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener_py3.py index 3961fb7637d7..683d784d5f82 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_http_listener_py3.py @@ -38,6 +38,10 @@ class ApplicationGatewayHttpListener(SubResource): :param provisioning_state: Provisioning state of the HTTP listener resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str + :param custom_error_configurations: Custom error configurations of the + HTTP listener. + :type custom_error_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomError] :param name: Name of the HTTP listener that is unique within an Application Gateway. :type name: str @@ -57,12 +61,13 @@ class ApplicationGatewayHttpListener(SubResource): 'ssl_certificate': {'key': 'properties.sslCertificate', 'type': 'SubResource'}, 'require_server_name_indication': {'key': 'properties.requireServerNameIndication', 'type': 'bool'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'custom_error_configurations': {'key': 'properties.customErrorConfigurations', 'type': '[ApplicationGatewayCustomError]'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, } - def __init__(self, *, id: str=None, frontend_ip_configuration=None, frontend_port=None, protocol=None, host_name: str=None, ssl_certificate=None, require_server_name_indication: bool=None, provisioning_state: str=None, name: str=None, etag: str=None, type: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, frontend_ip_configuration=None, frontend_port=None, protocol=None, host_name: str=None, ssl_certificate=None, require_server_name_indication: bool=None, provisioning_state: str=None, custom_error_configurations=None, name: str=None, etag: str=None, type: str=None, **kwargs) -> None: super(ApplicationGatewayHttpListener, self).__init__(id=id, **kwargs) self.frontend_ip_configuration = frontend_ip_configuration self.frontend_port = frontend_port @@ -71,6 +76,7 @@ def __init__(self, *, id: str=None, frontend_ip_configuration=None, frontend_por self.ssl_certificate = ssl_certificate self.require_server_name_indication = require_server_name_indication self.provisioning_state = provisioning_state + self.custom_error_configurations = custom_error_configurations self.name = name self.etag = etag self.type = type diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_py3.py index 894aae564b12..767732d47c70 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_py3.py @@ -105,6 +105,10 @@ class ApplicationGateway(Resource): :param provisioning_state: Provisioning state of the application gateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str + :param custom_error_configurations: Custom error configurations of the + application gateway resource. + :type custom_error_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayCustomError] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -147,11 +151,12 @@ class ApplicationGateway(Resource): 'autoscale_configuration': {'key': 'properties.autoscaleConfiguration', 'type': 'ApplicationGatewayAutoscaleConfiguration'}, 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'custom_error_configurations': {'key': 'properties.customErrorConfigurations', 'type': '[ApplicationGatewayCustomError]'}, 'etag': {'key': 'etag', 'type': 'str'}, 'zones': {'key': 'zones', 'type': '[str]'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, ssl_policy=None, gateway_ip_configurations=None, authentication_certificates=None, trusted_root_certificates=None, ssl_certificates=None, frontend_ip_configurations=None, frontend_ports=None, probes=None, backend_address_pools=None, backend_http_settings_collection=None, http_listeners=None, url_path_maps=None, request_routing_rules=None, redirect_configurations=None, web_application_firewall_configuration=None, enable_http2: bool=None, enable_fips: bool=None, autoscale_configuration=None, resource_guid: str=None, provisioning_state: str=None, etag: str=None, zones=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, ssl_policy=None, gateway_ip_configurations=None, authentication_certificates=None, trusted_root_certificates=None, ssl_certificates=None, frontend_ip_configurations=None, frontend_ports=None, probes=None, backend_address_pools=None, backend_http_settings_collection=None, http_listeners=None, url_path_maps=None, request_routing_rules=None, redirect_configurations=None, web_application_firewall_configuration=None, enable_http2: bool=None, enable_fips: bool=None, autoscale_configuration=None, resource_guid: str=None, provisioning_state: str=None, custom_error_configurations=None, etag: str=None, zones=None, **kwargs) -> None: super(ApplicationGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) self.sku = sku self.ssl_policy = ssl_policy @@ -175,5 +180,6 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, ssl self.autoscale_configuration = autoscale_configuration self.resource_guid = resource_guid self.provisioning_state = provisioning_state + self.custom_error_configurations = custom_error_configurations self.etag = etag self.zones = zones diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration.py index 4658d15fc1cb..155dc452de99 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration.py @@ -36,6 +36,14 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): :type request_body_check: bool :param max_request_body_size: Maxium request body size for WAF. :type max_request_body_size: int + :param max_request_body_size_in_kb: Maxium request body size in Kb for + WAF. + :type max_request_body_size_in_kb: int + :param file_upload_limit_in_mb: Maxium file upload size in Mb for WAF. + :type file_upload_limit_in_mb: int + :param exclusions: The exclusion list. + :type exclusions: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayFirewallExclusion] """ _validation = { @@ -44,6 +52,8 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): 'rule_set_type': {'required': True}, 'rule_set_version': {'required': True}, 'max_request_body_size': {'maximum': 128, 'minimum': 8}, + 'max_request_body_size_in_kb': {'maximum': 128, 'minimum': 8}, + 'file_upload_limit_in_mb': {'maximum': 500, 'minimum': 0}, } _attribute_map = { @@ -54,6 +64,9 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): 'disabled_rule_groups': {'key': 'disabledRuleGroups', 'type': '[ApplicationGatewayFirewallDisabledRuleGroup]'}, 'request_body_check': {'key': 'requestBodyCheck', 'type': 'bool'}, 'max_request_body_size': {'key': 'maxRequestBodySize', 'type': 'int'}, + 'max_request_body_size_in_kb': {'key': 'maxRequestBodySizeInKb', 'type': 'int'}, + 'file_upload_limit_in_mb': {'key': 'fileUploadLimitInMb', 'type': 'int'}, + 'exclusions': {'key': 'exclusions', 'type': '[ApplicationGatewayFirewallExclusion]'}, } def __init__(self, **kwargs): @@ -65,3 +78,6 @@ def __init__(self, **kwargs): self.disabled_rule_groups = kwargs.get('disabled_rule_groups', None) self.request_body_check = kwargs.get('request_body_check', None) self.max_request_body_size = kwargs.get('max_request_body_size', None) + self.max_request_body_size_in_kb = kwargs.get('max_request_body_size_in_kb', None) + self.file_upload_limit_in_mb = kwargs.get('file_upload_limit_in_mb', None) + self.exclusions = kwargs.get('exclusions', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration_py3.py index 55cd31b00be4..fd26aa3a5b01 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/application_gateway_web_application_firewall_configuration_py3.py @@ -36,6 +36,14 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): :type request_body_check: bool :param max_request_body_size: Maxium request body size for WAF. :type max_request_body_size: int + :param max_request_body_size_in_kb: Maxium request body size in Kb for + WAF. + :type max_request_body_size_in_kb: int + :param file_upload_limit_in_mb: Maxium file upload size in Mb for WAF. + :type file_upload_limit_in_mb: int + :param exclusions: The exclusion list. + :type exclusions: + list[~azure.mgmt.network.v2018_08_01.models.ApplicationGatewayFirewallExclusion] """ _validation = { @@ -44,6 +52,8 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): 'rule_set_type': {'required': True}, 'rule_set_version': {'required': True}, 'max_request_body_size': {'maximum': 128, 'minimum': 8}, + 'max_request_body_size_in_kb': {'maximum': 128, 'minimum': 8}, + 'file_upload_limit_in_mb': {'maximum': 500, 'minimum': 0}, } _attribute_map = { @@ -54,9 +64,12 @@ class ApplicationGatewayWebApplicationFirewallConfiguration(Model): 'disabled_rule_groups': {'key': 'disabledRuleGroups', 'type': '[ApplicationGatewayFirewallDisabledRuleGroup]'}, 'request_body_check': {'key': 'requestBodyCheck', 'type': 'bool'}, 'max_request_body_size': {'key': 'maxRequestBodySize', 'type': 'int'}, + 'max_request_body_size_in_kb': {'key': 'maxRequestBodySizeInKb', 'type': 'int'}, + 'file_upload_limit_in_mb': {'key': 'fileUploadLimitInMb', 'type': 'int'}, + 'exclusions': {'key': 'exclusions', 'type': '[ApplicationGatewayFirewallExclusion]'}, } - def __init__(self, *, enabled: bool, firewall_mode, rule_set_type: str, rule_set_version: str, disabled_rule_groups=None, request_body_check: bool=None, max_request_body_size: int=None, **kwargs) -> None: + def __init__(self, *, enabled: bool, firewall_mode, rule_set_type: str, rule_set_version: str, disabled_rule_groups=None, request_body_check: bool=None, max_request_body_size: int=None, max_request_body_size_in_kb: int=None, file_upload_limit_in_mb: int=None, exclusions=None, **kwargs) -> None: super(ApplicationGatewayWebApplicationFirewallConfiguration, self).__init__(**kwargs) self.enabled = enabled self.firewall_mode = firewall_mode @@ -65,3 +78,6 @@ def __init__(self, *, enabled: bool, firewall_mode, rule_set_type: str, rule_set self.disabled_rule_groups = disabled_rule_groups self.request_body_check = request_body_check self.max_request_body_size = max_request_body_size + self.max_request_body_size_in_kb = max_request_body_size_in_kb + self.file_upload_limit_in_mb = file_upload_limit_in_mb + self.exclusions = exclusions diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group.py index 22d13bc85570..2cd91bf6a876 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group.py @@ -20,6 +20,9 @@ class EvaluatedNetworkSecurityGroup(Model): :param network_security_group_id: Network security group ID. :type network_security_group_id: str + :param applied_to: Resource ID of nic or subnet to which network security + group is applied. + :type applied_to: str :param matched_rule: :type matched_rule: ~azure.mgmt.network.v2018_08_01.models.MatchedRule :ivar rules_evaluation_result: List of network security rules evaluation @@ -34,6 +37,7 @@ class EvaluatedNetworkSecurityGroup(Model): _attribute_map = { 'network_security_group_id': {'key': 'networkSecurityGroupId', 'type': 'str'}, + 'applied_to': {'key': 'appliedTo', 'type': 'str'}, 'matched_rule': {'key': 'matchedRule', 'type': 'MatchedRule'}, 'rules_evaluation_result': {'key': 'rulesEvaluationResult', 'type': '[NetworkSecurityRulesEvaluationResult]'}, } @@ -41,5 +45,6 @@ class EvaluatedNetworkSecurityGroup(Model): def __init__(self, **kwargs): super(EvaluatedNetworkSecurityGroup, self).__init__(**kwargs) self.network_security_group_id = kwargs.get('network_security_group_id', None) + self.applied_to = kwargs.get('applied_to', None) self.matched_rule = kwargs.get('matched_rule', None) self.rules_evaluation_result = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group_py3.py index b29d2c935adb..d2cdb31df3b6 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/evaluated_network_security_group_py3.py @@ -20,6 +20,9 @@ class EvaluatedNetworkSecurityGroup(Model): :param network_security_group_id: Network security group ID. :type network_security_group_id: str + :param applied_to: Resource ID of nic or subnet to which network security + group is applied. + :type applied_to: str :param matched_rule: :type matched_rule: ~azure.mgmt.network.v2018_08_01.models.MatchedRule :ivar rules_evaluation_result: List of network security rules evaluation @@ -34,12 +37,14 @@ class EvaluatedNetworkSecurityGroup(Model): _attribute_map = { 'network_security_group_id': {'key': 'networkSecurityGroupId', 'type': 'str'}, + 'applied_to': {'key': 'appliedTo', 'type': 'str'}, 'matched_rule': {'key': 'matchedRule', 'type': 'MatchedRule'}, 'rules_evaluation_result': {'key': 'rulesEvaluationResult', 'type': '[NetworkSecurityRulesEvaluationResult]'}, } - def __init__(self, *, network_security_group_id: str=None, matched_rule=None, **kwargs) -> None: + def __init__(self, *, network_security_group_id: str=None, applied_to: str=None, matched_rule=None, **kwargs) -> None: super(EvaluatedNetworkSecurityGroup, self).__init__(**kwargs) self.network_security_group_id = network_security_group_id + self.applied_to = applied_to self.matched_rule = matched_rule self.rules_evaluation_result = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit.py index 3a8423be9f1a..0cfbafe84926 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit.py @@ -55,6 +55,16 @@ class ExpressRouteCircuit(Resource): :param service_provider_properties: The ServiceProviderProperties. :type service_provider_properties: ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitServiceProviderProperties + :param express_route_port: The reference to the ExpressRoutePort resource + when the circuit is provisioned on an ExpressRoutePort resource. + :type express_route_port: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param bandwidth_in_gbps: The bandwidth of the circuit when the circuit is + provisioned on an ExpressRoutePort resource. + :type bandwidth_in_gbps: float + :ivar stag: The identifier of the circuit traffic. Outer tag for QinQ + encapsulation. + :vartype stag: int :param provisioning_state: Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str @@ -70,6 +80,7 @@ class ExpressRouteCircuit(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'stag': {'readonly': True}, 'etag': {'readonly': True}, } @@ -88,6 +99,9 @@ class ExpressRouteCircuit(Resource): 'service_key': {'key': 'properties.serviceKey', 'type': 'str'}, 'service_provider_notes': {'key': 'properties.serviceProviderNotes', 'type': 'str'}, 'service_provider_properties': {'key': 'properties.serviceProviderProperties', 'type': 'ExpressRouteCircuitServiceProviderProperties'}, + 'express_route_port': {'key': 'properties.expressRoutePort', 'type': 'SubResource'}, + 'bandwidth_in_gbps': {'key': 'properties.bandwidthInGbps', 'type': 'float'}, + 'stag': {'key': 'properties.stag', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'gateway_manager_etag': {'key': 'properties.gatewayManagerEtag', 'type': 'str'}, 'allow_global_reach': {'key': 'properties.allowGlobalReach', 'type': 'bool'}, @@ -105,6 +119,9 @@ def __init__(self, **kwargs): self.service_key = kwargs.get('service_key', None) self.service_provider_notes = kwargs.get('service_provider_notes', None) self.service_provider_properties = kwargs.get('service_provider_properties', None) + self.express_route_port = kwargs.get('express_route_port', None) + self.bandwidth_in_gbps = kwargs.get('bandwidth_in_gbps', None) + self.stag = None self.provisioning_state = kwargs.get('provisioning_state', None) self.gateway_manager_etag = kwargs.get('gateway_manager_etag', None) self.allow_global_reach = kwargs.get('allow_global_reach', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_py3.py index 06a104c8b458..73b55cbf7b5f 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_py3.py @@ -55,6 +55,16 @@ class ExpressRouteCircuit(Resource): :param service_provider_properties: The ServiceProviderProperties. :type service_provider_properties: ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitServiceProviderProperties + :param express_route_port: The reference to the ExpressRoutePort resource + when the circuit is provisioned on an ExpressRoutePort resource. + :type express_route_port: + ~azure.mgmt.network.v2018_08_01.models.SubResource + :param bandwidth_in_gbps: The bandwidth of the circuit when the circuit is + provisioned on an ExpressRoutePort resource. + :type bandwidth_in_gbps: float + :ivar stag: The identifier of the circuit traffic. Outer tag for QinQ + encapsulation. + :vartype stag: int :param provisioning_state: Gets the provisioning state of the public IP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'. :type provisioning_state: str @@ -70,6 +80,7 @@ class ExpressRouteCircuit(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'stag': {'readonly': True}, 'etag': {'readonly': True}, } @@ -88,13 +99,16 @@ class ExpressRouteCircuit(Resource): 'service_key': {'key': 'properties.serviceKey', 'type': 'str'}, 'service_provider_notes': {'key': 'properties.serviceProviderNotes', 'type': 'str'}, 'service_provider_properties': {'key': 'properties.serviceProviderProperties', 'type': 'ExpressRouteCircuitServiceProviderProperties'}, + 'express_route_port': {'key': 'properties.expressRoutePort', 'type': 'SubResource'}, + 'bandwidth_in_gbps': {'key': 'properties.bandwidthInGbps', 'type': 'float'}, + 'stag': {'key': 'properties.stag', 'type': 'int'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'gateway_manager_etag': {'key': 'properties.gatewayManagerEtag', 'type': 'str'}, 'allow_global_reach': {'key': 'properties.allowGlobalReach', 'type': 'bool'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, allow_classic_operations: bool=None, circuit_provisioning_state: str=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key: str=None, service_provider_notes: str=None, service_provider_properties=None, provisioning_state: str=None, gateway_manager_etag: str=None, allow_global_reach: bool=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, allow_classic_operations: bool=None, circuit_provisioning_state: str=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key: str=None, service_provider_notes: str=None, service_provider_properties=None, express_route_port=None, bandwidth_in_gbps: float=None, provisioning_state: str=None, gateway_manager_etag: str=None, allow_global_reach: bool=None, **kwargs) -> None: super(ExpressRouteCircuit, self).__init__(id=id, location=location, tags=tags, **kwargs) self.sku = sku self.allow_classic_operations = allow_classic_operations @@ -105,6 +119,9 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, sku=None, all self.service_key = service_key self.service_provider_notes = service_provider_notes self.service_provider_properties = service_provider_properties + self.express_route_port = express_route_port + self.bandwidth_in_gbps = bandwidth_in_gbps + self.stag = None self.provisioning_state = provisioning_state self.gateway_manager_etag = gateway_manager_etag self.allow_global_reach = allow_global_reach diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku.py index 27d030efe05b..60d04104cc0a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku.py @@ -17,8 +17,9 @@ class ExpressRouteCircuitSku(Model): :param name: The name of the SKU. :type name: str - :param tier: The tier of the SKU. Possible values are 'Standard' and - 'Premium'. Possible values include: 'Standard', 'Premium' + :param tier: The tier of the SKU. Possible values are 'Standard', + 'Premium' or 'Basic'. Possible values include: 'Standard', 'Premium', + 'Basic' :type tier: str or ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitSkuTier :param family: The family of the SKU. Possible values are: 'UnlimitedData' diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku_py3.py index 565fc298dd06..418166cc80f9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_sku_py3.py @@ -17,8 +17,9 @@ class ExpressRouteCircuitSku(Model): :param name: The name of the SKU. :type name: str - :param tier: The tier of the SKU. Possible values are 'Standard' and - 'Premium'. Possible values include: 'Standard', 'Premium' + :param tier: The tier of the SKU. Possible values are 'Standard', + 'Premium' or 'Basic'. Possible values include: 'Standard', 'Premium', + 'Basic' :type tier: str or ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitSkuTier :param family: The family of the SKU. Possible values are: 'UnlimitedData' diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link.py new file mode 100644 index 000000000000..2c8c300fd9f0 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link.py @@ -0,0 +1,86 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .sub_resource import SubResource + + +class ExpressRouteLink(SubResource): + """ExpressRouteLink. + + ExpressRouteLink child resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar router_name: Name of Azure router associated with physical port. + :vartype router_name: str + :ivar interface_name: Name of Azure router interface. + :vartype interface_name: str + :ivar patch_panel_id: Mapping between physical port to patch panel port. + :vartype patch_panel_id: str + :ivar rack_id: Mapping of physical patch panel to rack. + :vartype rack_id: str + :ivar connector_type: Physical fiber port type. Possible values include: + 'LC', 'SC' + :vartype connector_type: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLinkConnectorType + :param admin_state: Administrative state of the physical port. Possible + values include: 'Enabled', 'Disabled' + :type admin_state: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLinkAdminState + :ivar provisioning_state: The provisioning state of the ExpressRouteLink + resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: Name of child port resource that is unique among child port + resources of the parent. + :type name: str + :ivar etag: A unique read-only string that changes whenever the resource + is updated. + :vartype etag: str + """ + + _validation = { + 'router_name': {'readonly': True}, + 'interface_name': {'readonly': True}, + 'patch_panel_id': {'readonly': True}, + 'rack_id': {'readonly': True}, + 'connector_type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'router_name': {'key': 'properties.routerName', 'type': 'str'}, + 'interface_name': {'key': 'properties.interfaceName', 'type': 'str'}, + 'patch_panel_id': {'key': 'properties.patchPanelId', 'type': 'str'}, + 'rack_id': {'key': 'properties.rackId', 'type': 'str'}, + 'connector_type': {'key': 'properties.connectorType', 'type': 'str'}, + 'admin_state': {'key': 'properties.adminState', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ExpressRouteLink, self).__init__(**kwargs) + self.router_name = None + self.interface_name = None + self.patch_panel_id = None + self.rack_id = None + self.connector_type = None + self.admin_state = kwargs.get('admin_state', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_paged.py new file mode 100644 index 000000000000..91074370bccc --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_paged.py @@ -0,0 +1,27 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.paging import Paged + + +class ExpressRouteLinkPaged(Paged): + """ + A paging container for iterating over a list of :class:`ExpressRouteLink ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ExpressRouteLink]'} + } + + def __init__(self, *args, **kwargs): + + super(ExpressRouteLinkPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_py3.py new file mode 100644 index 000000000000..74d44c0f9b7c --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_link_py3.py @@ -0,0 +1,86 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .sub_resource_py3 import SubResource + + +class ExpressRouteLink(SubResource): + """ExpressRouteLink. + + ExpressRouteLink child resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar router_name: Name of Azure router associated with physical port. + :vartype router_name: str + :ivar interface_name: Name of Azure router interface. + :vartype interface_name: str + :ivar patch_panel_id: Mapping between physical port to patch panel port. + :vartype patch_panel_id: str + :ivar rack_id: Mapping of physical patch panel to rack. + :vartype rack_id: str + :ivar connector_type: Physical fiber port type. Possible values include: + 'LC', 'SC' + :vartype connector_type: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLinkConnectorType + :param admin_state: Administrative state of the physical port. Possible + values include: 'Enabled', 'Disabled' + :type admin_state: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLinkAdminState + :ivar provisioning_state: The provisioning state of the ExpressRouteLink + resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param name: Name of child port resource that is unique among child port + resources of the parent. + :type name: str + :ivar etag: A unique read-only string that changes whenever the resource + is updated. + :vartype etag: str + """ + + _validation = { + 'router_name': {'readonly': True}, + 'interface_name': {'readonly': True}, + 'patch_panel_id': {'readonly': True}, + 'rack_id': {'readonly': True}, + 'connector_type': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'router_name': {'key': 'properties.routerName', 'type': 'str'}, + 'interface_name': {'key': 'properties.interfaceName', 'type': 'str'}, + 'patch_panel_id': {'key': 'properties.patchPanelId', 'type': 'str'}, + 'rack_id': {'key': 'properties.rackId', 'type': 'str'}, + 'connector_type': {'key': 'properties.connectorType', 'type': 'str'}, + 'admin_state': {'key': 'properties.adminState', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, admin_state=None, name: str=None, **kwargs) -> None: + super(ExpressRouteLink, self).__init__(id=id, **kwargs) + self.router_name = None + self.interface_name = None + self.patch_panel_id = None + self.rack_id = None + self.connector_type = None + self.admin_state = admin_state + self.provisioning_state = None + self.name = name + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port.py new file mode 100644 index 000000000000..c63ba29998ef --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port.py @@ -0,0 +1,116 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .resource import Resource + + +class ExpressRoutePort(Resource): + """ExpressRoute Port. + + ExpressRoutePort resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param peering_location: The name of the peering location that the + ExpressRoutePort is mapped to physically. + :type peering_location: str + :param bandwidth_in_gbps: Bandwidth of procured ports in Gbps + :type bandwidth_in_gbps: int + :ivar provisioned_bandwidth_in_gbps: Aggregate Gbps of associated circuit + bandwidths. + :vartype provisioned_bandwidth_in_gbps: float + :ivar mtu: Maximum transmission unit of the physical port pair(s) + :vartype mtu: str + :param encapsulation: Encapsulation method on physical ports. Possible + values include: 'Dot1Q', 'QinQ' + :type encapsulation: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsEncapsulation + :ivar ether_type: Ethertype of the physical port. + :vartype ether_type: str + :ivar allocation_date: Date of the physical port allocation to be used in + Letter of Authorization. + :vartype allocation_date: str + :param links: ExpressRouteLink Sub-Resources. The set of physical links of + the ExpressRoutePort resource + :type links: list[~azure.mgmt.network.v2018_08_01.models.ExpressRouteLink] + :ivar circuits: Reference the ExpressRoute circuit(s) that are provisioned + on this ExpressRoutePort resource. + :vartype circuits: + list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :ivar provisioning_state: The provisioning state of the ExpressRoutePort + resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param resource_guid: The resource GUID property of the ExpressRoutePort + resource. + :type resource_guid: str + :ivar etag: A unique read-only string that changes whenever the resource + is updated. + :vartype etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'provisioned_bandwidth_in_gbps': {'readonly': True}, + 'mtu': {'readonly': True}, + 'ether_type': {'readonly': True}, + 'allocation_date': {'readonly': True}, + 'circuits': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'peering_location': {'key': 'properties.peeringLocation', 'type': 'str'}, + 'bandwidth_in_gbps': {'key': 'properties.bandwidthInGbps', 'type': 'int'}, + 'provisioned_bandwidth_in_gbps': {'key': 'properties.provisionedBandwidthInGbps', 'type': 'float'}, + 'mtu': {'key': 'properties.mtu', 'type': 'str'}, + 'encapsulation': {'key': 'properties.encapsulation', 'type': 'str'}, + 'ether_type': {'key': 'properties.etherType', 'type': 'str'}, + 'allocation_date': {'key': 'properties.allocationDate', 'type': 'str'}, + 'links': {'key': 'properties.links', 'type': '[ExpressRouteLink]'}, + 'circuits': {'key': 'properties.circuits', 'type': '[SubResource]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ExpressRoutePort, self).__init__(**kwargs) + self.peering_location = kwargs.get('peering_location', None) + self.bandwidth_in_gbps = kwargs.get('bandwidth_in_gbps', None) + self.provisioned_bandwidth_in_gbps = None + self.mtu = None + self.encapsulation = kwargs.get('encapsulation', None) + self.ether_type = None + self.allocation_date = None + self.links = kwargs.get('links', None) + self.circuits = None + self.provisioning_state = None + self.resource_guid = kwargs.get('resource_guid', None) + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_paged.py new file mode 100644 index 000000000000..3ff97b46881e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_paged.py @@ -0,0 +1,27 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.paging import Paged + + +class ExpressRoutePortPaged(Paged): + """ + A paging container for iterating over a list of :class:`ExpressRoutePort ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ExpressRoutePort]'} + } + + def __init__(self, *args, **kwargs): + + super(ExpressRoutePortPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_py3.py new file mode 100644 index 000000000000..7d15edef88c2 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_port_py3.py @@ -0,0 +1,116 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .resource_py3 import Resource + + +class ExpressRoutePort(Resource): + """ExpressRoute Port. + + ExpressRoutePort resource definition. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param peering_location: The name of the peering location that the + ExpressRoutePort is mapped to physically. + :type peering_location: str + :param bandwidth_in_gbps: Bandwidth of procured ports in Gbps + :type bandwidth_in_gbps: int + :ivar provisioned_bandwidth_in_gbps: Aggregate Gbps of associated circuit + bandwidths. + :vartype provisioned_bandwidth_in_gbps: float + :ivar mtu: Maximum transmission unit of the physical port pair(s) + :vartype mtu: str + :param encapsulation: Encapsulation method on physical ports. Possible + values include: 'Dot1Q', 'QinQ' + :type encapsulation: str or + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsEncapsulation + :ivar ether_type: Ethertype of the physical port. + :vartype ether_type: str + :ivar allocation_date: Date of the physical port allocation to be used in + Letter of Authorization. + :vartype allocation_date: str + :param links: ExpressRouteLink Sub-Resources. The set of physical links of + the ExpressRoutePort resource + :type links: list[~azure.mgmt.network.v2018_08_01.models.ExpressRouteLink] + :ivar circuits: Reference the ExpressRoute circuit(s) that are provisioned + on this ExpressRoutePort resource. + :vartype circuits: + list[~azure.mgmt.network.v2018_08_01.models.SubResource] + :ivar provisioning_state: The provisioning state of the ExpressRoutePort + resource. Possible values are: 'Succeeded', 'Updating', 'Deleting', and + 'Failed'. + :vartype provisioning_state: str + :param resource_guid: The resource GUID property of the ExpressRoutePort + resource. + :type resource_guid: str + :ivar etag: A unique read-only string that changes whenever the resource + is updated. + :vartype etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'provisioned_bandwidth_in_gbps': {'readonly': True}, + 'mtu': {'readonly': True}, + 'ether_type': {'readonly': True}, + 'allocation_date': {'readonly': True}, + 'circuits': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + 'etag': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'peering_location': {'key': 'properties.peeringLocation', 'type': 'str'}, + 'bandwidth_in_gbps': {'key': 'properties.bandwidthInGbps', 'type': 'int'}, + 'provisioned_bandwidth_in_gbps': {'key': 'properties.provisionedBandwidthInGbps', 'type': 'float'}, + 'mtu': {'key': 'properties.mtu', 'type': 'str'}, + 'encapsulation': {'key': 'properties.encapsulation', 'type': 'str'}, + 'ether_type': {'key': 'properties.etherType', 'type': 'str'}, + 'allocation_date': {'key': 'properties.allocationDate', 'type': 'str'}, + 'links': {'key': 'properties.links', 'type': '[ExpressRouteLink]'}, + 'circuits': {'key': 'properties.circuits', 'type': '[SubResource]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, location: str=None, tags=None, peering_location: str=None, bandwidth_in_gbps: int=None, encapsulation=None, links=None, resource_guid: str=None, **kwargs) -> None: + super(ExpressRoutePort, self).__init__(id=id, location=location, tags=tags, **kwargs) + self.peering_location = peering_location + self.bandwidth_in_gbps = bandwidth_in_gbps + self.provisioned_bandwidth_in_gbps = None + self.mtu = None + self.encapsulation = encapsulation + self.ether_type = None + self.allocation_date = None + self.links = links + self.circuits = None + self.provisioning_state = None + self.resource_guid = resource_guid + self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location.py new file mode 100644 index 000000000000..9ff640a90fe1 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location.py @@ -0,0 +1,72 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .resource import Resource + + +class ExpressRoutePortsLocation(Resource): + """ExpressRoutePorts Peering Location. + + Definition of the ExpressRoutePorts peering location resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :ivar address: Address of peering location. + :vartype address: str + :ivar contact: Contact details of peering locations. + :vartype contact: str + :param available_bandwidths: The inventory of available ExpressRoutePort + bandwidths. + :type available_bandwidths: + list[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsLocationBandwidths] + :ivar provisioning_state: The provisioning state of the + ExpressRoutePortLocation resource. Possible values are: 'Succeeded', + 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'address': {'readonly': True}, + 'contact': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'address': {'key': 'properties.address', 'type': 'str'}, + 'contact': {'key': 'properties.contact', 'type': 'str'}, + 'available_bandwidths': {'key': 'properties.availableBandwidths', 'type': '[ExpressRoutePortsLocationBandwidths]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ExpressRoutePortsLocation, self).__init__(**kwargs) + self.address = None + self.contact = None + self.available_bandwidths = kwargs.get('available_bandwidths', None) + self.provisioning_state = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths.py new file mode 100644 index 000000000000..1087c7a3c792 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths.py @@ -0,0 +1,42 @@ +# 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 ExpressRoutePortsLocationBandwidths(Model): + """ExpressRoutePorts Location Bandwidths. + + Real-time inventory of available ExpressRoute port bandwidths. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar offer_name: Bandwidth descriptive name + :vartype offer_name: str + :ivar value_in_gbps: Bandwidth value in Gbps + :vartype value_in_gbps: int + """ + + _validation = { + 'offer_name': {'readonly': True}, + 'value_in_gbps': {'readonly': True}, + } + + _attribute_map = { + 'offer_name': {'key': 'offerName', 'type': 'str'}, + 'value_in_gbps': {'key': 'valueInGbps', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(ExpressRoutePortsLocationBandwidths, self).__init__(**kwargs) + self.offer_name = None + self.value_in_gbps = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths_py3.py new file mode 100644 index 000000000000..cba89b52bc09 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_bandwidths_py3.py @@ -0,0 +1,42 @@ +# 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 ExpressRoutePortsLocationBandwidths(Model): + """ExpressRoutePorts Location Bandwidths. + + Real-time inventory of available ExpressRoute port bandwidths. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar offer_name: Bandwidth descriptive name + :vartype offer_name: str + :ivar value_in_gbps: Bandwidth value in Gbps + :vartype value_in_gbps: int + """ + + _validation = { + 'offer_name': {'readonly': True}, + 'value_in_gbps': {'readonly': True}, + } + + _attribute_map = { + 'offer_name': {'key': 'offerName', 'type': 'str'}, + 'value_in_gbps': {'key': 'valueInGbps', 'type': 'int'}, + } + + def __init__(self, **kwargs) -> None: + super(ExpressRoutePortsLocationBandwidths, self).__init__(**kwargs) + self.offer_name = None + self.value_in_gbps = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_paged.py new file mode 100644 index 000000000000..8fc99d45be75 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_paged.py @@ -0,0 +1,27 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.paging import Paged + + +class ExpressRoutePortsLocationPaged(Paged): + """ + A paging container for iterating over a list of :class:`ExpressRoutePortsLocation ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ExpressRoutePortsLocation]'} + } + + def __init__(self, *args, **kwargs): + + super(ExpressRoutePortsLocationPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_py3.py new file mode 100644 index 000000000000..56e304c69cfb --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_ports_location_py3.py @@ -0,0 +1,72 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .resource_py3 import Resource + + +class ExpressRoutePortsLocation(Resource): + """ExpressRoutePorts Peering Location. + + Definition of the ExpressRoutePorts peering location resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :ivar address: Address of peering location. + :vartype address: str + :ivar contact: Contact details of peering locations. + :vartype contact: str + :param available_bandwidths: The inventory of available ExpressRoutePort + bandwidths. + :type available_bandwidths: + list[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsLocationBandwidths] + :ivar provisioning_state: The provisioning state of the + ExpressRoutePortLocation resource. Possible values are: 'Succeeded', + 'Updating', 'Deleting', and 'Failed'. + :vartype provisioning_state: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + 'address': {'readonly': True}, + 'contact': {'readonly': True}, + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'address': {'key': 'properties.address', 'type': 'str'}, + 'contact': {'key': 'properties.contact', 'type': 'str'}, + 'available_bandwidths': {'key': 'properties.availableBandwidths', 'type': '[ExpressRoutePortsLocationBandwidths]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, location: str=None, tags=None, available_bandwidths=None, **kwargs) -> None: + super(ExpressRoutePortsLocation, self).__init__(id=id, location=location, tags=tags, **kwargs) + self.address = None + self.contact = None + self.available_bandwidths = available_bandwidths + self.provisioning_state = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters.py index 6e10c5624a31..6412f93cc83f 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters.py @@ -21,21 +21,29 @@ class NetworkConfigurationDiagnosticParameters(Model): perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway. :type target_resource_id: str - :param queries: Required. List of traffic queries. - :type queries: list[~azure.mgmt.network.v2018_08_01.models.TrafficQuery] + :param verbosity_level: Verbosity level. Accepted values are 'Normal', + 'Minimum', 'Full'. Possible values include: 'Normal', 'Minimum', 'Full' + :type verbosity_level: str or + ~azure.mgmt.network.v2018_08_01.models.VerbosityLevel + :param profiles: Required. List of network configuration diagnostic + profiles. + :type profiles: + list[~azure.mgmt.network.v2018_08_01.models.NetworkConfigurationDiagnosticProfile] """ _validation = { 'target_resource_id': {'required': True}, - 'queries': {'required': True}, + 'profiles': {'required': True}, } _attribute_map = { 'target_resource_id': {'key': 'targetResourceId', 'type': 'str'}, - 'queries': {'key': 'queries', 'type': '[TrafficQuery]'}, + 'verbosity_level': {'key': 'verbosityLevel', 'type': 'str'}, + 'profiles': {'key': 'profiles', 'type': '[NetworkConfigurationDiagnosticProfile]'}, } def __init__(self, **kwargs): super(NetworkConfigurationDiagnosticParameters, self).__init__(**kwargs) self.target_resource_id = kwargs.get('target_resource_id', None) - self.queries = kwargs.get('queries', None) + self.verbosity_level = kwargs.get('verbosity_level', None) + self.profiles = kwargs.get('profiles', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters_py3.py index 222296e26b94..cbaeb2f460ed 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_parameters_py3.py @@ -21,21 +21,29 @@ class NetworkConfigurationDiagnosticParameters(Model): perform network configuration diagnostic. Valid options are VM, NetworkInterface, VMSS/NetworkInterface and Application Gateway. :type target_resource_id: str - :param queries: Required. List of traffic queries. - :type queries: list[~azure.mgmt.network.v2018_08_01.models.TrafficQuery] + :param verbosity_level: Verbosity level. Accepted values are 'Normal', + 'Minimum', 'Full'. Possible values include: 'Normal', 'Minimum', 'Full' + :type verbosity_level: str or + ~azure.mgmt.network.v2018_08_01.models.VerbosityLevel + :param profiles: Required. List of network configuration diagnostic + profiles. + :type profiles: + list[~azure.mgmt.network.v2018_08_01.models.NetworkConfigurationDiagnosticProfile] """ _validation = { 'target_resource_id': {'required': True}, - 'queries': {'required': True}, + 'profiles': {'required': True}, } _attribute_map = { 'target_resource_id': {'key': 'targetResourceId', 'type': 'str'}, - 'queries': {'key': 'queries', 'type': '[TrafficQuery]'}, + 'verbosity_level': {'key': 'verbosityLevel', 'type': 'str'}, + 'profiles': {'key': 'profiles', 'type': '[NetworkConfigurationDiagnosticProfile]'}, } - def __init__(self, *, target_resource_id: str, queries, **kwargs) -> None: + def __init__(self, *, target_resource_id: str, profiles, verbosity_level=None, **kwargs) -> None: super(NetworkConfigurationDiagnosticParameters, self).__init__(**kwargs) self.target_resource_id = target_resource_id - self.queries = queries + self.verbosity_level = verbosity_level + self.profiles = profiles diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile.py similarity index 94% rename from azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query.py rename to azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile.py index 1ba916ade144..55497a3781ab 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class TrafficQuery(Model): +class NetworkConfigurationDiagnosticProfile(Model): """Parameters to compare with network configuration. All required parameters must be populated in order to send to Azure. @@ -53,7 +53,7 @@ class TrafficQuery(Model): } def __init__(self, **kwargs): - super(TrafficQuery, self).__init__(**kwargs) + super(NetworkConfigurationDiagnosticProfile, self).__init__(**kwargs) self.direction = kwargs.get('direction', None) self.protocol = kwargs.get('protocol', None) self.source = kwargs.get('source', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile_py3.py similarity index 94% rename from azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query_py3.py rename to azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile_py3.py index 1251b1d00794..9e208e0f73d1 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/traffic_query_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_profile_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class TrafficQuery(Model): +class NetworkConfigurationDiagnosticProfile(Model): """Parameters to compare with network configuration. All required parameters must be populated in order to send to Azure. @@ -53,7 +53,7 @@ class TrafficQuery(Model): } def __init__(self, *, direction, protocol: str, source: str, destination: str, destination_port: str, **kwargs) -> None: - super(TrafficQuery, self).__init__(**kwargs) + super(NetworkConfigurationDiagnosticProfile, self).__init__(**kwargs) self.direction = direction self.protocol = protocol self.source = source diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result.py index 7b8bc0ac12db..e606c618a08e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result.py @@ -16,19 +16,20 @@ class NetworkConfigurationDiagnosticResult(Model): """Network configuration diagnostic result corresponded to provided traffic query. - :param traffic_query: - :type traffic_query: ~azure.mgmt.network.v2018_08_01.models.TrafficQuery + :param profile: + :type profile: + ~azure.mgmt.network.v2018_08_01.models.NetworkConfigurationDiagnosticProfile :param network_security_group_result: :type network_security_group_result: ~azure.mgmt.network.v2018_08_01.models.NetworkSecurityGroupResult """ _attribute_map = { - 'traffic_query': {'key': 'trafficQuery', 'type': 'TrafficQuery'}, + 'profile': {'key': 'profile', 'type': 'NetworkConfigurationDiagnosticProfile'}, 'network_security_group_result': {'key': 'networkSecurityGroupResult', 'type': 'NetworkSecurityGroupResult'}, } def __init__(self, **kwargs): super(NetworkConfigurationDiagnosticResult, self).__init__(**kwargs) - self.traffic_query = kwargs.get('traffic_query', None) + self.profile = kwargs.get('profile', None) self.network_security_group_result = kwargs.get('network_security_group_result', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result_py3.py index e88307a490e3..1b3365d9067e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_configuration_diagnostic_result_py3.py @@ -16,19 +16,20 @@ class NetworkConfigurationDiagnosticResult(Model): """Network configuration diagnostic result corresponded to provided traffic query. - :param traffic_query: - :type traffic_query: ~azure.mgmt.network.v2018_08_01.models.TrafficQuery + :param profile: + :type profile: + ~azure.mgmt.network.v2018_08_01.models.NetworkConfigurationDiagnosticProfile :param network_security_group_result: :type network_security_group_result: ~azure.mgmt.network.v2018_08_01.models.NetworkSecurityGroupResult """ _attribute_map = { - 'traffic_query': {'key': 'trafficQuery', 'type': 'TrafficQuery'}, + 'profile': {'key': 'profile', 'type': 'NetworkConfigurationDiagnosticProfile'}, 'network_security_group_result': {'key': 'networkSecurityGroupResult', 'type': 'NetworkSecurityGroupResult'}, } - def __init__(self, *, traffic_query=None, network_security_group_result=None, **kwargs) -> None: + def __init__(self, *, profile=None, network_security_group_result=None, **kwargs) -> None: super(NetworkConfigurationDiagnosticResult, self).__init__(**kwargs) - self.traffic_query = traffic_query + self.profile = profile self.network_security_group_result = network_security_group_result diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py index e443490e1126..aa6eb3bef0ee 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_management_client_enums.py @@ -154,6 +154,12 @@ class ApplicationGatewaySslCipherSuite(str, Enum): tls_rsa_with_3_des_ede_cbc_sha = "TLS_RSA_WITH_3DES_EDE_CBC_SHA" +class ApplicationGatewayCustomErrorStatusCode(str, Enum): + + http_status403 = "HttpStatus403" + http_status502 = "HttpStatus502" + + class ApplicationGatewayRequestRoutingRuleType(str, Enum): basic = "Basic" @@ -213,6 +219,7 @@ class AzureFirewallNetworkRuleProtocol(str, Enum): tcp = "TCP" udp = "UDP" any = "Any" + icmp = "ICMP" class AuthorizationUseStatus(str, Enum): @@ -265,6 +272,7 @@ class ExpressRouteCircuitSkuTier(str, Enum): standard = "Standard" premium = "Premium" + basic = "Basic" class ExpressRouteCircuitSkuFamily(str, Enum): @@ -281,6 +289,24 @@ class ServiceProviderProvisioningState(str, Enum): deprovisioning = "Deprovisioning" +class ExpressRouteLinkConnectorType(str, Enum): + + lc = "LC" + sc = "SC" + + +class ExpressRouteLinkAdminState(str, Enum): + + enabled = "Enabled" + disabled = "Disabled" + + +class ExpressRoutePortsEncapsulation(str, Enum): + + dot1_q = "Dot1Q" + qin_q = "QinQ" + + class LoadBalancerSkuName(str, Enum): basic = "Basic" @@ -450,6 +476,13 @@ class EvaluationState(str, Enum): completed = "Completed" +class VerbosityLevel(str, Enum): + + normal = "Normal" + minimum = "Minimum" + full = "Full" + + class PublicIPPrefixSkuName(str, Enum): standard = "Standard" diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/outbound_rule_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/outbound_rule_paged.py new file mode 100644 index 000000000000..44d15dc58177 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/outbound_rule_paged.py @@ -0,0 +1,27 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.paging import Paged + + +class OutboundRulePaged(Paged): + """ + A paging container for iterating over a list of :class:`OutboundRule ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[OutboundRule]'} + } + + def __init__(self, *args, **kwargs): + + super(OutboundRulePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py index 5864009fbd7c..833340481451 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py @@ -35,12 +35,16 @@ from .operations.express_route_cross_connection_peerings_operations import ExpressRouteCrossConnectionPeeringsOperations from .operations.express_route_gateways_operations import ExpressRouteGatewaysOperations from .operations.express_route_connections_operations import ExpressRouteConnectionsOperations +from .operations.express_route_ports_locations_operations import ExpressRoutePortsLocationsOperations +from .operations.express_route_ports_operations import ExpressRoutePortsOperations +from .operations.express_route_links_operations import ExpressRouteLinksOperations from .operations.interface_endpoints_operations import InterfaceEndpointsOperations from .operations.load_balancers_operations import LoadBalancersOperations from .operations.load_balancer_backend_address_pools_operations import LoadBalancerBackendAddressPoolsOperations from .operations.load_balancer_frontend_ip_configurations_operations import LoadBalancerFrontendIPConfigurationsOperations from .operations.inbound_nat_rules_operations import InboundNatRulesOperations from .operations.load_balancer_load_balancing_rules_operations import LoadBalancerLoadBalancingRulesOperations +from .operations.load_balancer_outbound_rules_operations import LoadBalancerOutboundRulesOperations from .operations.load_balancer_network_interfaces_operations import LoadBalancerNetworkInterfacesOperations from .operations.load_balancer_probes_operations import LoadBalancerProbesOperations from .operations.network_interfaces_operations import NetworkInterfacesOperations @@ -158,6 +162,12 @@ class NetworkManagementClient(SDKClient): :vartype express_route_gateways: azure.mgmt.network.v2018_08_01.operations.ExpressRouteGatewaysOperations :ivar express_route_connections: ExpressRouteConnections operations :vartype express_route_connections: azure.mgmt.network.v2018_08_01.operations.ExpressRouteConnectionsOperations + :ivar express_route_ports_locations: ExpressRoutePortsLocations operations + :vartype express_route_ports_locations: azure.mgmt.network.v2018_08_01.operations.ExpressRoutePortsLocationsOperations + :ivar express_route_ports: ExpressRoutePorts operations + :vartype express_route_ports: azure.mgmt.network.v2018_08_01.operations.ExpressRoutePortsOperations + :ivar express_route_links: ExpressRouteLinks operations + :vartype express_route_links: azure.mgmt.network.v2018_08_01.operations.ExpressRouteLinksOperations :ivar interface_endpoints: InterfaceEndpoints operations :vartype interface_endpoints: azure.mgmt.network.v2018_08_01.operations.InterfaceEndpointsOperations :ivar load_balancers: LoadBalancers operations @@ -170,6 +180,8 @@ class NetworkManagementClient(SDKClient): :vartype inbound_nat_rules: azure.mgmt.network.v2018_08_01.operations.InboundNatRulesOperations :ivar load_balancer_load_balancing_rules: LoadBalancerLoadBalancingRules operations :vartype load_balancer_load_balancing_rules: azure.mgmt.network.v2018_08_01.operations.LoadBalancerLoadBalancingRulesOperations + :ivar load_balancer_outbound_rules: LoadBalancerOutboundRules operations + :vartype load_balancer_outbound_rules: azure.mgmt.network.v2018_08_01.operations.LoadBalancerOutboundRulesOperations :ivar load_balancer_network_interfaces: LoadBalancerNetworkInterfaces operations :vartype load_balancer_network_interfaces: azure.mgmt.network.v2018_08_01.operations.LoadBalancerNetworkInterfacesOperations :ivar load_balancer_probes: LoadBalancerProbes operations @@ -305,6 +317,12 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.express_route_connections = ExpressRouteConnectionsOperations( self._client, self.config, self._serialize, self._deserialize) + self.express_route_ports_locations = ExpressRoutePortsLocationsOperations( + self._client, self.config, self._serialize, self._deserialize) + self.express_route_ports = ExpressRoutePortsOperations( + self._client, self.config, self._serialize, self._deserialize) + self.express_route_links = ExpressRouteLinksOperations( + self._client, self.config, self._serialize, self._deserialize) self.interface_endpoints = InterfaceEndpointsOperations( self._client, self.config, self._serialize, self._deserialize) self.load_balancers = LoadBalancersOperations( @@ -317,6 +335,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.load_balancer_load_balancing_rules = LoadBalancerLoadBalancingRulesOperations( self._client, self.config, self._serialize, self._deserialize) + self.load_balancer_outbound_rules = LoadBalancerOutboundRulesOperations( + self._client, self.config, self._serialize, self._deserialize) self.load_balancer_network_interfaces = LoadBalancerNetworkInterfacesOperations( self._client, self.config, self._serialize, self._deserialize) self.load_balancer_probes = LoadBalancerProbesOperations( diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py index 809521775aba..711912551ef0 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py @@ -26,12 +26,16 @@ from .express_route_cross_connection_peerings_operations import ExpressRouteCrossConnectionPeeringsOperations from .express_route_gateways_operations import ExpressRouteGatewaysOperations from .express_route_connections_operations import ExpressRouteConnectionsOperations +from .express_route_ports_locations_operations import ExpressRoutePortsLocationsOperations +from .express_route_ports_operations import ExpressRoutePortsOperations +from .express_route_links_operations import ExpressRouteLinksOperations from .interface_endpoints_operations import InterfaceEndpointsOperations from .load_balancers_operations import LoadBalancersOperations from .load_balancer_backend_address_pools_operations import LoadBalancerBackendAddressPoolsOperations from .load_balancer_frontend_ip_configurations_operations import LoadBalancerFrontendIPConfigurationsOperations from .inbound_nat_rules_operations import InboundNatRulesOperations from .load_balancer_load_balancing_rules_operations import LoadBalancerLoadBalancingRulesOperations +from .load_balancer_outbound_rules_operations import LoadBalancerOutboundRulesOperations from .load_balancer_network_interfaces_operations import LoadBalancerNetworkInterfacesOperations from .load_balancer_probes_operations import LoadBalancerProbesOperations from .network_interfaces_operations import NetworkInterfacesOperations @@ -91,12 +95,16 @@ 'ExpressRouteCrossConnectionPeeringsOperations', 'ExpressRouteGatewaysOperations', 'ExpressRouteConnectionsOperations', + 'ExpressRoutePortsLocationsOperations', + 'ExpressRoutePortsOperations', + 'ExpressRouteLinksOperations', 'InterfaceEndpointsOperations', 'LoadBalancersOperations', 'LoadBalancerBackendAddressPoolsOperations', 'LoadBalancerFrontendIPConfigurationsOperations', 'InboundNatRulesOperations', 'LoadBalancerLoadBalancingRulesOperations', + 'LoadBalancerOutboundRulesOperations', 'LoadBalancerNetworkInterfacesOperations', 'LoadBalancerProbesOperations', 'NetworkInterfacesOperations', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_links_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_links_operations.py new file mode 100644 index 000000000000..1300e68b8685 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_links_operations.py @@ -0,0 +1,176 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class ExpressRouteLinksOperations(object): + """ExpressRouteLinksOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def get( + self, resource_group_name, express_route_port_name, link_name, custom_headers=None, raw=False, **operation_config): + """Retrieves the specified ExpressRouteLink resource. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of the ExpressRoutePort + resource. + :type express_route_port_name: str + :param link_name: The name of the ExpressRouteLink resource. + :type link_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: ExpressRouteLink or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLink or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str'), + 'linkName': self._serialize.url("link_name", link_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + 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('ExpressRouteLink', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}/links/{linkName}'} + + def list( + self, resource_group_name, express_route_port_name, custom_headers=None, raw=False, **operation_config): + """Retrieve the ExpressRouteLink sub-resources of the specified + ExpressRoutePort resource. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of the ExpressRoutePort + resource. + :type express_route_port_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ExpressRouteLink + :rtype: + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteLinkPaged[~azure.mgmt.network.v2018_08_01.models.ExpressRouteLink] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ExpressRouteLinkPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ExpressRouteLinkPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}/links'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_locations_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_locations_operations.py new file mode 100644 index 000000000000..2f5f85577108 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_locations_operations.py @@ -0,0 +1,166 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class ExpressRoutePortsLocationsOperations(object): + """ExpressRoutePortsLocationsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Retrieves all ExpressRoutePort peering locations. Does not return + available bandwidths for each location. Available bandwidths can only + be obtained when retriving a specific peering location. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ExpressRoutePortsLocation + :rtype: + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsLocationPaged[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsLocation] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ExpressRoutePortsLocationPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ExpressRoutePortsLocationPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePortsLocations'} + + def get( + self, location_name, custom_headers=None, raw=False, **operation_config): + """Retrieves a single ExpressRoutePort peering location, including the + list of available bandwidths available at said peering location. + + :param location_name: Name of the requested ExpressRoutePort peering + location. + :type location_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: ExpressRoutePortsLocation or ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortsLocation or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'locationName': self._serialize.url("location_name", location_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + 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('ExpressRoutePortsLocation', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePortsLocations/{locationName}'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_operations.py new file mode 100644 index 000000000000..41883528c48e --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/express_route_ports_operations.py @@ -0,0 +1,522 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class ExpressRoutePortsOperations(object): + """ExpressRoutePortsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + + def _delete_initial( + self, resource_group_name, express_route_port_name, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 202, 204]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def delete( + self, resource_group_name, express_route_port_name, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes the specified ExpressRoutePort resource. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of the ExpressRoutePort + resource. + :type express_route_port_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: :class:`CloudError` + """ + raw_result = self._delete_initial( + resource_group_name=resource_group_name, + express_route_port_name=express_route_port_name, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}'} + + def get( + self, resource_group_name, express_route_port_name, custom_headers=None, raw=False, **operation_config): + """Retrieves the requested ExpressRoutePort resource. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of ExpressRoutePort. + :type express_route_port_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: ExpressRoutePort or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + 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('ExpressRoutePort', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}'} + + + def _create_or_update_initial( + self, resource_group_name, express_route_port_name, parameters, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.create_or_update.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'ExpressRoutePort') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 201]: + 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('ExpressRoutePort', response) + if response.status_code == 201: + deserialized = self._deserialize('ExpressRoutePort', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def create_or_update( + self, resource_group_name, express_route_port_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates or updates the specified ExpressRoutePort resource. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of the ExpressRoutePort + resource. + :type express_route_port_name: str + :param parameters: Parameters supplied to the create ExpressRoutePort + operation. + :type parameters: + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort + :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 ExpressRoutePort or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort]] + :raises: :class:`CloudError` + """ + raw_result = self._create_or_update_initial( + resource_group_name=resource_group_name, + express_route_port_name=express_route_port_name, + parameters=parameters, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('ExpressRoutePort', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}'} + + + def _update_tags_initial( + self, resource_group_name, express_route_port_name, tags=None, custom_headers=None, raw=False, **operation_config): + parameters = models.TagsObject(tags=tags) + + # Construct URL + url = self.update_tags.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'expressRoutePortName': self._serialize.url("express_route_port_name", express_route_port_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'TagsObject') + + # Construct and send request + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + 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('ExpressRoutePort', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def update_tags( + self, resource_group_name, express_route_port_name, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Update ExpressRoutePort tags. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param express_route_port_name: The name of the ExpressRoutePort + resource. + :type express_route_port_name: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns ExpressRoutePort or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort]] + :raises: :class:`CloudError` + """ + raw_result = self._update_tags_initial( + resource_group_name=resource_group_name, + express_route_port_name=express_route_port_name, + tags=tags, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('ExpressRoutePort', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + update_tags.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}'} + + def list_by_resource_group( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """List all the ExpressRoutePort resources in the specified resource + group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ExpressRoutePort + :rtype: + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortPaged[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_by_resource_group.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ExpressRoutePortPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ExpressRoutePortPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts'} + + def list( + self, custom_headers=None, raw=False, **operation_config): + """List all the ExpressRoutePort resources in the specified subscription. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ExpressRoutePort + :rtype: + ~azure.mgmt.network.v2018_08_01.models.ExpressRoutePortPaged[~azure.mgmt.network.v2018_08_01.models.ExpressRoutePort] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ExpressRoutePortPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ExpressRoutePortPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePorts'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/load_balancer_outbound_rules_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/load_balancer_outbound_rules_operations.py new file mode 100644 index 000000000000..e6b9090c5181 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/load_balancer_outbound_rules_operations.py @@ -0,0 +1,173 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class LoadBalancerOutboundRulesOperations(object): + """LoadBalancerOutboundRulesOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def list( + self, resource_group_name, load_balancer_name, custom_headers=None, raw=False, **operation_config): + """Gets all the outbound rules in a load balancer. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param load_balancer_name: The name of the load balancer. + :type load_balancer_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of OutboundRule + :rtype: + ~azure.mgmt.network.v2018_08_01.models.OutboundRulePaged[~azure.mgmt.network.v2018_08_01.models.OutboundRule] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'loadBalancerName': self._serialize.url("load_balancer_name", load_balancer_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') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.OutboundRulePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.OutboundRulePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/outboundRules'} + + def get( + self, resource_group_name, load_balancer_name, outbound_rule_name, custom_headers=None, raw=False, **operation_config): + """Gets the specified load balancer outbound rule. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param load_balancer_name: The name of the load balancer. + :type load_balancer_name: str + :param outbound_rule_name: The name of the outbound rule. + :type outbound_rule_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: OutboundRule or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.network.v2018_08_01.models.OutboundRule or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'loadBalancerName': self._serialize.url("load_balancer_name", load_balancer_name, 'str'), + 'outboundRuleName': self._serialize.url("outbound_rule_name", outbound_rule_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + 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('OutboundRule', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/outboundRules/{outboundRuleName}'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_watchers_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_watchers_operations.py index 8e36dcf8d031..6443e4c1412f 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_watchers_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_watchers_operations.py @@ -1562,9 +1562,7 @@ def get_long_running_output(response): def _get_network_configuration_diagnostic_initial( - self, resource_group_name, network_watcher_name, target_resource_id, queries, custom_headers=None, raw=False, **operation_config): - parameters = models.NetworkConfigurationDiagnosticParameters(target_resource_id=target_resource_id, queries=queries) - + self, resource_group_name, network_watcher_name, parameters, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.get_network_configuration_diagnostic.metadata['url'] path_format_arguments = { @@ -1613,20 +1611,16 @@ def _get_network_configuration_diagnostic_initial( return deserialized def get_network_configuration_diagnostic( - self, resource_group_name, network_watcher_name, target_resource_id, queries, custom_headers=None, raw=False, polling=True, **operation_config): + self, resource_group_name, network_watcher_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): """Get network configuration diagnostic. :param resource_group_name: The name of the resource group. :type resource_group_name: str :param network_watcher_name: The name of the network watcher. :type network_watcher_name: str - :param target_resource_id: The ID of the target resource to perform - network configuration diagnostic. Valid options are VM, - NetworkInterface, VMSS/NetworkInterface and Application Gateway. - :type target_resource_id: str - :param queries: List of traffic queries. - :type queries: - list[~azure.mgmt.network.v2018_08_01.models.TrafficQuery] + :param parameters: Parameters to get network configuration diagnostic. + :type parameters: + ~azure.mgmt.network.v2018_08_01.models.NetworkConfigurationDiagnosticParameters :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 @@ -1645,8 +1639,7 @@ def get_network_configuration_diagnostic( raw_result = self._get_network_configuration_diagnostic_initial( resource_group_name=resource_group_name, network_watcher_name=network_watcher_name, - target_resource_id=target_resource_id, - queries=queries, + parameters=parameters, custom_headers=custom_headers, raw=True, **operation_config diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/virtual_networks_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/virtual_networks_operations.py index 01a8ef3d9852..b153a6796482 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/virtual_networks_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/virtual_networks_operations.py @@ -522,7 +522,7 @@ def internal_paging(next_link=None, raw=False): list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks'} def check_ip_address_availability( - self, resource_group_name, virtual_network_name, ip_address=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, virtual_network_name, ip_address, custom_headers=None, raw=False, **operation_config): """Checks whether a private IP address is available for use. :param resource_group_name: The name of the resource group. @@ -553,8 +553,7 @@ def check_ip_address_availability( # Construct parameters query_parameters = {} - if ip_address is not None: - query_parameters['ipAddress'] = self._serialize.query("ip_address", ip_address, 'str') + query_parameters['ipAddress'] = self._serialize.query("ip_address", ip_address, 'str') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers