[Network] WAF Add extended WAF functionality to Application Gateway

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

@@ -26,6 +26,7 @@
 from .network_interface_ip_configuration import NetworkInterfaceIPConfiguration
 from .application_gateway_backend_address import ApplicationGatewayBackendAddress
 from .application_gateway_backend_address_pool import ApplicationGatewayBackendAddressPool
+from .application_gateway_connection_draining import ApplicationGatewayConnectionDraining
 from .application_gateway_backend_http_settings import ApplicationGatewayBackendHttpSettings
 from .application_gateway_backend_health_server import ApplicationGatewayBackendHealthServer
 from .application_gateway_backend_health_http_settings import ApplicationGatewayBackendHealthHttpSettings
@@ -43,14 +44,21 @@
 from .application_gateway_probe import ApplicationGatewayProbe
 from .application_gateway_request_routing_rule import ApplicationGatewayRequestRoutingRule
 from .application_gateway_url_path_map import ApplicationGatewayUrlPathMap
+from .application_gateway_firewall_disabled_rule_group import ApplicationGatewayFirewallDisabledRuleGroup
 from .application_gateway_web_application_firewall_configuration import ApplicationGatewayWebApplicationFirewallConfiguration
 from .application_gateway import ApplicationGateway
+from .application_gateway_firewall_rule import ApplicationGatewayFirewallRule
+from .application_gateway_firewall_rule_group import ApplicationGatewayFirewallRuleGroup
+from .application_gateway_firewall_rule_set import ApplicationGatewayFirewallRuleSet
+from .application_gateway_available_waf_rule_sets_result import ApplicationGatewayAvailableWafRuleSetsResult
 from .resource import Resource
 from .dns_name_availability_result import DnsNameAvailabilityResult
 from .express_route_circuit_authorization import ExpressRouteCircuitAuthorization
 from .express_route_circuit_peering_config import ExpressRouteCircuitPeeringConfig
 from .express_route_circuit_stats import ExpressRouteCircuitStats
+from .route_filter_rule import RouteFilterRule
 from .express_route_circuit_peering import ExpressRouteCircuitPeering
+from .route_filter import RouteFilter
 from .express_route_circuit_sku import ExpressRouteCircuitSku
 from .express_route_circuit_service_provider_properties import ExpressRouteCircuitServiceProviderProperties
 from .express_route_circuit import ExpressRouteCircuit
@@ -106,6 +114,10 @@
 from .retention_policy_parameters import RetentionPolicyParameters
 from .flow_log_status_parameters import FlowLogStatusParameters
 from .flow_log_information import FlowLogInformation
+from .patch_route_filter_rule import PatchRouteFilterRule
+from .patch_route_filter import PatchRouteFilter
+from .bgp_community import BGPCommunity
+from .bgp_service_community import BgpServiceCommunity
 from .usage_name import UsageName
 from .usage import Usage
 from .virtual_network_peering import VirtualNetworkPeering
@@ -127,6 +139,7 @@
 from .gateway_route_list_result import GatewayRouteListResult
 from .tunnel_connection_health import TunnelConnectionHealth
 from .local_network_gateway import LocalNetworkGateway
+from .ipsec_policy import IpsecPolicy
 from .virtual_network_gateway_connection import VirtualNetworkGatewayConnection
 from .connection_reset_shared_key import ConnectionResetSharedKey
 from .connection_shared_key import ConnectionSharedKey
@@ -142,8 +155,11 @@
 from .network_watcher_paged import NetworkWatcherPaged
 from .packet_capture_result_paged import PacketCaptureResultPaged
 from .public_ip_address_paged import PublicIPAddressPaged
+from .route_filter_paged import RouteFilterPaged
+from .route_filter_rule_paged import RouteFilterRulePaged
 from .route_table_paged import RouteTablePaged
 from .route_paged import RoutePaged
+from .bgp_service_community_paged import BgpServiceCommunityPaged
 from .usage_paged import UsagePaged
 from .virtual_network_paged import VirtualNetworkPaged
 from .subnet_paged import SubnetPaged
