moved policy command out of 'api' scope

Author: FilPag

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

@@ -28,7 +28,7 @@
 short-summary: Manage Azure API Management API's.
 """
 
-helps['apim api policy'] = """
+helps['apim policy'] = """
 type: group
 short-summary: Manage Azure API Management API Policies.
 """
@@ -257,73 +257,73 @@
         az apim api export -g MyResourceGroup --service-name MyApim --api-id MyApi --export-format OpenApiJson --file-path path
 """
 
-helps['apim api policy set'] = """
+helps['apim policy set'] = """
 type: command
 short-summary: Create or update policy for the given Scope
 examples:
   - name: Create or update policy for API Operation
     text: |-
-        az apim api policy set -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp --specification-path PathToXmlFile
+        az apim policy set -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp --specification-path PathToXmlFile
   - name: Create or update policy for API
     text: |-
-        az apim api policy set -g MyResourceGroup -n MyApim --api-id MyApi --specification-path PathToXmlFile
+        az apim policy set -g MyResourceGroup -n MyApim --api-id MyApi --specification-path PathToXmlFile
   - name: Create or update global policy
     text: |-
-        az apim api policy set -g MyResourceGroup -n MyApim --specification-path PathToXmlFile
+        az apim policy set -g MyResourceGroup -n MyApim --specification-path PathToXmlFile
 """
 
-helps['apim api policy show'] = """
+helps['apim policy show'] = """
 type: command
 short-summary: Get policy for the given Scope
 examples:
   - name: Get policy for API Operation
     text: |-
-        az apim api policy show -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
+        az apim policy show -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
   - name: Get policy for API
     text: |-
-        az apim api policy show -g MyResourceGroup -n MyApim --api-id MyApi
+        az apim policy show -g MyResourceGroup -n MyApim --api-id MyApi
   - name: Get global policy
     text: |-
-        az apim api policy show -g MyResourceGroup -n MyApim
+        az apim policy show -g MyResourceGroup -n MyApim
 """
 
-helps['apim api policy delete'] = """
+helps['apim policy delete'] = """
 type: command
 short-summary: Delete policy for the given Scope
 examples:
   - name: Delete policy for API Operation
     text: |-
-        az apim api policy delete -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
+        az apim policy delete -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
   - name: Delete policy for API
     text: |-
-        az apim api policy delete -g MyResourceGroup -n MyApim --api-id MyApi
+        az apim policy delete -g MyResourceGroup -n MyApim --api-id MyApi
   - name: Delete global policy
     text: |-
-        az apim api policy delete -g MyResourceGroup -n MyApim
+        az apim policy delete -g MyResourceGroup -n MyApim
 """
 
-helps['apim api policy list'] = """
+helps['apim policy list'] = """
 type: command
 short-summary: List policies for the given Scope
 examples:
   - name: List policies for API Operation
     text: |-
-        az apim api policy list -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
+        az apim policy list -g MyResourceGroup -n MyApim --api-id MyApi --operation-id MyOp
   - name: List policies for API
     text: |-
-        az apim api policy list -g MyResourceGroup -n MyApim --api-id MyApi
+        az apim policy list -g MyResourceGroup -n MyApim --api-id MyApi
   - name: List global policies
     text: |-
-        az apim api policy list -g MyResourceGroup -n MyApim
+        az apim policy list -g MyResourceGroup -n MyApim
 """
 
-helps['apim api policy wait'] = """
+helps['apim policy wait'] = """
 type: command
 short-summary: Place the CLI in a waiting state until a condition of an apim api is met.
 examples:
   - name: Place the CLI in a waiting state until a condition of a apim api is met.
     text: |
-        az apim api policy wait --created --api-id MyApi --policy-id MyPolicy --name MyApim --resource-group MyResourceGroup
+        az apim policy wait --created --api-id MyApi --policy-id MyPolicy --name MyApim --resource-group MyResourceGroup
     crafted: true
 """
 

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

@@ -314,17 +314,17 @@ def load_arguments(self, _):
         c.argument('file_path', options_list=['--file-path', '-f'],
                    help='File path specified to export the API.')
 
-    with self.argument_context('apim api policy') as c:
+    with self.argument_context('apim policy') as c:
         c.argument('api_id', arg_type=api_id)
         c.argument('operation_id', help='Operation identifier within an API. Must be unique in the current API Management service instance.')
         c.argument('specification_path', help='Contents of the Policy as defined by the format.')
         c.argument('policy_format', help='Format of the policy content. Allowed formats: rawxml, rawxml-link, xml, xml-link')
         c.argument('policy_id', help='Policy identifier within an API. Must be unique in the current API context.')
 
-    with self.argument_context('apim api policy show') as c:
+    with self.argument_context('apim policy show') as c:
         c.argument('file_path', help='Path to the file where the policy content will be saved. If not specified, the policy content will be printed to the standard output.')
 
-    with self.argument_context('apim api policy delete') as c:
+    with self.argument_context('apim policy delete') as c:
         c.argument('if_match', help='ETag of the Entity.')
 
     with self.argument_context('apim product api list') as c:

src/azure-cli/azure/cli/command_modules/apim/commands.py

@@ -112,7 +112,7 @@ def load_command_table(self, _):
                                  setter_name='begin_create_or_update', getter_name='get', supports_no_wait=True)
         g.wait_command('wait')
 
-    with self.command_group('apim api policy', api_policy_sdk) as g:
+    with self.command_group('apim policy', api_policy_sdk) as g:
         g.custom_show_command('show', 'apim_api_policy_show')
         g.custom_command('set', 'apim_api_policy_set', supports_no_wait=True)
         g.custom_command('delete', 'apim_api_policy_delete', confirmation=True, supports_no_wait=True)

