Moving DHCP event handling in model policy, update the subscriber only when needed
Change-Id: I77ec7c05d802a5902d96a8216b932d7a703af4e9
diff --git a/xos/synchronizer/event_steps/test_dhcp_event.py b/xos/synchronizer/event_steps/test_dhcp_event.py
index a13b2b3..a31bf3f 100644
--- a/xos/synchronizer/event_steps/test_dhcp_event.py
+++ b/xos/synchronizer/event_steps/test_dhcp_event.py
@@ -81,13 +81,17 @@
self.volt.name = "vOLT"
self.volt.leaf_model = Mock()
- self.subscriber = RCORDSubscriber()
- self.subscriber.onu_device = "BRCM1234"
- self.subscriber.save = Mock()
+ # self.subscriber = RCORDSubscriber()
+ # self.subscriber.onu_device = "BRCM1234"
+ # self.subscriber.save = Mock()
self.mac_address = "00:AA:00:00:00:01"
self.ip_address = "192.168.3.5"
+ self.si = AttWorkflowDriverServiceInstance()
+ self.si.serial_number = "BRCM1234"
+ self.si.save = Mock()
+
def tearDown(self):
sys.path = self.sys_path_save
@@ -98,19 +102,21 @@
"deviceId" : "of:0000000000000001",
"portNumber" : "1",
"macAddress" : self.mac_address,
- "ipAddress" : self.ip_address
+ "ipAddress" : self.ip_address,
+ "messageType": "DHCPREQUEST"
})
with patch.object(VOLTService.objects, "get_items") as volt_service_mock, \
- patch.object(RCORDSubscriber.objects, "get_items") as subscriber_mock, \
+ patch.object(AttWorkflowDriverServiceInstance.objects, "get_items") as si_mock, \
patch.object(self.volt, "get_onu_sn_from_openflow") as get_onu_sn:
volt_service_mock.return_value = [self.volt]
get_onu_sn.return_value = "BRCM1234"
- subscriber_mock.return_value = [self.subscriber]
+ si_mock.return_value = [self.si]
self.event_step.process_event(self.event)
- self.subscriber.save.assert_called()
- self.assertEqual(self.subscriber.mac_address, self.mac_address)
- self.assertEqual(self.subscriber.ip_address, self.ip_address)
+ self.si.save.assert_called()
+ self.assertEqual(self.si.dhcp_state, "DHCPREQUEST")
+ self.assertEqual(self.si.mac_address, self.mac_address)
+ self.assertEqual(self.si.ip_address, self.ip_address)