Update from release/v3

Author: SDK Automation

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

@@ -55,6 +55,7 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, MultiApiCl
             'interface_endpoints': '2019-02-01',
             'p2s_vpn_server_configurations': '2019-07-01',
             'virtual_wa_ns': '2018-07-01',
+            'web_application_firewall_policies': '2020-04-01',
         }},
         _PROFILE_TAG + " latest"
     )
@@ -6380,7 +6381,6 @@ def web_application_firewall_policies(self):
            * 2019-12-01: :class:`WebApplicationFirewallPoliciesOperations<azure.mgmt.network.v2019_12_01.operations.WebApplicationFirewallPoliciesOperations>`
            * 2020-03-01: :class:`WebApplicationFirewallPoliciesOperations<azure.mgmt.network.v2020_03_01.operations.WebApplicationFirewallPoliciesOperations>`
            * 2020-04-01: :class:`WebApplicationFirewallPoliciesOperations<azure.mgmt.network.v2020_04_01.operations.WebApplicationFirewallPoliciesOperations>`
-           * 2020-05-01: :class:`WebApplicationFirewallPoliciesOperations<azure.mgmt.network.v2020_05_01.operations.WebApplicationFirewallPoliciesOperations>`
         """
         api_version = self._get_api_version('web_application_firewall_policies')
         if api_version == '2018-12-01':
@@ -6405,8 +6405,6 @@ def web_application_firewall_policies(self):
             from .v2020_03_01.operations import WebApplicationFirewallPoliciesOperations as OperationClass
         elif api_version == '2020-04-01':
             from .v2020_04_01.operations import WebApplicationFirewallPoliciesOperations as OperationClass
-        elif api_version == '2020-05-01':
-            from .v2020_05_01.operations import WebApplicationFirewallPoliciesOperations 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)))

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

@@ -936,7 +936,6 @@
     ExpressRouteLinkConnectorType,
     ExpressRouteLinkAdminState,
     ExpressRoutePortsEncapsulation,
-    FirewallPolicyIntrusionSystemMode,
     FirewallPolicyNatRuleActionType,
     FirewallPolicyFilterRuleActionType,
     FirewallPolicyRuleConditionApplicationProtocolType,
@@ -1549,7 +1548,6 @@
     'ExpressRouteLinkConnectorType',
     'ExpressRouteLinkAdminState',
     'ExpressRoutePortsEncapsulation',
-    'FirewallPolicyIntrusionSystemMode',
     'FirewallPolicyNatRuleActionType',
     'FirewallPolicyFilterRuleActionType',
     'FirewallPolicyRuleConditionApplicationProtocolType',

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

@@ -7716,10 +7716,6 @@ class FirewallPolicy(Resource):
      Possible values include: 'Alert', 'Deny', 'Off'
     :type threat_intel_mode: str or
      ~azure.mgmt.network.v2020_03_01.models.AzureFirewallThreatIntelMode
-    :param intrusion_system_mode: The operation mode for Intrusion system.
-     Possible values include: 'Enabled', 'Disabled'
-    :type intrusion_system_mode: str or
-     ~azure.mgmt.network.v2020_03_01.models.FirewallPolicyIntrusionSystemMode
     :ivar etag: A unique read-only string that changes whenever the resource
      is updated.
     :vartype etag: str
@@ -7747,7 +7743,6 @@ class FirewallPolicy(Resource):
         'firewalls': {'key': 'properties.firewalls', 'type': '[SubResource]'},
         'child_policies': {'key': 'properties.childPolicies', 'type': '[SubResource]'},
         'threat_intel_mode': {'key': 'properties.threatIntelMode', 'type': 'str'},
-        'intrusion_system_mode': {'key': 'properties.intrusionSystemMode', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
@@ -7759,7 +7754,6 @@ def __init__(self, **kwargs):
         self.firewalls = None
         self.child_policies = None
         self.threat_intel_mode = kwargs.get('threat_intel_mode', None)
-        self.intrusion_system_mode = kwargs.get('intrusion_system_mode', None)
         self.etag = None
 
 

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

@@ -7716,10 +7716,6 @@ class FirewallPolicy(Resource):
      Possible values include: 'Alert', 'Deny', 'Off'
     :type threat_intel_mode: str or
      ~azure.mgmt.network.v2020_03_01.models.AzureFirewallThreatIntelMode
-    :param intrusion_system_mode: The operation mode for Intrusion system.
-     Possible values include: 'Enabled', 'Disabled'
-    :type intrusion_system_mode: str or
-     ~azure.mgmt.network.v2020_03_01.models.FirewallPolicyIntrusionSystemMode
     :ivar etag: A unique read-only string that changes whenever the resource
      is updated.
     :vartype etag: str
@@ -7747,19 +7743,17 @@ class FirewallPolicy(Resource):
         'firewalls': {'key': 'properties.firewalls', 'type': '[SubResource]'},
         'child_policies': {'key': 'properties.childPolicies', 'type': '[SubResource]'},
         'threat_intel_mode': {'key': 'properties.threatIntelMode', 'type': 'str'},
-        'intrusion_system_mode': {'key': 'properties.intrusionSystemMode', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, location: str=None, tags=None, base_policy=None, threat_intel_mode=None, intrusion_system_mode=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, location: str=None, tags=None, base_policy=None, threat_intel_mode=None, **kwargs) -> None:
         super(FirewallPolicy, self).__init__(id=id, location=location, tags=tags, **kwargs)
         self.rule_groups = None
         self.provisioning_state = None
         self.base_policy = base_policy
         self.firewalls = None
         self.child_policies = None
         self.threat_intel_mode = threat_intel_mode
-        self.intrusion_system_mode = intrusion_system_mode
         self.etag = None
 
 

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

@@ -373,12 +373,6 @@ class ExpressRoutePortsEncapsulation(str, Enum):
     qin_q = "QinQ"
 
 
-class FirewallPolicyIntrusionSystemMode(str, Enum):
-
-    enabled = "Enabled"
-    disabled = "Disabled"
-
-
 class FirewallPolicyNatRuleActionType(str, Enum):
 
     dnat = "DNAT"

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

@@ -188,7 +188,6 @@
     from ._models_py3 import ExpressRouteServiceProvider
     from ._models_py3 import ExpressRouteServiceProviderBandwidthsOffered
     from ._models_py3 import FirewallPolicy
-    from ._models_py3 import FirewallPolicyCertificateAuthority
     from ._models_py3 import FirewallPolicyFilterRule
     from ._models_py3 import FirewallPolicyFilterRuleAction
     from ._models_py3 import FirewallPolicyNatRule
@@ -198,8 +197,6 @@
     from ._models_py3 import FirewallPolicyRuleConditionApplicationProtocol
     from ._models_py3 import FirewallPolicyRuleGroup
     from ._models_py3 import FirewallPolicyThreatIntelWhitelist
-    from ._models_py3 import FirewallPolicyTransportSecurity
-    from ._models_py3 import FirewallPolicyTrustedRootCertificate
     from ._models_py3 import FlowLog
     from ._models_py3 import FlowLogFormatParameters
     from ._models_py3 import FlowLogInformation
@@ -594,7 +591,6 @@
     from ._models import ExpressRouteServiceProvider
     from ._models import ExpressRouteServiceProviderBandwidthsOffered
     from ._models import FirewallPolicy
-    from ._models import FirewallPolicyCertificateAuthority
     from ._models import FirewallPolicyFilterRule
     from ._models import FirewallPolicyFilterRuleAction
     from ._models import FirewallPolicyNatRule
@@ -604,8 +600,6 @@
     from ._models import FirewallPolicyRuleConditionApplicationProtocol
     from ._models import FirewallPolicyRuleGroup
     from ._models import FirewallPolicyThreatIntelWhitelist
-    from ._models import FirewallPolicyTransportSecurity
-    from ._models import FirewallPolicyTrustedRootCertificate
     from ._models import FlowLog
     from ._models import FlowLogFormatParameters
     from ._models import FlowLogInformation
@@ -959,7 +953,6 @@
     ExpressRouteLinkConnectorType,
     ExpressRouteLinkAdminState,
     ExpressRoutePortsEncapsulation,
-    FirewallPolicyIntrusionSystemMode,
     FirewallPolicyNatRuleActionType,
     FirewallPolicyFilterRuleActionType,
     FirewallPolicyRuleConditionApplicationProtocolType,
@@ -1220,7 +1213,6 @@
     'ExpressRouteServiceProvider',
     'ExpressRouteServiceProviderBandwidthsOffered',
     'FirewallPolicy',
-    'FirewallPolicyCertificateAuthority',
     'FirewallPolicyFilterRule',
     'FirewallPolicyFilterRuleAction',
     'FirewallPolicyNatRule',
@@ -1230,8 +1222,6 @@
     'FirewallPolicyRuleConditionApplicationProtocol',
     'FirewallPolicyRuleGroup',
     'FirewallPolicyThreatIntelWhitelist',
-    'FirewallPolicyTransportSecurity',
-    'FirewallPolicyTrustedRootCertificate',
     'FlowLog',
     'FlowLogFormatParameters',
     'FlowLogInformation',
@@ -1584,7 +1574,6 @@
     'ExpressRouteLinkConnectorType',
     'ExpressRouteLinkAdminState',
     'ExpressRoutePortsEncapsulation',
-    'FirewallPolicyIntrusionSystemMode',
     'FirewallPolicyNatRuleActionType',
     'FirewallPolicyFilterRuleActionType',
     'FirewallPolicyRuleConditionApplicationProtocolType',

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

@@ -2316,8 +2316,6 @@ class ApplicationRuleCondition(FirewallPolicyRuleCondition):
     :param protocols: Array of Application Protocols.
     :type protocols:
      list[~azure.mgmt.network.v2020_04_01.models.FirewallPolicyRuleConditionApplicationProtocol]
-    :param target_urls: List of Urls for this rule condition.
-    :type target_urls: list[str]
     :param target_fqdns: List of FQDNs for this rule condition.
     :type target_fqdns: list[str]
     :param fqdn_tags: List of FQDN Tags for this rule condition.
@@ -2337,7 +2335,6 @@ class ApplicationRuleCondition(FirewallPolicyRuleCondition):
         'source_addresses': {'key': 'sourceAddresses', 'type': '[str]'},
         'destination_addresses': {'key': 'destinationAddresses', 'type': '[str]'},
         'protocols': {'key': 'protocols', 'type': '[FirewallPolicyRuleConditionApplicationProtocol]'},
-        'target_urls': {'key': 'targetUrls', 'type': '[str]'},
         'target_fqdns': {'key': 'targetFqdns', 'type': '[str]'},
         'fqdn_tags': {'key': 'fqdnTags', 'type': '[str]'},
         'source_ip_groups': {'key': 'sourceIpGroups', 'type': '[str]'},
@@ -2348,7 +2345,6 @@ def __init__(self, **kwargs):
         self.source_addresses = kwargs.get('source_addresses', None)
         self.destination_addresses = kwargs.get('destination_addresses', None)
         self.protocols = kwargs.get('protocols', None)
-        self.target_urls = kwargs.get('target_urls', None)
         self.target_fqdns = kwargs.get('target_fqdns', None)
         self.fqdn_tags = kwargs.get('fqdn_tags', None)
         self.source_ip_groups = kwargs.get('source_ip_groups', None)
@@ -3534,13 +3530,13 @@ class BackendAddressPool(SubResource):
 
     :param id: Resource ID.
     :type id: str
+    :param load_balancer_backend_addresses: An array of backend addresses.
+    :type load_balancer_backend_addresses:
+     list[~azure.mgmt.network.v2020_04_01.models.LoadBalancerBackendAddress]
     :ivar backend_ip_configurations: An array of references to IP addresses
      defined in network interfaces.
     :vartype backend_ip_configurations:
      list[~azure.mgmt.network.v2020_04_01.models.NetworkInterfaceIPConfiguration]
-    :param load_balancer_backend_addresses: An array of backend addresses.
-    :type load_balancer_backend_addresses:
-     list[~azure.mgmt.network.v2020_04_01.models.LoadBalancerBackendAddress]
     :ivar load_balancing_rules: An array of references to load balancing rules
      that use this backend address pool.
     :vartype load_balancing_rules:
@@ -3580,8 +3576,8 @@ class BackendAddressPool(SubResource):
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
-        'backend_ip_configurations': {'key': 'properties.backendIPConfigurations', 'type': '[NetworkInterfaceIPConfiguration]'},
         'load_balancer_backend_addresses': {'key': 'properties.loadBalancerBackendAddresses', 'type': '[LoadBalancerBackendAddress]'},
+        'backend_ip_configurations': {'key': 'properties.backendIPConfigurations', 'type': '[NetworkInterfaceIPConfiguration]'},
         'load_balancing_rules': {'key': 'properties.loadBalancingRules', 'type': '[SubResource]'},
         'outbound_rule': {'key': 'properties.outboundRule', 'type': 'SubResource'},
         'outbound_rules': {'key': 'properties.outboundRules', 'type': '[SubResource]'},
@@ -3593,8 +3589,8 @@ class BackendAddressPool(SubResource):
 
     def __init__(self, **kwargs):
         super(BackendAddressPool, self).__init__(**kwargs)
-        self.backend_ip_configurations = None
         self.load_balancer_backend_addresses = kwargs.get('load_balancer_backend_addresses', None)
+        self.backend_ip_configurations = None
         self.load_balancing_rules = None
         self.outbound_rule = None
         self.outbound_rules = None
@@ -7738,19 +7734,9 @@ class FirewallPolicy(Resource):
     :param threat_intel_whitelist: ThreatIntel Whitelist for Firewall Policy.
     :type threat_intel_whitelist:
      ~azure.mgmt.network.v2020_04_01.models.FirewallPolicyThreatIntelWhitelist
-    :param intrusion_system_mode: The operation mode for Intrusion system.
-     Possible values include: 'Enabled', 'Disabled'
-    :type intrusion_system_mode: str or
-     ~azure.mgmt.network.v2020_04_01.models.FirewallPolicyIntrusionSystemMode
-    :param transport_security: TLS Configuration definition.
-    :type transport_security:
-     ~azure.mgmt.network.v2020_04_01.models.FirewallPolicyTransportSecurity
     :ivar etag: A unique read-only string that changes whenever the resource
      is updated.
     :vartype etag: str
-    :param identity: The identity of the firewall policy.
-    :type identity:
-     ~azure.mgmt.network.v2020_04_01.models.ManagedServiceIdentity
     """
 
     _validation = {
@@ -7776,10 +7762,7 @@ class FirewallPolicy(Resource):
         'child_policies': {'key': 'properties.childPolicies', 'type': '[SubResource]'},
         'threat_intel_mode': {'key': 'properties.threatIntelMode', 'type': 'str'},
         'threat_intel_whitelist': {'key': 'properties.threatIntelWhitelist', 'type': 'FirewallPolicyThreatIntelWhitelist'},
-        'intrusion_system_mode': {'key': 'properties.intrusionSystemMode', 'type': 'str'},
-        'transport_security': {'key': 'properties.transportSecurity', 'type': 'FirewallPolicyTransportSecurity'},
         'etag': {'key': 'etag', 'type': 'str'},
-        'identity': {'key': 'identity', 'type': 'ManagedServiceIdentity'},
     }
 
     def __init__(self, **kwargs):