src/azure-cli/azure/cli/command_modules/apim/tests/latest/test_apim_scenario.py

@@ -639,70 +639,70 @@ def test_apim_policy_operations(self, resource_group, resource_group_location):
         self.kwargs['operation_name'] = operation_name
 
         # Verify initial policy lists (global, API, and operation levels)
-        initial_policy_global = self.cmd('apim api policy list -g {rg} -n {service_name}').get_output_in_json()
-        initial_policy_api = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
-        initial_policy_operation = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
+        initial_policy_global = self.cmd('apim policy list -g {rg} -n {service_name}').get_output_in_json()
+        initial_policy_api = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
+        initial_policy_operation = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
 
         # Set policies at different scopes
-        self.cmd('apim api policy set -g {rg} -n {service_name} '
+        self.cmd('apim policy set -g {rg} -n {service_name} '
                     '--specification-path {policy_specification_path} '
                     '--policy-format {policy_specification_format}')
 
-        self.cmd('apim api policy set -g {rg} -n {service_name} '
+        self.cmd('apim policy set -g {rg} -n {service_name} '
                     '--api-id {api_id} '
                     '--specification-path {policy_specification_path} '
                     '--policy-format {policy_specification_format}')
 
-        self.cmd('apim api policy set -g {rg} -n {service_name} '
+        self.cmd('apim policy set -g {rg} -n {service_name} '
                     '--api-id {api_id} '
                     '--operation-id {operation_name} '
                     '--specification-path {policy_specification_path} '
                     '--policy-format {policy_specification_format}')
 
-        self.cmd('apim api policy wait -g "{rg}" -n "{service_name}" --api-id "{api_id}" --policy-id policy --exists', checks=[self.is_empty()])
+        self.cmd('apim policy wait -g "{rg}" -n "{service_name}" --api-id "{api_id}" --policy-id policy --exists', checks=[self.is_empty()])
 
         # Verify policies were updated
-        current_policy_global = self.cmd('apim api policy list -g {rg} -n {service_name}').get_output_in_json()
-        current_policy_api = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
-        current_policy_operation = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
+        current_policy_global = self.cmd('apim policy list -g {rg} -n {service_name}').get_output_in_json()
+        current_policy_api = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
+        current_policy_operation = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
 
         # Ensure policies are different after update
         self.assertNotEqual(initial_policy_global['value'], current_policy_global['value'], 
                             "Global policy should have changed")
         self.assertNotEqual(initial_policy_api['value'], current_policy_api['value'], 
-                            "API policy should have changed")
+                            "policy should have changed")
         self.assertNotEqual(initial_policy_operation['value'], current_policy_operation['value'], 
                             "Operation policy should have changed")
 
         # Verify policy show commands
-        self.cmd('apim api policy show -g {rg} -n {service_name}', 
+        self.cmd('apim policy show -g {rg} -n {service_name}', 
                     checks=[self.check('format', '{policy_specification_format}')])
-        self.cmd('apim api policy show -g {rg} -n {service_name} --api-id {api_id}', 
+        self.cmd('apim policy show -g {rg} -n {service_name} --api-id {api_id}', 
                     checks=[self.check('format', '{policy_specification_format}')])
-        self.cmd('apim api policy show -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}', 
+        self.cmd('apim policy show -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}', 
                     checks=[self.check('format', '{policy_specification_format}')])
 
         # Get etag
-        etag_global = self.cmd('apim api policy get-etag -g {rg} -n {service_name}').get_output_in_json()
-        etag_api = self.cmd('apim api policy get-etag -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
-        etag_operation = self.cmd('apim api policy get-etag -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
+        etag_global = self.cmd('apim policy get-etag -g {rg} -n {service_name}').get_output_in_json()
+        etag_api = self.cmd('apim policy get-etag -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
+        etag_operation = self.cmd('apim policy get-etag -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
 
         self.assertTrue(etag_global, "Global policy etag should not be empty")
-        self.assertTrue(etag_api, "API policy etag should not be empty")
+        self.assertTrue(etag_api, "policy etag should not be empty")
         self.assertTrue(etag_operation, "Operation policy etag should not be empty")
 
         # Delete policies
-        self.cmd('apim api policy delete -g {rg} -n {service_name} --yes')
-        self.cmd('apim api policy delete -g {rg} -n {service_name} --api-id {api_id} --yes')
-        self.cmd('apim api policy delete -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name} --yes')
+        self.cmd('apim policy delete -g {rg} -n {service_name} --yes')
+        self.cmd('apim policy delete -g {rg} -n {service_name} --api-id {api_id} --yes')
+        self.cmd('apim policy delete -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name} --yes')
 
         #wait
-        self.cmd('apim api policy wait -g "{rg}" -n "{service_name}" --api-id "{api_id}" --policy-id policy --deleted', checks=[self.is_empty()])
+        self.cmd('apim policy wait -g "{rg}" -n "{service_name}" --api-id "{api_id}" --policy-id policy --deleted', checks=[self.is_empty()])
 
         # Verify policies are deleted
-        final_policy_global = self.cmd('apim api policy list -g {rg} -n {service_name}').get_output_in_json()
-        final_policy_api = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
-        final_policy_operation = self.cmd('apim api policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
+        final_policy_global = self.cmd('apim policy list -g {rg} -n {service_name}').get_output_in_json()
+        final_policy_api = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id}').get_output_in_json()
+        final_policy_operation = self.cmd('apim policy list -g {rg} -n {service_name} --api-id {api_id} --operation-id {operation_name}').get_output_in_json()
 
         self.assertEqual(final_policy_global.get('count', 0), 0, "Global policy should be deleted")
         self.assertEqual(final_policy_api.get('count', 0), 0, "API policy should be deleted")