[ARM] az tag support for -id parameter

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -145,7 +145,7 @@ def default_api_version(self):
         ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
         ResourceType.MGMT_RESOURCE_LOCKS: '2016-09-01',
         ResourceType.MGMT_RESOURCE_POLICY: '2019-09-01',
-        ResourceType.MGMT_RESOURCE_RESOURCES: '2019-07-01',
+        ResourceType.MGMT_RESOURCE_RESOURCES: '2019-10-01',
         ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2019-06-01',
         ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2019-10-01-preview',
         ResourceType.MGMT_NETWORK_DNS: '2018-05-01',

src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py

@@ -20,7 +20,7 @@
 
 NODE_STARTUP_TIME = 10 * 60  # Compute node should start in 10 mins after cluster creation.
 CLUSTER_RESIZE_TIME = 20 * 60  # Cluster should resize in 20 mins after job submitted/completed.
-LOCATION_FOR_SCENARIO_TESTS = 'northeurope'
+LOCATION_FOR_SCENARIO_TESTS = 'eastus'
 PASSWORD = str(uuid.uuid4())
 
 

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

@@ -1958,7 +1958,7 @@
 
 helps['tag'] = """
 type: group
-short-summary: Manage resource tags.
+short-summary: Tags Management on a resource.
 """
 
 helps['tag add-value'] = """
@@ -1972,18 +1972,104 @@
 
 helps['tag create'] = """
 type: command
-short-summary: Create a tag in the subscription.
+short-summary: Create tags on a specific resource.
+long-summary: >
+    The az tag create cmdlet with an id creates or updates the entire set of tags on a resource, resource group or subscription.
+    This operation allows adding or replacing the entire set of tags on the specified resource, resource group or subscription.
+    The specified entity can have a maximum of 50 tags.
+parameters:
+  - name: --name -n
+    short-summary: The name of the tag to create.
+  - name: --subscription
+    short-summary: Name or ID of subscription. You can configure the default subscription using az account set -s NAME_OR_ID.
+  - name: --resource-id
+    short-summary: The resource identifier for the entity being tagged. A resource, a resource group or a subscription may be tagged.
+  - name: --tags
+    short-summary: The tags to be applied on the resource.
 examples:
   - name: Create a tag in the subscription.
     text: >
         az tag create --name MyTag
+  - name: Creates or updates the entire set of tags on a subscription.
+    text: >
+        az tag create --resource-id /subscriptions/{subId} --tags Dept=Finance Status=Normal
+  - name: Creates or updates the entire set of tags on a resource group.
+    text: >
+        az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg} --tags Dept=Finance Status=Normal
+  - name: Creates or updates the entire set of tags on a resource.
+    text: >
+        az tag create --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName} --tags Dept=Finance Status=Normal
 """
 
 helps['tag delete'] = """
 type: command
-short-summary: Delete a tag in the subscription.
+short-summary: Delete tags on a specific resource.
+long-summary:
+    The az tag delete cmdlet with an id deletes the entire set of tags on a resource, resource group or subscription.
+parameters:
+  - name: --name -n
+    short-summary: The name of the tag to be deleted.
+  - name: --resource-id
+    short-summary: The resource identifier for the entity being tagged. A resource, a resource group or a subscription may be tagged.
 examples:
   - name: Delete a tag from the subscription.
     text: >
         az tag delete --name MyTag
+  - name: Deletes the entire set of tags on a subscription.
+    text: >
+        az tag delete --resource-id /subscriptions/{sub-id}
+  - name: Deletes the entire set of tags on a resource group.
+    text: >
+        az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - name: Deletes the entire set of tags on a resource.
+    text: >
+        az tag delete --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+"""
+
+helps['tag list'] = """
+type: command
+short-summary: Lists the entire set of tags on a specific resource.
+long-summary: The az tag list cmdlet with an id lists the entire set of tags on a resource, resource group or subscription.
+parameters:
+  - name: --resource-id
+    short-summary: The resource identifier for the entity being tagged. A resource, a resource group or a subscription may be tagged.
+examples:
+  - name: Lists the entire set of tags on a subscription.
+    text: >
+        az tag list --resource-id /subscriptions/{sub-id}
+  - name: Lists the entire set of tags on a resource group.
+    text: >
+        az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}
+  - name: Lists the entire set of tags on a resource.
+    text: >
+        az tag list --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName}
+"""
+
+helps['tag update'] = """
+type: command
+short-summary: Selectively updates the set of tags on a specific resource.
+long-summary: >
+    The az tag update cmdlet with an id selectively updates the set of tags on a resource, resource group or subscription.
+    This operation allows replacing, merging or selectively deleting tags on the specified resource, resource group or subscription.
+    The specified entity can have a maximum of 50 tags at the end of the operation.
+    The 'replace' option replaces the entire set of existing tags with a new set.
+    The 'merge' option allows adding tags with new names and updating the values of tags with existing names.
+    The 'delete' option allows selectively deleting tags based on given names or name/value pairs.
+parameters:
+  - name: --resource-id
+    short-summary: The resource identifier for the entity being tagged. A resource, a resource group or a subscription may be tagged.
+  - name: --operation
+    short-summary: The update operation. Options are Merge, Replace and Delete.
+  - name: --tags
+    short-summary: The tags to be updated on the resource.
+examples:
+  - name: Selectively updates the set of tags on a subscription with "merge" Operation.
+    text: >
+        az tag update --resource-id /subscriptions/{sub-id} --operation merge --tags key1=value1 key3=value3
+  - name: Selectively updates the set of tags on a resource group with "replace" Operation.
+    text: >
+        az tag update --resource-id /subscriptions/{sub-id}/resourcegroups/{rg} --operation replace --tags key1=value1 key3=value3
+  - name: Selectively updates the set of tags on a resource with "delete" Operation.
+    text: >
+        az tag update --resource-id /subscriptions/{sub-id}/resourcegroups/{rg}/providers/Microsoft.Compute/virtualMachines/{vmName} --operation delete --tags key1=value1
 """

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

@@ -399,6 +399,11 @@ def load_arguments(self, _):
     with self.argument_context('tag') as c:
         c.argument('tag_name', options_list=['--name', '-n'])
         c.argument('tag_value', options_list='--value')
+        c.argument('resource_id', options_list='--resource-id',
+                   help='The resource identifier for the tagged entity. A resource, a resource group or a subscription may be tagged.')
+        c.argument('tags', tags_type)
+        c.argument('operation', options_list='--operation',
+                   help='The update operation: options include Merge, Replace and Delete.')
 
     with self.argument_context('lock') as c:
         c.argument('lock_name', options_list=['--name', '-n'], validator=validate_lock_parameters)

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

@@ -219,10 +219,11 @@ def load_command_table(self, _):
         g.custom_command('unregister', 'unregister_feature')
 
     # Tag commands
-    with self.command_group('tag', resource_tag_sdk) as g:
-        g.command('list', 'list')
-        g.command('create', 'create_or_update')
-        g.command('delete', 'delete')
+    with self.command_group('tag', resource_tag_sdk, resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) as g:
+        g.custom_command('list', 'get_tag_at_scope')
+        g.custom_command('create', 'create_or_update_tag_at_scope')
+        g.custom_command('delete', 'delete_tag_at_scope')
+        g.custom_command('update', 'update_tag_at_scope', min_api='2019-10-01')
         g.command('add-value', 'create_or_update_value')
         g.command('remove-value', 'delete_value')