[AI Manager] Add manager aliases to nested commands

src/aimanager/HISTORY.rst

@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.4.1
+++++++
+* ``az aimanager modelsource`` and ``az aimanager namespace modeldeployment``: Accept
+  ``--manager`` and ``-m`` as aliases of ``--aimanager-name``.
+
 1.4.0
 +++++++
 * Mark ``az aimanager`` command groups as preview.

src/aimanager/azext_aimanager/_params.py

@@ -60,7 +60,7 @@ def load_arguments(self, _):
                    help='Comma-separated key=value pairs to specify custom headers.')
 
     with self.argument_context('aimanager modelsource') as c:
-        c.argument('ai_manager_name', options_list=['--aimanager-name'],
+        c.argument('ai_manager_name', options_list=['--aimanager-name', '--manager', '-m'],
                    validator=validate_ai_manager_name,
                    help='The name of the AI Manager resource.')
         c.argument('model_source_name', options_list=['--name', '-n'],
@@ -118,7 +118,7 @@ def load_arguments(self, _):
                        help='Comma-separated key=value pairs to specify custom headers.')
 
     with self.argument_context('aimanager namespace modeldeployment') as c:
-        c.argument('ai_manager_name', options_list=['--aimanager-name'],
+        c.argument('ai_manager_name', options_list=['--aimanager-name', '--manager', '-m'],
                    validator=validate_ai_manager_name,
                    help='The name of the AI Manager resource.')
         c.argument('namespace_name', options_list=['--namespace-name'],

src/aimanager/azext_aimanager/azext_metadata.json

@@ -1,5 +1,5 @@
 {
     "azext.isPreview": true,
     "azext.minCliCoreVersion": "2.61.0",
-    "version": "1.2.1b1"
+    "version": "1.4.1"
 }

src/aimanager/azext_aimanager/tests/latest/test_modeldeployment_scenario.py

@@ -89,6 +89,11 @@ def test_modeldeployment_commands(self):
                 command_prefix.format('list'),
                 checks=[self.check("length([?name=='deployment'])", 1)])
 
+            self.cmd(
+                'aimanager namespace modeldeployment list -g rg '
+                '-m manager --namespace-name namespace',
+                checks=[self.check("length([?name=='deployment'])", 1)])
+
             self.cmd(
                 command_prefix.format('update') +
                 ' -n deployment --performance-mode Throughput --replicas 0 '
@@ -101,6 +106,7 @@ def test_modeldeployment_commands(self):
                 checks=[self.is_empty()])
 
         self.assertEqual(operations.begin_create_or_update.call_count, 2)
-        operations.list_by_ai_manager_namespace.assert_called_once_with(
+        self.assertEqual(operations.list_by_ai_manager_namespace.call_count, 2)
+        operations.list_by_ai_manager_namespace.assert_called_with(
             'rg', 'manager', 'namespace')
         operations.begin_delete.assert_called_once()

src/aimanager/azext_aimanager/tests/latest/test_modelsource_scenario.py

@@ -56,6 +56,10 @@ def test_modelsource_commands(self):
                 command_prefix.format('list'),
                 checks=[self.check("length([?name=='hf'])", 1)])
 
+            self.cmd(
+                'aimanager modelsource list -g rg --manager manager',
+                checks=[self.check("length([?name=='hf'])", 1)])
+
             self.cmd(
                 command_prefix.format('update') + ' -n hf --token hf_yyy --no-wait',
                 checks=[self.is_empty()])
@@ -66,7 +70,8 @@ def test_modelsource_commands(self):
 
         self.assertEqual(operations.get.call_count, 4)
         self.assertEqual(operations.begin_create_or_update.call_count, 2)
-        operations.list.assert_called_once_with('rg', 'manager')
+        self.assertEqual(operations.list.call_count, 2)
+        operations.list.assert_called_with('rg', 'manager')
         operations.begin_delete.assert_called_once()
 
         # the source type is immutable and must be carried over on update

src/aimanager/setup.py

@@ -14,7 +14,7 @@
     from distutils import log as logger
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
-VERSION = '1.4.0'
+VERSION = '1.4.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers