show registration

scripts/client/list-alarms.py

@@ -32,7 +32,13 @@ def get_row(msg):
         row = [key, None]
     else:
         row = [key,
-               value.state.name, value.overrides, value.effective_registration]
+               value.state.name]
+
+        if params.overrides:
+            row.append(value.overrides)
+
+        if params.effective:
+            row.append(value.effective_registration)
 
     row_header = get_row_header(headers, timestamp)
 
@@ -42,9 +48,15 @@ def get_row(msg):
 
 
 def disp_table(records):
-    head = ["Alarm Name", "State", "Overrides", "Effective Registration"]
+    head = ["Alarm Name", "State"]
     table = []
 
+    if params.overrides:
+        head.append("Overrides")
+
+    if params.effective:
+        head.append("Effective Registration")
+
     head = ["Timestamp", "User", "Host", "Produced By"] + head
 
     for msg in records.values():
@@ -79,12 +91,16 @@ def list_records():
 
 @click.command()
 @click.option('--monitor', is_flag=True, help="Monitor indefinitely")
-def cli(monitor):
+@click.option('--overrides', is_flag=True, help="Show overrides")
+@click.option('--effective', is_flag=True, help="Show effective registration")
+def cli(monitor, overrides, effective):
     global params
 
     params = types.SimpleNamespace()
 
     params.monitor = monitor
+    params.overrides = overrides
+    params.effective = effective
 
     list_records()
 

scripts/client/set-alarms.py

@@ -11,7 +11,7 @@
 from confluent_kafka.serialization import StringSerializer
 from jlab_jaws.avro.entities import Alarm, AlarmState, AlarmOverrideSet, ProcessorTransitions, OverriddenAlarmType, \
     DisabledOverride, FilteredOverride, LatchedOverride, MaskedOverride, OnDelayedOverride, OffDelayedOverride, \
-    ShelvedOverride, ShelvedReason
+    ShelvedOverride, ShelvedReason, AlarmRegistration, AlarmLocation, AlarmCategory, AlarmPriority, SimpleProducer
 from jlab_jaws.avro.serde import AlarmSerde
 
 from common import delivery_report
@@ -63,6 +63,23 @@ def get_overrides(override):
     return overrides
 
 
+def get_effective_registration():
+    return AlarmRegistration(AlarmLocation.INJ,
+                             AlarmCategory.RF,
+                             AlarmPriority.P4_INCIDENTAL,
+                             "testing",
+                             "fix it",
+                             "tester",
+                             True,
+                             True,
+                             5,
+                             5,
+                             "alarm1",
+                             "/tmp",
+                             "base",
+                             SimpleProducer())
+
+
 @click.command()
 @click.option('--unset', is_flag=True, help="present to clear state, missing to set state")
 @click.option('--state', required=True, type=click.Choice(AlarmState._member_names_), help="The state")
@@ -79,10 +96,11 @@ def cli(unset, state, override, name):
         params.value = None
     else:
         overrides = get_overrides(override)
+        effective_registration = get_effective_registration()
 
         params.value = Alarm(None,
                              None,
-                             None,
+                             effective_registration,
                              None,
                              overrides,
                              ProcessorTransitions(False, False, False, False,