commit ac3a165c04807cca1def659758c5cc05bb2288b1
author Hardik Windlass <hardik_windlass@infosys.com> Sat Mar 30 20:43:20 2019 +0530
committer Hardik Windlass <hardik_windlass@infosys.com> Thu Apr 11 13:50:18 2019 +0530
tree 2d9d90571c32311ebe52e0138634d29af75424d8
parent 3ff4700f6d791a84b8be7a07232eeb4db48aed62

[SEBA-297] Standardized onu.events format

Change-Id: Ie34462c13a5733c871652af0678f538119c187bc

xos/synchronizer/event_steps/test_onu_events.py

diff --git a/xos/synchronizer/event_steps/test_onu_events.py b/xos/synchronizer/event_steps/test_onu_events.py
index ea368d5..0bd1c31 100644
--- a/xos/synchronizer/event_steps/test_onu_events.py
+++ b/xos/synchronizer/event_steps/test_onu_events.py
@@ -58,9 +58,9 @@
         self.event = Mock()
         self.event_dict = {
             'status': 'activated',
-            'serial_number': 'BRCM1234',
-            'of_dpid': 'of:109299321',
-            'uni_port_id': 16
+            'serialNumber': 'BRCM1234',
+            'deviceId': 'of:109299321',
+            'portNumber': '16'
         }
         self.event.value = json.dumps(self.event_dict)
 
@@ -85,15 +85,15 @@
 
             self.assertEqual(mock_save.call_count, 1)
 
-            self.assertEqual(tt_si.serial_number, self.event_dict['serial_number'])
-            self.assertEqual(tt_si.of_dpid, self.event_dict['of_dpid'])
-            self.assertEqual(tt_si.uni_port_id, self.event_dict['uni_port_id'])
+            self.assertEqual(tt_si.serial_number, self.event_dict['serialNumber'])
+            self.assertEqual(tt_si.of_dpid, self.event_dict['deviceId'])
+            self.assertEqual(tt_si.uni_port_id, long(self.event_dict['portNumber']))
             self.assertEqual(tt_si.onu_state, "ENABLED")
 
     def test_reuse_instance(self):
 
         si = TtWorkflowDriverServiceInstance(
-            serial_number=self.event_dict["serial_number"],
+            serial_number=self.event_dict["serialNumber"],
             of_dpid="foo",
             uni_port_id="foo"
         )
@@ -109,17 +109,17 @@
 
             self.assertEqual(mock_save.call_count, 1)
 
-            self.assertEqual(tt_si.serial_number, self.event_dict['serial_number'])
-            self.assertEqual(tt_si.of_dpid, self.event_dict['of_dpid'])
-            self.assertEqual(tt_si.uni_port_id, self.event_dict['uni_port_id'])
+            self.assertEqual(tt_si.serial_number, self.event_dict['serialNumber'])
+            self.assertEqual(tt_si.of_dpid, self.event_dict['deviceId'])
+            self.assertEqual(tt_si.uni_port_id, long(self.event_dict['portNumber']))
             self.assertEqual(tt_si.onu_state, "ENABLED")
 
     def test_disable_onu(self):
         self.event_dict = {
             'status': 'disabled',
-            'serial_number': 'BRCM1234',
-            'of_dpid': 'of:109299321',
-            'uni_port_id': 16
+            'serialNumber': 'BRCM1234',
+            'deviceId': 'of:109299321',
+            'portNumber': '16'
         }
         self.event.value = json.dumps(self.event_dict)
 
@@ -132,4 +132,4 @@
 
 if __name__ == '__main__':
     sys.path.append("..")  # for import of helpers.py
-    unittest.main()
\ No newline at end of file
+    unittest.main()