Update from release/v3

AzureSDKAutomation · Jul 9, 2020 · c9d20c0 · c9d20c0
1 parent cb050d5
commit c9d20c0
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 1,424 deletions.
diff --git a/sdk/network/azure-mgmt-network/azure/mgmt/network/_network_management_client.py b/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)))
diff --git a/sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_05_01/_network_management_client.py b/sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_05_01/_network_management_client.py
@@ -114,7 +114,6 @@
 from .operations import VirtualHubBgpConnectionsOperations
 from .operations import VirtualHubIpConfigurationOperations
 from .operations import HubRouteTablesOperations
-from .operations import WebApplicationFirewallPoliciesOperations
 from . import models
 
 
@@ -324,8 +323,6 @@ class NetworkManagementClient(NetworkManagementClientOperationsMixin, SDKClient)
     :vartype virtual_hub_ip_configuration: azure.mgmt.network.v2020_05_01.operations.VirtualHubIpConfigurationOperations
     :ivar hub_route_tables: HubRouteTables operations
     :vartype hub_route_tables: azure.mgmt.network.v2020_05_01.operations.HubRouteTablesOperations
-    :ivar web_application_firewall_policies: WebApplicationFirewallPolicies operations
-    :vartype web_application_firewall_policies: azure.mgmt.network.v2020_05_01.operations.WebApplicationFirewallPoliciesOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -547,5 +544,3 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.hub_route_tables = HubRouteTablesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.web_application_firewall_policies = WebApplicationFirewallPoliciesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
diff --git a/sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_05_01/models/__init__.py b/sdk/network/azure-mgmt-network/azure/mgmt/network/v2020_05_01/models/__init__.py
@@ -243,15 +243,9 @@
     from ._models_py3 import LoadBalancingRule
     from ._models_py3 import LocalNetworkGateway
     from ._models_py3 import LogSpecification
-    from ._models_py3 import ManagedRuleGroupOverride
-    from ._models_py3 import ManagedRuleOverride
-    from ._models_py3 import ManagedRulesDefinition
-    from ._models_py3 import ManagedRuleSet
     from ._models_py3 import ManagedServiceIdentity
     from ._models_py3 import ManagedServiceIdentityUserAssignedIdentitiesValue
-    from ._models_py3 import MatchCondition
     from ._models_py3 import MatchedRule
-    from ._models_py3 import MatchVariable
     from ._models_py3 import MetricSpecification
     from ._models_py3 import NatGateway
     from ._models_py3 import NatGatewaySku
@@ -284,7 +278,6 @@
     from ._models_py3 import OperationDisplay
     from ._models_py3 import OperationPropertiesFormatServiceSpecification
     from ._models_py3 import OutboundRule
-    from ._models_py3 import OwaspCrsExclusionEntry
     from ._models_py3 import P2SConnectionConfiguration
     from ._models_py3 import P2SVpnConnectionHealth
     from ._models_py3 import P2SVpnConnectionHealthRequest
@@ -300,7 +293,6 @@
     from ._models_py3 import PatchRouteFilter
     from ._models_py3 import PatchRouteFilterRule
     from ._models_py3 import PeerExpressRouteCircuitConnection
-    from ._models_py3 import PolicySettings
     from ._models_py3 import PrepareNetworkPoliciesRequest
     from ._models_py3 import PrivateDnsZoneConfig
     from ._models_py3 import PrivateDnsZoneGroup
@@ -430,8 +422,6 @@
     from ._models_py3 import VpnSiteId
     from ._models_py3 import VpnSiteLink
     from ._models_py3 import VpnSiteLinkConnection
-    from ._models_py3 import WebApplicationFirewallCustomRule
-    from ._models_py3 import WebApplicationFirewallPolicy
 except (SyntaxError, ImportError):
     from ._models import AadAuthenticationParameters
     from ._models import AddressSpace
@@ -666,15 +656,9 @@
     from ._models import LoadBalancingRule
     from ._models import LocalNetworkGateway
     from ._models import LogSpecification
-    from ._models import ManagedRuleGroupOverride
-    from ._models import ManagedRuleOverride
-    from ._models import ManagedRulesDefinition
-    from ._models import ManagedRuleSet
     from ._models import ManagedServiceIdentity
     from ._models import ManagedServiceIdentityUserAssignedIdentitiesValue
-    from ._models import MatchCondition
     from ._models import MatchedRule
-    from ._models import MatchVariable
     from ._models import MetricSpecification
     from ._models import NatGateway
     from ._models import NatGatewaySku
@@ -707,7 +691,6 @@
     from ._models import OperationDisplay
     from ._models import OperationPropertiesFormatServiceSpecification
     from ._models import OutboundRule
-    from ._models import OwaspCrsExclusionEntry
     from ._models import P2SConnectionConfiguration
     from ._models import P2SVpnConnectionHealth
     from ._models import P2SVpnConnectionHealthRequest
