commit 2a4dacb2a6867d9edd17196b2105951b3b65a3d4
author Scott Baker <smbaker@gmail.com> Wed Apr 03 13:00:35 2019 -0700
committer Scott Baker <smbaker@gmail.com> Mon Apr 15 15:11:42 2019 -0700
tree ede84a3dbf7f9d2ab3ce35ca4f65fe6b02eaffec
parent 3e557669dec7fbc80eb787d2d93d7bc2c5a72248

SEBA-206 add switch context to PORT_LOS alarm;
add olt name to PORT_LOS alarm;
rename alarm

Change-Id: I3c5d65c27178dc4e14b4e6b70f955deedaa7d352

xos/synchronizer/event_steps/test_onos_event.py

diff --git a/xos/synchronizer/event_steps/test_onos_event.py b/xos/synchronizer/event_steps/test_onos_event.py
index 8f8f0d8..2148493 100644
--- a/xos/synchronizer/event_steps/test_onos_event.py
+++ b/xos/synchronizer/event_steps/test_onos_event.py
@@ -80,7 +80,7 @@
 
         self.oltdevice = OLTDevice(name="myolt",
                                    device_id="of:0000000000000001",
-                                   switch_dsatapath_id="of:0000000000000001",
+                                   switch_datapath_id="of:0000000000000001",
                                    switch_port="1")
 
         self.ponport = PONPort(olt_device = self.oltdevice)
@@ -179,14 +179,17 @@
                  u"reported_ts": ANY,
                  u"raised_ts": raised_ts,
                  u"state": u"RAISED",
-                 u"alarm_type_name": u"OLT.LOSS_OF_AGGSWITCH",
+                 u"alarm_type_name": u"OLT.PORT_LOS",
                  u"severity": u"MAJOR",
                  u"resource_id": unicode(self.oltdevice.device_id),
                  u"logical_device_id": self.oltdevice.dp_id,
-                 u"context": {u'affected_subscribers': [u'somesubscriber']},
+                 u"context": {u'affected_subscribers': [u'somesubscriber'],
+                              u"switch_datapath_id": "of:0000000000000001",
+                              u"switch_port": "1",
+                              u"oltdevice.name": "myolt"},
                  u"type": u"COMMUNICATION",
-                 u"id": u"xos.voltservice.%s.OLT_LOSS_OF_AGGWSWITCH" % self.oltdevice.device_id,
-                 u"description": u"xos.voltservice.%s - OLT LOSS OF AGGSWITCH Alarm - OLT_LOSS_OF_AGGSWITCH - RAISED" % self.oltdevice.device_id}
+                 u"id": u"xos.voltservice.%s.OLT_PORT_LOS" % self.oltdevice.device_id,
+                 u"description": u"xos.voltservice.%s - OLT PORT LOS Alarm - OLT_PORT_LOS - RAISED" % self.oltdevice.device_id}
 
         self.assertDictEqual(expected_alarm, event)
 
@@ -219,14 +222,17 @@
                  u"reported_ts": ANY,
                  u"raised_ts": raised_ts,
                  u"state": u"CLEARED",
-                 u"alarm_type_name": u"OLT.LOSS_OF_AGGSWITCH",
+                 u"alarm_type_name": u"OLT.PORT_LOS",
                  u"severity": u"MAJOR",
                  u"resource_id": unicode(self.oltdevice.device_id),
                  u"logical_device_id": self.oltdevice.dp_id,
-                 u"context": {u'affected_subscribers': [u'somesubscriber']},
+                 u"context": {u'affected_subscribers': [u'somesubscriber'],
+                              u"switch_datapath_id": "of:0000000000000001",
+                              u"switch_port": "1",
+                              u"oltdevice.name": "myolt"},
                  u"type": u"COMMUNICATION",
-                 u"id": u"xos.voltservice.%s.OLT_LOSS_OF_AGGWSWITCH" % self.oltdevice.device_id,
-                 u"description": u"xos.voltservice.%s - OLT LOSS OF AGGSWITCH Alarm - OLT_LOSS_OF_AGGSWITCH - CLEARED" % self.oltdevice.device_id}
+                 u"id": u"xos.voltservice.%s.OLT_PORT_LOS" % self.oltdevice.device_id,
+                 u"description": u"xos.voltservice.%s - OLT PORT LOS Alarm - OLT_PORT_LOS - CLEARED" % self.oltdevice.device_id}
 
         self.assertDictEqual(expected_alarm, event)