[Network] Update application gateway

src/azure-cli/azure/cli/command_modules/network/_help.py

@@ -384,6 +384,55 @@
             -n MyHttpListener --host-name www.mynewhost.com
 """
 
+helps['network application-gateway listener'] = """
+type: group
+short-summary: Manage listeners of an application gateway.
+"""
+
+helps['network application-gateway listener create'] = """
+type: command
+short-summary: Create a listener.
+examples:
+  - name: Create a listener.
+    text: |
+        az network application-gateway listener create -g MyResourceGroup --gateway-name MyAppGateway \\
+            --frontend-port MyFrontendPort -n MyListener --frontend-ip MyAppGatewayPublicIp
+"""
+
+helps['network application-gateway listener delete'] = """
+type: command
+short-summary: Delete a listener.
+examples:
+  - name: Delete a listener.
+    text: az network application-gateway listener delete -g MyResourceGroup --gateway-name MyAppGateway -n MyListener
+"""
+
+helps['network application-gateway listener list'] = """
+type: command
+short-summary: List listeners.
+examples:
+  - name: List listeners.
+    text: az network application-gateway listener list -g MyResourceGroup --gateway-name MyAppGateway
+"""
+
+helps['network application-gateway listener show'] = """
+type: command
+short-summary: Get the details of a listener.
+examples:
+  - name: Get the details of a listener.
+    text: az network application-gateway listener show -g MyResourceGroup --gateway-name MyAppGateway -n MyListener
+"""
+
+helps['network application-gateway listener update'] = """
+type: command
+short-summary: Update a listener.
+examples:
+  - name: Update a listener to use a different frontend port.
+    text: |
+        az network application-gateway listener update -g MyResourceGroup --gateway-name MyAppGateway \\
+            -n MyListener --frontend-port MyNewFrontendPort
+"""
+
 helps['network application-gateway http-settings'] = """
 type: group
 short-summary: Manage HTTP settings of an application gateway.
@@ -445,6 +494,68 @@
     crafted: true
 """
 
+helps['network application-gateway settings'] = """
+type: group
+short-summary: Manage settings of an application gateway.
+"""
+
+helps['network application-gateway settings create'] = """
+type: command
+short-summary: Create settings.
+examples:
+  - name: Create settings.
+    text: |
+        az network application-gateway settings create -g MyResourceGroup --gateway-name MyAppGateway \\
+            -n MySettings --port 80 --protocol Http --timeout 30
+  - name: Create settings. (autogenerated)
+    text: |
+        az network application-gateway settings create --gateway-name MyAppGateway --host-name MyHost --name MySettings \
+        --port 80 --probe MyNewProbe --protocol Tcp --resource-group MyResourceGroup
+    crafted: true
+"""
+
+helps['network application-gateway settings delete'] = """
+type: command
+short-summary: Delete settings.
+examples:
+  - name: Delete settings.
+    text: az network application-gateway settings delete -g MyResourceGroup --gateway-name MyAppGateway -n MyHttpSettings
+"""
+
+helps['network application-gateway settings list'] = """
+type: command
+short-summary: List settings.
+examples:
+  - name: List settings.
+    text: az network application-gateway settings list -g MyResourceGroup --gateway-name MyAppGateway
+"""
+
+helps['network application-gateway settings show'] = """
+type: command
+short-summary: Get the details of a gateway's settings.
+examples:
+  - name: Get the details of a gateway's settings.
+    text: az network application-gateway settings show -g MyResourceGroup --gateway-name MyAppGateway -n MySettings
+"""
+
+helps['network application-gateway settings update'] = """
+type: command
+short-summary: Update settings.
+examples:
+  - name: Update settings to use a new probe.
+    text: |
+        az network application-gateway settings update -g MyResourceGroup --gateway-name MyAppGateway \\
+            -n MySettings --probe MyNewProbe
+  - name: Update settings. (autogenerated)
+    text: |
+        az network application-gateway settings update --gateway-name MyAppGateway --name MySettings --probe MyNewProbe --resource-group MyResourceGroup
+    crafted: true
+  - name: Update settings. (autogenerated)
+    text: |
+        az network application-gateway settings update --gateway-name MyAppGateway --host-name-from-backend-pool true --name MySettings --port 80 --probe MyNewProbe --resource-group MyResourceGroup
+    crafted: true
+"""
+
 helps['network application-gateway identity'] = """
 type: group
 short-summary: Manage the managed service identity of an application gateway.
