action-rule create / udpate

src/alertsmanagement/azext_alertsmanagement/_params.py

@@ -112,10 +112,15 @@ def load_arguments(self, _):
         c.argument('alert_rule_id', nargs='+', help='Filter alerts by alert rule ID')
         c.argument('alert_description', nargs='+', help='Filter alerts by alert rule description')
         c.argument('alert_context', nargs='+', help='Filter alerts by alert context (payload)')
+        c.argument('recurrence_type', arg_type=get_enum_type(['Always', 'Once', 'Daily', 'Weekly', 'Monthly']), help='Specifies when the suppression should be applied')
+        c.argument('start_date', help='Start date for suppression')
+        c.argument('end_date', help='End date for suppression')
+        c.argument('start_time', help='Start time for suppression')
+        c.argument('end_time', help='End date for suppression')
 
     with self.argument_context('alertsmanagement action-rule update') as c:
         c.argument('resource_group', resource_group_name_type)
-        c.argument('name', action_rule_name)
+        c.argument('action_rule_name', action_rule_name)
         c.argument('location', arg_type=get_location_type(self.cli_ctx))
         c.argument('tags', tags_type)
         c.argument('status', arg_type=get_enum_type(['Enabled', 'Disabled']), id_part=None, help='Indicates if the given action rule is enabled or disabled')

src/alertsmanagement/azext_alertsmanagement/commands.py

@@ -47,7 +47,9 @@ def load_command_table(self, _):
         client_factory=cf_action_rules)
     with self.command_group('alertsmanagement action-rule', alertsmanagement_action_rules, client_factory=cf_action_rules) as g:
         g.custom_command('create', 'create_alertsmanagement_action_rule')
-        g.custom_command('update', 'update_alertsmanagement_action_rule')
+        g.generic_update_command('update', custom_func_name='update_alertsmanagement_action_rule',
+                                 setter_arg_name='action_rule', getter_name='get_by_name',
+                                 setter_name='create_update')
         g.custom_command('delete', 'delete_alertsmanagement_action_rule')
         g.custom_show_command('show', 'get_alertsmanagement_action_rule')
         g.custom_command('list', 'list_alertsmanagement_action_rule')

src/alertsmanagement/azext_alertsmanagement/custom.py

@@ -144,56 +144,74 @@ def create_alertsmanagement_action_rule(cmd, client,
                                         alert_description=None,
                                         alert_context=None,
                                         tags=None,
-                                        status=None):
+                                        status=None,
+                                        recurrence_type=None,
+                                        start_date=None,
+                                        end_date=None,
+                                        start_time=None,
+                                        end_time=None):
     body = {}
     body['location'] = location  # str
     body['tags'] = tags  # unknown-primary[object]
-    body['status'] = status  # str
-    body['type'] = type
-    body['description'] = description
-    body['scope'] = {
-        'scopeType': scope_type,
-        'values': scope
-    }
+
+    properties = {}
+    if status is not None:
+        properties['status'] = status
+    properties['type'] = type
+    if description is not None:
+        properties['description'] = description
+    if scope is not None and scope_type is not None:
+        properties['scope'] = {
+            'scopeType': scope_type,
+            'values': scope
+        }
     severity = _transform_condition(severity)
     monitor_service = _transform_condition(monitor_service)
     monitor_condition = _transform_condition(monitor_condition)
     target_resource_type = _transform_condition(target_resource_type)
     alert_rule_id = _transform_condition(alert_rule_id)
     alert_description = _transform_condition(alert_description)
     alert_context = _transform_condition(alert_context)
-    body['conditions'] = {}
-    if severity is not None:
-        body['conditions']['severity'] = severity
-    if severity is not None:
-        body['conditions']['monitorService'] = monitor_service
-    if severity is not None:
-        body['conditions']['monitorCondition'] = monitor_condition
-    if severity is not None:
-        body['conditions']['targetResourceType'] = target_resource_type
-    if severity is not None:
-        body['conditions']['alertRuleId'] = alert_rule_id
+    properties['conditions'] = {}
     if severity is not None:
-        body['conditions']['description'] = alert_description
-    if severity is not None:
-        body['conditions']['alertContext'] = alert_context
+        properties['conditions']['severity'] = severity
+    if monitor_service is not None:
+        properties['conditions']['monitorService'] = monitor_service
+    if monitor_condition is not None:
+        properties['conditions']['monitorCondition'] = monitor_condition
+    if target_resource_type is not None:
+        properties['conditions']['targetResourceType'] = target_resource_type
+    if alert_rule_id is not None:
+        properties['conditions']['alertRuleId'] = alert_rule_id
+    if alert_description is not None:
+        properties['conditions']['description'] = alert_description
+    if alert_context is not None:
+        properties['conditions']['alertContext'] = alert_context
+    properties['suppressionConfig'] = {
+        'recurrenceType': recurrence_type,
+        'schedule': {
+            'startDate': start_date,
+            'endDate': end_date,
+            'startTime': start_time,
+            'endTime': end_time
+        }
+    }
+    body['properties'] = properties
+
     return client.create_update(resource_group_name=resource_group, action_rule_name=name, action_rule=body)
 
 
-def update_alertsmanagement_action_rule(cmd, client,
-                                        resource_group,
-                                        name,
+def update_alertsmanagement_action_rule(instance, client,
                                         location=None,
                                         tags=None,
                                         status=None):
-    body = {}
     if location is not None:
-        body['location'] = location  # str
+        instance.location = location
     if tags is not None:
-        body['tags'] = tags  # unknown-primary[object]
+        instance.tags = tags
     if status is not None:
-        body['status'] = status  # str
-    return client.create_update(resource_group_name=resource_group, action_rule_name=name, action_rule=body)
+        instance.properties.status = status
+    return instance
 
 
 def delete_alertsmanagement_action_rule(cmd, client,