mark or-policy and or-policy rule as GA, add --enable-metrics to az storage account or-policy create/update

Author: calvinhzy

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

@@ -794,6 +794,8 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
         c.argument('properties', or_policy_type, validator=validate_or_policy)
         c.argument('prefix_match', prefix_math_type)
         c.argument('min_creation_time', min_creation_time_type)
+        c.argument('enable_metrics', arg_type=get_three_state_flag(),
+                   help='Indicates whether object replication metrics feature is enabled for the policy.')
 
     for item in ['create', 'update']:
         with self.argument_context('storage account or-policy {}'.format(item),

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

@@ -213,7 +213,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
         operations_tmpl='azure.cli.command_modules.storage.operations.account#{}',
         client_factory=cf_or_policy)
 
-    with self.command_group('storage account or-policy', or_policy_sdk, is_preview=True,
+    with self.command_group('storage account or-policy', or_policy_sdk,
                             resource_type=ResourceType.MGMT_STORAGE,
                             custom_command_type=or_policy_custom_type) as g:
         g.show_command('show', 'get')
@@ -222,7 +222,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
         g.generic_update_command('update', setter_name='update_or_policy', setter_type=or_policy_custom_type)
         g.command('delete', 'delete')
 
-    with self.command_group('storage account or-policy rule', or_policy_sdk, is_preview=True,
+    with self.command_group('storage account or-policy rule', or_policy_sdk,
                             resource_type=ResourceType.MGMT_STORAGE,
                             custom_command_type=or_policy_custom_type) as g:
         g.custom_show_command('show', 'get_or_rule')

src/azure-cli/azure/cli/command_modules/storage/operations/account.py

@@ -988,14 +988,15 @@ def list_encryption_scope(client, resource_group_name, account_name,
 # pylint: disable=no-member
 def create_or_policy(cmd, client, account_name, resource_group_name=None, properties=None, source_account=None,
                      destination_account=None, policy_id="default", rule_id=None, source_container=None,
-                     destination_container=None, min_creation_time=None, prefix_match=None):
+                     destination_container=None, min_creation_time=None, prefix_match=None, enable_metrics=None):
     from azure.core.exceptions import HttpResponseError
     ObjectReplicationPolicy = cmd.get_models('ObjectReplicationPolicy')
 
     if properties is None:
         rules = []
-        ObjectReplicationPolicyRule, ObjectReplicationPolicyFilter = \
-            cmd.get_models('ObjectReplicationPolicyRule', 'ObjectReplicationPolicyFilter')
+        ObjectReplicationPolicyRule, ObjectReplicationPolicyFilter, ObjectReplicationPolicyPropertiesMetrics = \
+            cmd.get_models('ObjectReplicationPolicyRule', 'ObjectReplicationPolicyFilter',
+                           'ObjectReplicationPolicyPropertiesMetrics')
         if source_container and destination_container:
             rule = ObjectReplicationPolicyRule(
                 rule_id=rule_id,
@@ -1006,7 +1007,8 @@ def create_or_policy(cmd, client, account_name, resource_group_name=None, proper
             rules.append(rule)
         or_policy = ObjectReplicationPolicy(source_account=source_account,
                                             destination_account=destination_account,
-                                            rules=rules)
+                                            rules=rules,
+                                            metrics=ObjectReplicationPolicyPropertiesMetrics(enabled=enable_metrics))
     else:
         or_policy = properties
     try:
@@ -1022,7 +1024,7 @@ def create_or_policy(cmd, client, account_name, resource_group_name=None, proper
 
 
 def update_or_policy(client, parameters, resource_group_name, account_name, object_replication_policy_id=None,
-                     properties=None, source_account=None, destination_account=None, ):
+                     properties=None, source_account=None, destination_account=None, enable_metrics=None):
 
     if source_account is not None:
         parameters.source_account = source_account
@@ -1034,6 +1036,9 @@ def update_or_policy(client, parameters, resource_group_name, account_name, obje
         if "policyId" in properties.keys() and properties["policyId"]:
             object_replication_policy_id = properties["policyId"]
 
+    if enable_metrics is not None:
+        parameters.metrics.enabled = enable_metrics
+
     return client.create_or_update(resource_group_name=resource_group_name, account_name=account_name,
                                    object_replication_policy_id=object_replication_policy_id, properties=parameters)