@@ -855,6 +966,62 @@
     crafted: true
 """
 
+helps['network application-gateway routing-rule'] = """
+type: group
+short-summary: Evaluate probe information and define routing rules.
+long-summary: >
+    For more information, visit, https://docs.microsoft.com/azure/application-gateway/application-gateway-customize-waf-rules-cli
+"""
+
+helps['network application-gateway routing-rule create'] = """
+type: command
+short-summary: Create a rule.
+long-summary: Rules are executed in the order in which they are created.
+examples:
+  - name: Create a basic rule.
+    text: |
+        az network application-gateway routing-rule create -g MyResourceGroup --gateway-name MyAppGateway \\
+            -n MyRule --listener MyBackendListener --rule-type Basic --address-pool MyAddressPool --settings MySettings
+"""
+
+helps['network application-gateway routing-rule delete'] = """
+type: command
+short-summary: Delete a rule.
+examples:
+  - name: Delete a rule.
+    text: az network application-gateway routing-rule delete -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+"""
+
+helps['network application-gateway routing-rule list'] = """
+type: command
+short-summary: List rules.
+examples:
+  - name: List rules.
+    text: az network application-gateway routing-rule list -g MyResourceGroup --gateway-name MyAppGateway
+"""
+
+helps['network application-gateway routing-rule show'] = """
+type: command
+short-summary: Get the details of a rule.
+examples:
+  - name: Get the details of a rule.
+    text: az network application-gateway routing-rule show -g MyResourceGroup --gateway-name MyAppGateway -n MyRule
+"""
+
+helps['network application-gateway routing-rule update'] = """
+type: command
+short-summary: Update a rule.
+examples:
+  - name: Update a rule use a new listener.
+    text: |
+        az network application-gateway routing-rule update -g MyResourceGroup --gateway-name MyAppGateway \\
+            -n MyRule --listener MyNewBackendListener
+  - name: Update a rule. (autogenerated)
+    text: |
+        az network application-gateway routing-rule update --address-pool MyAddressPool --gateway-name MyAppGateway --name MyRule --resource-group MyResourceGroup
+    crafted: true
+"""
+
 helps['network application-gateway show'] = """
 type: command
 short-summary: Get the details of an application gateway.

src/azure-cli/azure/cli/command_modules/network/_params.py

@@ -139,6 +139,7 @@ def load_arguments(self, _):
         c.argument('zones', zones_type)
         c.argument('custom_error_pages', min_api='2018-08-01', nargs='+', help='Space-separated list of custom error pages in `STATUS_CODE=URL` format.', validator=validate_custom_error_pages)
         c.argument('firewall_policy', options_list='--waf-policy', min_api='2018-12-01', help='Name or ID of a web application firewall (WAF) policy.', validator=validate_waf_policy)
+        c.argument('priority', min_api='2021-08-01', type=int, help='Priority of the request routing rule. Supported SKU tiers are Standard_v2,WAF_v2')
 
     with self.argument_context('network application-gateway', arg_group='Identity') as c:
         c.argument('user_assigned_identity', options_list='--identity', help="Name or ID of the ManagedIdentity Resource", validator=validate_user_assigned_identity)
@@ -216,6 +217,10 @@ def load_arguments(self, _):
         ag_subresources.append({'name': 'root-cert', 'display': 'trusted root certificate', 'ref': 'trusted_root_certificates'})
     if self.supported_api_version(min_api='2018-12-01'):
         ag_subresources.append({'name': 'rewrite-rule set', 'display': 'rewrite rule set', 'ref': 'rewrite_rule_sets'})
+    if self.supported_api_version(min_api='2021-08-01'):
+        ag_subresources.append({'name': 'settings', 'display': 'backed settings', 'ref': 'backend_settings_collection'})
+        ag_subresources.append({'name': 'listener', 'display': 'listener', 'ref': 'listeners'})
+        ag_subresources.append({'name': 'routing-rule', 'display': 'routing rule', 'ref': 'routing_rules'})
 
     for item in ag_subresources:
         with self.argument_context('network application-gateway {}'.format(item['name'])) as c:
@@ -256,25 +261,29 @@ def load_arguments(self, _):
     with self.argument_context('network application-gateway frontend-ip update') as c:
         c.argument('public_ip_address', validator=get_public_ip_validator(), help='The name or ID of the public IP address.', completer=get_resource_name_completion_list('Microsoft.Network/publicIPAddresses'), deprecate_info=c.deprecate(hide=True))
 
-    for item in ['frontend-port', 'http-settings']:
+    for item in ['frontend-port', 'http-settings', 'settings']:
         with self.argument_context('network application-gateway {}'.format(item)) as c:
             c.argument('port', help='The port number.', type=int)
 