@@ -172,6 +188,7 @@
     ExpressRouteCircuitPeeringAdvertisedPublicPrefixState,
     ExpressRouteCircuitPeeringType,
     ExpressRouteCircuitPeeringState,
+    Access,
     ExpressRouteCircuitSkuTier,
     ExpressRouteCircuitSkuFamily,
     ServiceProviderProvisioningState,
@@ -184,7 +201,6 @@
     AssociationType,
     Direction,
     Protocol,
-    Access,
     NextHopType,
     PcProtocol,
     PcStatus,
@@ -198,6 +214,12 @@
     ProcessorArchitecture,
     VirtualNetworkGatewayConnectionStatus,
     VirtualNetworkGatewayConnectionType,
+    IpsecEncryption,
+    IpsecIntegrity,
+    IkeEncryption,
+    IkeIntegrity,
+    DhGroup,
+    PfsGroup,
 )
 
 __all__ = [
@@ -218,6 +240,7 @@
     'NetworkInterfaceIPConfiguration',
     'ApplicationGatewayBackendAddress',
     'ApplicationGatewayBackendAddressPool',
+    'ApplicationGatewayConnectionDraining',
     'ApplicationGatewayBackendHttpSettings',
     'ApplicationGatewayBackendHealthServer',
     'ApplicationGatewayBackendHealthHttpSettings',
@@ -235,14 +258,21 @@
     'ApplicationGatewayProbe',
     'ApplicationGatewayRequestRoutingRule',
     'ApplicationGatewayUrlPathMap',
+    'ApplicationGatewayFirewallDisabledRuleGroup',
     'ApplicationGatewayWebApplicationFirewallConfiguration',
     'ApplicationGateway',
+    'ApplicationGatewayFirewallRule',
+    'ApplicationGatewayFirewallRuleGroup',
+    'ApplicationGatewayFirewallRuleSet',
+    'ApplicationGatewayAvailableWafRuleSetsResult',
     'Resource',
     'DnsNameAvailabilityResult',
     'ExpressRouteCircuitAuthorization',
     'ExpressRouteCircuitPeeringConfig',
     'ExpressRouteCircuitStats',
+    'RouteFilterRule',
     'ExpressRouteCircuitPeering',
+    'RouteFilter',
     'ExpressRouteCircuitSku',
     'ExpressRouteCircuitServiceProviderProperties',
     'ExpressRouteCircuit',
@@ -298,6 +328,10 @@
     'RetentionPolicyParameters',
     'FlowLogStatusParameters',
     'FlowLogInformation',
+    'PatchRouteFilterRule',
+    'PatchRouteFilter',
+    'BGPCommunity',
+    'BgpServiceCommunity',
     'UsageName',
     'Usage',
     'VirtualNetworkPeering',
@@ -319,6 +353,7 @@
     'GatewayRouteListResult',
     'TunnelConnectionHealth',
     'LocalNetworkGateway',
+    'IpsecPolicy',
     'VirtualNetworkGatewayConnection',
     'ConnectionResetSharedKey',
     'ConnectionSharedKey',
@@ -334,8 +369,11 @@
     'NetworkWatcherPaged',
     'PacketCaptureResultPaged',
     'PublicIPAddressPaged',
+    'RouteFilterPaged',
+    'RouteFilterRulePaged',
     'RouteTablePaged',
     'RoutePaged',
+    'BgpServiceCommunityPaged',
     'UsagePaged',
     'VirtualNetworkPaged',
     'SubnetPaged',
@@ -363,6 +401,7 @@
     'ExpressRouteCircuitPeeringAdvertisedPublicPrefixState',
     'ExpressRouteCircuitPeeringType',
     'ExpressRouteCircuitPeeringState',
+    'Access',
     'ExpressRouteCircuitSkuTier',
     'ExpressRouteCircuitSkuFamily',
     'ServiceProviderProvisioningState',
@@ -375,7 +414,6 @@
     'AssociationType',
     'Direction',
     'Protocol',
-    'Access',
     'NextHopType',
     'PcProtocol',
     'PcStatus',
@@ -389,4 +427,10 @@
     'ProcessorArchitecture',
     'VirtualNetworkGatewayConnectionStatus',
     'VirtualNetworkGatewayConnectionType',
+    'IpsecEncryption',
+    'IpsecIntegrity',
+    'IkeEncryption',
+    'IkeIntegrity',
+    'DhGroup',
+    'PfsGroup',
 ]