@@ -723,7 +706,6 @@
     from ._models import PatchRouteFilter
     from ._models import PatchRouteFilterRule
     from ._models import PeerExpressRouteCircuitConnection
-    from ._models import PolicySettings
     from ._models import PrepareNetworkPoliciesRequest
     from ._models import PrivateDnsZoneConfig
     from ._models import PrivateDnsZoneGroup
@@ -853,8 +835,6 @@
     from ._models import VpnSiteId
     from ._models import VpnSiteLink
     from ._models import VpnSiteLinkConnection
-    from ._models import WebApplicationFirewallCustomRule
-    from ._models import WebApplicationFirewallPolicy
 from ._paged_models import ApplicationGatewayPaged
 from ._paged_models import ApplicationGatewayPrivateEndpointConnectionPaged
 from ._paged_models import ApplicationGatewayPrivateLinkResourcePaged
@@ -948,7 +928,6 @@
 from ._paged_models import VpnSiteLinkConnectionPaged
 from ._paged_models import VpnSiteLinkPaged
 from ._paged_models import VpnSitePaged
-from ._paged_models import WebApplicationFirewallPolicyPaged
 from ._network_management_client_enums import (
     ApplicationGatewayProtocol,
     ProvisioningState,
@@ -1070,17 +1049,6 @@
     HubVirtualNetworkConnectionStatus,
     VpnGatewayTunnelingProtocol,
     VpnAuthenticationType,
-    WebApplicationFirewallEnabledState,
-    WebApplicationFirewallMode,
-    WebApplicationFirewallRuleType,
-    WebApplicationFirewallMatchVariable,
-    WebApplicationFirewallOperator,
-    WebApplicationFirewallTransform,
-    WebApplicationFirewallAction,
-    WebApplicationFirewallPolicyResourceState,
-    OwaspCrsExclusionEntryMatchVariable,
-    OwaspCrsExclusionEntrySelectorMatchOperator,
-    ManagedRuleEnabledState,
 )
 
 __all__ = [
@@ -1317,15 +1285,9 @@
     'LoadBalancingRule',
     'LocalNetworkGateway',
     'LogSpecification',
-    'ManagedRuleGroupOverride',
-    'ManagedRuleOverride',
-    'ManagedRulesDefinition',
-    'ManagedRuleSet',
     'ManagedServiceIdentity',
     'ManagedServiceIdentityUserAssignedIdentitiesValue',
-    'MatchCondition',
     'MatchedRule',
-    'MatchVariable',
     'MetricSpecification',
     'NatGateway',
     'NatGatewaySku',
@@ -1358,7 +1320,6 @@
     'OperationDisplay',
     'OperationPropertiesFormatServiceSpecification',
     'OutboundRule',
-    'OwaspCrsExclusionEntry',
     'P2SConnectionConfiguration',
     'P2SVpnConnectionHealth',
     'P2SVpnConnectionHealthRequest',
@@ -1374,7 +1335,6 @@
     'PatchRouteFilter',
     'PatchRouteFilterRule',
     'PeerExpressRouteCircuitConnection',
-    'PolicySettings',
     'PrepareNetworkPoliciesRequest',
     'PrivateDnsZoneConfig',
     'PrivateDnsZoneGroup',
@@ -1504,8 +1464,6 @@
     'VpnSiteId',
     'VpnSiteLink',
     'VpnSiteLinkConnection',
-    'WebApplicationFirewallCustomRule',
-    'WebApplicationFirewallPolicy',
     'ApplicationGatewayPaged',
     'ApplicationGatewaySslPredefinedPolicyPaged',
     'ApplicationGatewayPrivateLinkResourcePaged',
@@ -1599,7 +1557,6 @@
     'BgpConnectionPaged',
     'HubIpConfigurationPaged',
     'HubRouteTablePaged',
-    'WebApplicationFirewallPolicyPaged',
     'ApplicationGatewayProtocol',
     'ProvisioningState',
     'IPAllocationMethod',
@@ -1720,15 +1677,4 @@
     'HubVirtualNetworkConnectionStatus',
     'VpnGatewayTunnelingProtocol',
     'VpnAuthenticationType',
-    'WebApplicationFirewallEnabledState',
-    'WebApplicationFirewallMode',
-    'WebApplicationFirewallRuleType',
-    'WebApplicationFirewallMatchVariable',
-    'WebApplicationFirewallOperator',
-    'WebApplicationFirewallTransform',
-    'WebApplicationFirewallAction',
-    'WebApplicationFirewallPolicyResourceState',
-    'OwaspCrsExclusionEntryMatchVariable',
-    'OwaspCrsExclusionEntrySelectorMatchOperator',
-    'ManagedRuleEnabledState',
 ]