@@ -7791,31 +7774,7 @@ def __init__(self, **kwargs):
         self.child_policies = None
         self.threat_intel_mode = kwargs.get('threat_intel_mode', None)
         self.threat_intel_whitelist = kwargs.get('threat_intel_whitelist', None)
-        self.intrusion_system_mode = kwargs.get('intrusion_system_mode', None)
-        self.transport_security = kwargs.get('transport_security', None)
         self.etag = None
-        self.identity = kwargs.get('identity', None)
-
-
-class FirewallPolicyCertificateAuthority(Model):
-    """Trusted Root certificates properties for tls.
-
-    :param key_vault_secret_id: Secret Id of (base-64 encoded unencrypted pfx)
-     'Secret' or 'Certificate' object stored in KeyVault.
-    :type key_vault_secret_id: str
-    :param name: Name of the CA certificate.
-    :type name: str
-    """
-
-    _attribute_map = {
-        'key_vault_secret_id': {'key': 'properties.keyVaultSecretId', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(FirewallPolicyCertificateAuthority, self).__init__(**kwargs)
-        self.key_vault_secret_id = kwargs.get('key_vault_secret_id', None)
-        self.name = kwargs.get('name', None)
 
 
 class FirewallPolicyRule(Model):
@@ -8077,56 +8036,6 @@ def __init__(self, **kwargs):
         self.fqdns = kwargs.get('fqdns', None)
 
 
-class FirewallPolicyTransportSecurity(Model):
-    """Configuration needed to perform TLS termination & initiation.
-
-    :param certificate_authority: The CA used for intermediate CA generation.
-    :type certificate_authority:
-     ~azure.mgmt.network.v2020_04_01.models.FirewallPolicyCertificateAuthority
-    :param excluded_domains: List of domains which are excluded from TLS
-     termination.
-    :type excluded_domains: list[str]
-    :param trusted_root_certificates: Certificates which are to be trusted by
-     the firewall.
-    :type trusted_root_certificates:
-     list[~azure.mgmt.network.v2020_04_01.models.FirewallPolicyTrustedRootCertificate]
-    """
-
-    _attribute_map = {
-        'certificate_authority': {'key': 'certificateAuthority', 'type': 'FirewallPolicyCertificateAuthority'},
-        'excluded_domains': {'key': 'excludedDomains', 'type': '[str]'},
-        'trusted_root_certificates': {'key': 'trustedRootCertificates', 'type': '[FirewallPolicyTrustedRootCertificate]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(FirewallPolicyTransportSecurity, self).__init__(**kwargs)
-        self.certificate_authority = kwargs.get('certificate_authority', None)
-        self.excluded_domains = kwargs.get('excluded_domains', None)
-        self.trusted_root_certificates = kwargs.get('trusted_root_certificates', None)
-
-
-class FirewallPolicyTrustedRootCertificate(Model):
-    """Trusted Root certificates of a firewall policy.
-
-    :param key_vault_secret_id: Secret Id of (base-64 encoded unencrypted pfx)
-     the public certificate data stored in KeyVault.
-    :type key_vault_secret_id: str
-    :param name: Name of the trusted root certificate that is unique within a
-     firewall policy.
-    :type name: str
-    """
-
-    _attribute_map = {
-        'key_vault_secret_id': {'key': 'properties.keyVaultSecretId', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(FirewallPolicyTrustedRootCertificate, self).__init__(**kwargs)
-        self.key_vault_secret_id = kwargs.get('key_vault_secret_id', None)
-        self.name = kwargs.get('name', None)
-
-
 class FlowLog(Resource):
     """A flow log resource.
 
@@ -10294,8 +10203,6 @@ class NatRuleCondition(FirewallPolicyRuleCondition):
     :type destination_ports: list[str]
     :param source_ip_groups: List of source IpGroups for this rule.
     :type source_ip_groups: list[str]
-    :param terminate_tls: Terminate TLS connections for this rule.
-    :type terminate_tls: bool
     """
 
     _validation = {
@@ -10311,7 +10218,6 @@ class NatRuleCondition(FirewallPolicyRuleCondition):
         'destination_addresses': {'key': 'destinationAddresses', 'type': '[str]'},
         'destination_ports': {'key': 'destinationPorts', 'type': '[str]'},
         'source_ip_groups': {'key': 'sourceIpGroups', 'type': '[str]'},
-        'terminate_tls': {'key': 'terminateTLS', 'type': 'bool'},
     }
 
     def __init__(self, **kwargs):
@@ -10321,7 +10227,6 @@ def __init__(self, **kwargs):
         self.destination_addresses = kwargs.get('destination_addresses', None)
         self.destination_ports = kwargs.get('destination_ports', None)
         self.source_ip_groups = kwargs.get('source_ip_groups', None)
-        self.terminate_tls = kwargs.get('terminate_tls', None)
         self.rule_condition_type = 'NatRuleCondition'