azure-mgmt-network/azure/mgmt/network/models/application_gateway.py

@@ -35,8 +35,7 @@ class ApplicationGateway(Resource):
     :type ssl_policy: :class:`ApplicationGatewaySslPolicy
      <azure.mgmt.network.models.ApplicationGatewaySslPolicy>`
     :ivar operational_state: Operational state of the application gateway
-     resource. Possible values are: 'Stopped', 'Started', 'Running', and
-     'Stopping'. Possible values include: 'Stopped', 'Starting', 'Running',
+     resource. Possible values include: 'Stopped', 'Starting', 'Running',
      'Stopping'
     :vartype operational_state: str or
      :class:`ApplicationGatewayOperationalState

azure-mgmt-network/azure/mgmt/network/models/application_gateway_available_waf_rule_sets_result.py

@@ -0,0 +1,28 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ApplicationGatewayAvailableWafRuleSetsResult(Model):
+    """Response for ApplicationGatewayAvailableWafRuleSets API service call.
+
+    :param value: The list of application gateway rule sets.
+    :type value: list of :class:`ApplicationGatewayFirewallRuleSet
+     <azure.mgmt.network.models.ApplicationGatewayFirewallRuleSet>`
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[ApplicationGatewayFirewallRuleSet]'},
+    }
+
+    def __init__(self, value=None):
+        self.value = value

azure-mgmt-network/azure/mgmt/network/models/application_gateway_backend_health_server.py

@@ -20,9 +20,8 @@ class ApplicationGatewayBackendHealthServer(Model):
     :param ip_configuration: Reference of IP configuration of backend server.
     :type ip_configuration: :class:`SubResource
      <azure.mgmt.network.models.SubResource>`
-    :param health: Health of backend server. Possible values are: 'Unknown',
-     'Up', 'Down', and 'Partial'. Possible values include: 'Unknown', 'Up',
-     'Down', 'Partial'
+    :param health: Health of backend server. Possible values include:
+     'Unknown', 'Up', 'Down', 'Partial', 'Draining'
     :type health: str or :class:`ApplicationGatewayBackendHealthServerHealth
      <azure.mgmt.network.models.ApplicationGatewayBackendHealthServerHealth>`
     """

azure-mgmt-network/azure/mgmt/network/models/application_gateway_backend_http_settings.py

@@ -19,12 +19,11 @@ class ApplicationGatewayBackendHttpSettings(SubResource):
     :type id: str
     :param port: Port
     :type port: int
-    :param protocol: Protocol. Possible values are: 'Http' and 'Https'.
-     Possible values include: 'Http', 'Https'
+    :param protocol: Protocol. Possible values include: 'Http', 'Https'
     :type protocol: str or :class:`ApplicationGatewayProtocol
      <azure.mgmt.network.models.ApplicationGatewayProtocol>`
-    :param cookie_based_affinity: Cookie based affinity. Possible values are:
-     'Enabled' and 'Disabled'. Possible values include: 'Enabled', 'Disabled'
+    :param cookie_based_affinity: Cookie based affinity. Possible values
+     include: 'Enabled', 'Disabled'
     :type cookie_based_affinity: str or
      :class:`ApplicationGatewayCookieBasedAffinity
      <azure.mgmt.network.models.ApplicationGatewayCookieBasedAffinity>`
@@ -41,6 +40,10 @@ class ApplicationGatewayBackendHttpSettings(SubResource):
     :param provisioning_state: Provisioning state of the backend http settings
      resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
     :type provisioning_state: str
+    :param connection_draining: Connection draining of the backend http
+     settings resource.
+    :type connection_draining: :class:`ApplicationGatewayConnectionDraining
+     <azure.mgmt.network.models.ApplicationGatewayConnectionDraining>`
     :param name: Name of the resource that is unique within a resource group.
      This name can be used to access the resource.
     :type name: str
@@ -58,11 +61,12 @@ class ApplicationGatewayBackendHttpSettings(SubResource):
         'probe': {'key': 'properties.probe', 'type': 'SubResource'},
         'authentication_certificates': {'key': 'properties.authenticationCertificates', 'type': '[SubResource]'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'connection_draining': {'key': 'properties.connectionDraining', 'type': 'ApplicationGatewayConnectionDraining'},
         'name': {'key': 'name', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, id=None, port=None, protocol=None, cookie_based_affinity=None, request_timeout=None, probe=None, authentication_certificates=None, provisioning_state=None, name=None, etag=None):
+    def __init__(self, id=None, port=None, protocol=None, cookie_based_affinity=None, request_timeout=None, probe=None, authentication_certificates=None, provisioning_state=None, connection_draining=None, name=None, etag=None):
         super(ApplicationGatewayBackendHttpSettings, self).__init__(id=id)
         self.port = port
         self.protocol = protocol
@@ -71,5 +75,6 @@ def __init__(self, id=None, port=None, protocol=None, cookie_based_affinity=None
         self.probe = probe
         self.authentication_certificates = authentication_certificates
         self.provisioning_state = provisioning_state
+        self.connection_draining = connection_draining
         self.name = name
         self.etag = etag

azure-mgmt-network/azure/mgmt/network/models/application_gateway_connection_draining.py

@@ -0,0 +1,39 @@
+# 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 ApplicationGatewayConnectionDraining(Model):
+    """Connection draining allows open connections to a backend server to be
+    active for a specified time after the backend server got removed from the
+    configuration.
+
+    :param enabled: Whether connection draining is enabled or not.
+    :type enabled: bool
+    :param drain_timeout_in_sec: The number of seconds connection draining is
+     active. Acceptable values are from 1 second to 3600 seconds.
+    :type drain_timeout_in_sec: int
+    """
+
+    _validation = {
+        'enabled': {'required': True},
+        'drain_timeout_in_sec': {'required': True, 'maximum': 3600, 'minimum': 1},
+    }
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'drain_timeout_in_sec': {'key': 'drainTimeoutInSec', 'type': 'int'},
+    }
+
+    def __init__(self, enabled, drain_timeout_in_sec):
+        self.enabled = enabled
+        self.drain_timeout_in_sec = drain_timeout_in_sec

azure-mgmt-network/azure/mgmt/network/models/application_gateway_firewall_disabled_rule_group.py

@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ApplicationGatewayFirewallDisabledRuleGroup(Model):
+    """Allows to disable rules within a rule group or an entire rule group.
+
+    :param rule_group_name: The name of the rule group that will be disabled.
+    :type rule_group_name: str
+    :param rules: The list of rules that will be disabled. If null, all rules
+     of the rule group will be disabled.
+    :type rules: list of int
+    """
+
+    _validation = {
+        'rule_group_name': {'required': True},
+    }
+
+    _attribute_map = {
+        'rule_group_name': {'key': 'ruleGroupName', 'type': 'str'},
+        'rules': {'key': 'rules', 'type': '[int]'},
+    }
+
+    def __init__(self, rule_group_name, rules=None):
+        self.rule_group_name = rule_group_name
+        self.rules = rules

azure-mgmt-network/azure/mgmt/network/models/application_gateway_firewall_rule.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 ApplicationGatewayFirewallRule(Model):
+    """A web application firewall rule.
+
+    :param rule_id: The identifier of the web application firewall rule.
+    :type rule_id: int
+    :param description: The description of the web application firewall rule.
+    :type description: str
+    """
+
+    _validation = {
+        'rule_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'rule_id': {'key': 'ruleId', 'type': 'int'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, rule_id, description=None):
+        self.rule_id = rule_id
+        self.description = description