-    for item in ['http-settings', 'probe']:
+    for item in ['http-settings', 'settings', 'probe']:
         with self.argument_context('network application-gateway {}'.format(item)) as c:
-            c.argument('protocol', http_protocol_type, help='The HTTP settings protocol.')
+            c.argument('protocol', http_protocol_type, help='The settings protocol.')
+
+    for item in ['http-listener', 'listener']:
+        with self.argument_context('network application-gateway {}'.format(item)) as c:
+            c.argument('frontend_ip', help='The name or ID of the frontend IP configuration.', completer=get_ag_subresource_completion_list('frontend_ip_configurations'))
+            c.argument('frontend_port', help='The name or ID of the frontend port.', completer=get_ag_subresource_completion_list('frontend_ports'))
+            c.argument('ssl_cert', help='The name or ID of the SSL certificate to use.', completer=get_ag_subresource_completion_list('ssl_certificates'))
+            c.ignore('protocol')
 
     with self.argument_context('network application-gateway http-listener') as c:
-        c.argument('frontend_ip', help='The name or ID of the frontend IP configuration.', completer=get_ag_subresource_completion_list('frontend_ip_configurations'))
-        c.argument('frontend_port', help='The name or ID of the frontend port.', completer=get_ag_subresource_completion_list('frontend_ports'))
-        c.argument('ssl_cert', help='The name or ID of the SSL certificate to use.', completer=get_ag_subresource_completion_list('ssl_certificates'))
-        c.ignore('protocol')
         c.argument('host_name', help='Host name to use for multisite gateways.')
         c.argument('host_names', nargs='+', is_preview=True, help='Space-separated list of host names that allows special wildcard characters as well.', min_api='2019-11-01')
         c.argument('firewall_policy', min_api='2019-09-01', help='Name or ID of a Firewall Policy resource.')
 
-    with self.argument_context('network application-gateway http-listener create') as c:
-        c.argument('frontend_ip', help='The name or ID of the frontend IP configuration. {}'.format(default_existing))
+    for item in ['http-listener', 'listener']:
+        with self.argument_context('network application-gateway {} create'.format(item)) as c:
+            c.argument('frontend_ip', help='The name or ID of the frontend IP configuration. {}'.format(default_existing))
 
     with self.argument_context('network application-gateway private-link', arg_group=None) as c:
         c.argument('frontend_ip', help='The frontend IP which the Private Link will associate to')
@@ -321,6 +330,11 @@ def load_arguments(self, _):
         c.argument('http_settings', help='The name or ID of the HTTP settings. {}'.format(default_existing))
         c.argument('http_listener', help='The name or ID of the HTTP listener. {}'.format(default_existing))
 
+    with self.argument_context('network application-gateway routing-rule create') as c:
+        c.argument('address_pool', help='The name or ID of the backend address pool. {}'.format(default_existing))
+        c.argument('settings', help='The name or ID of the settings. {}'.format(default_existing))
+        c.argument('listener', help='The name or ID of the listener. {}'.format(default_existing))
+
     for scope in ['rewrite-rule list', 'rewrite-rule condition list']:
         with self.argument_context('network application-gateway {}'.format(scope)) as c:
             c.argument('application_gateway_name', app_gateway_name_type, id_part=None)
@@ -332,9 +346,17 @@ def load_arguments(self, _):
         c.argument('auth_certs', nargs='+', min_api='2016-09-01', help='Space-separated list of authentication certificates (names or IDs) to associate with the HTTP settings.')
         c.argument('root_certs', nargs='+', min_api='2019-04-01', help='Space-separated list of trusted root certificates (names or IDs) to associate with the HTTP settings. --host-name or --host-name-from-backend-pool is required when this field is set.')
 
+    with self.argument_context('network application-gateway settings') as c:
+        c.argument('timeout', help='Request timeout in seconds.')
+        c.argument('probe', help='Name or ID of the probe to associate with the settings.', completer=get_ag_subresource_completion_list('probes'))
+        c.argument('root_certs', nargs='+', help='Space-separated list of trusted root certificates (names or IDs) to associate with the settings. --host-name or --host-name-from-backend-pool is required when this field is set.')
+        c.argument('host_name', help='Host header sent to the backend servers.')
+        c.argument('host_name_from_backend_pool', options_list=['--backend-pool-host-name'], help='Use host name of the backend server as the host header.', arg_type=get_three_state_flag())
+        c.argument('path', help='Path that will prefix all requests.')
+
     with self.argument_context('network application-gateway probe') as c:
         c.argument('host', help='The name of the host to send the probe.')
-        c.argument('path', help='The relative path of the probe. Valid paths start from "/"')
+        c.argument('path', required=False, help='The relative path of the probe. Valid paths start from "/"')
         c.argument('interval', help='The time interval in seconds between consecutive probes.')
         c.argument('threshold', help='The number of failed probes after which the back end server is marked down.')
         c.argument('timeout', help='The probe timeout in seconds.')
@@ -344,14 +366,22 @@ def load_arguments(self, _):
                         'In case not set, port from http settings will be used. '
                         'This property is valid for Standard_v2 and WAF_v2 only.')
 
+    for scope in ['rule', 'routing-rule']:
+        with self.argument_context('network application-gateway {}'.format(scope)) as c:
+            c.argument('address_pool', help='The name or ID of the backend address pool.',
+                       completer=get_ag_subresource_completion_list('backend_address_pools'))
+            c.argument('rule_type', help='The rule type (Basic, PathBasedRouting).')
+            c.argument('priority', type=int, help='Priority of the rule.')
+
     with self.argument_context('network application-gateway rule') as c:
-        c.argument('address_pool', help='The name or ID of the backend address pool.', completer=get_ag_subresource_completion_list('backend_address_pools'))
         c.argument('http_listener', help='The name or ID of the HTTP listener.', completer=get_ag_subresource_completion_list('http_listeners'))
         c.argument('http_settings', help='The name or ID of the backend HTTP settings.', completer=get_ag_subresource_completion_list('backend_http_settings_collection'))
-        c.argument('rule_type', help='The rule type (Basic, PathBasedRouting).')
         c.argument('url_path_map', help='The name or ID of the URL path map.', completer=get_ag_subresource_completion_list('url_path_maps'))
         c.argument('rewrite_rule_set', min_api='2019-04-01', help='The name or ID of the rewrite rule set.')
-        c.argument('priority', type=int, help='Priority of the request routing rule. Range from 1 to 2000')
+
+    with self.argument_context('network application-gateway routing-rule') as c:
+        c.argument('listener', help='The name or ID of the listener.', completer=get_ag_subresource_completion_list('listeners'))
+        c.argument('settings', help='The name or ID of the settings.', completer=get_ag_subresource_completion_list('backend_settings_collection'))
 
     with self.argument_context('network application-gateway ssl-cert') as c:
         c.argument('cert_data', options_list='--cert-file', type=file_type, completer=FilesCompleter(), help='The path to the PFX certificate file.', validator=validate_ssl_cert)
@@ -436,6 +466,7 @@ def load_arguments(self, _):
     with self.argument_context('network application-gateway probe', min_api='2017-06-01') as c:
         c.argument('host', default=None, required=False, help='The name of the host to send the probe.')
         c.argument('host_name_from_http_settings', help='Use host header from HTTP settings.', arg_type=get_three_state_flag())
+        c.argument('host_name_from_settings', options_list=['--settings'], min_api='2021-08-01', help='Use host header from settings.', arg_type=get_three_state_flag())
         c.argument('min_servers', type=int, help='Minimum number of servers that are always marked healthy.')
         c.argument('match_body', help='Body that must be contained in the health response.')
         c.argument('match_status_codes', nargs='+', help='Space-separated list of allowed ranges of healthy status codes for the health response.')

src/azure-cli/azure/cli/command_modules/network/_template_builder.py

@@ -59,7 +59,7 @@ def _build_appgw_private_link_ip_configuration(name,
 
 # pylint: disable=too-many-locals, too-many-statements, too-many-branches
 def build_application_gateway_resource(cmd, name, location, tags, sku_name, sku_tier, capacity, servers, frontend_port,
-                                       private_ip_address, private_ip_allocation,
+                                       private_ip_address, private_ip_allocation, priority,
                                        cert_data, cert_password, key_vault_secret_id,
                                        cookie_based_affinity, http_settings_protocol, http_settings_port,
                                        http_listener_protocol, routing_rule_type, public_ip_id, subnet_id,
@@ -258,6 +258,9 @@ def _ag_subresource_id(_type, name):
         ],
         'privateLinkConfigurations': privateLinkConfigurations,
     }
+    if sku_name.lower() == 'standard_v2' or sku_name.lower() == 'waf_v2':
+        if cmd.supported_api_version(min_api='2021-08-01') and priority:
+            ag_properties['requestRoutingRules'][0]['properties'].update({'priority': priority})
     if ssl_cert:
         ag_properties.update({'sslCertificates': [ssl_cert]})
     if enable_http2 and cmd.supported_api_version(min_api='2017-10-01'):