commit d1e5b381e83f20b309782fd0b6650610a350d1ec
author Matteo Scandolo <teo@opennetworking.org> Tue Jul 10 13:15:14 2018 -0700
committer Matteo Scandolo <teo@opennetworking.org> Tue Jul 10 23:18:40 2018 +0000
tree 2498d8d0942abaf3399b77bba1a51898cfab0c3f
parent 249e84e5c66efdf95fde090c819b3131955536ab

[SEBA-55] Handling multiple events for the same ONUDevice

Change-Id: Ic0de47151d8885952536322bfb4a2258ade3fd62

xos/synchronizer/models/convenience/hippieossservice.py

diff --git a/xos/synchronizer/models/convenience/hippieossservice.py b/xos/synchronizer/models/convenience/hippieossservice.py
index 0959303..33ab09a 100644
--- a/xos/synchronizer/models/convenience/hippieossservice.py
+++ b/xos/synchronizer/models/convenience/hippieossservice.py
@@ -18,11 +18,10 @@
 # {
 #     'status': 'activate',
 #     'serial_number': 'BRCM1234',
-#     'uni_port_id': 'of:00100101',
 #     'of_dpid': 'of:109299321'
 # }
 
-from xosapi.orm import ORMWrapper, register_convenience_wrapper
+from xosapi.orm import register_convenience_wrapper
 from xosapi.convenience.serviceinstance import ORMWrapperServiceInstance
 
 import logging as log
@@ -30,18 +29,21 @@
 class ORMWrapperHippieOSSService(ORMWrapperServiceInstance):
 
     def validate_onu(self, event):
-        log.info("validating ONU %s" % event["serial_number"])
 
-        # TODO check if a service instance for this serial_number already exists
+        log.info("validating ONU %s" % event["serial_number"], event=event)
 
-        # create an HippieOSSServiceInstance, the validation will be triggered in the corresponding sync step
-        oss_si = self.stub.HippieOSSServiceInstance(
-            serial_number=event["serial_number"],
-            of_dpid=event["of_dpid"]
-        )
-        oss_si.save()
-
-
-
+        try:
+            oss_si = self.stub.HippieOSSServiceInstance.objects.get(serial_number=event["serial_number"])
+            oss_si.no_sync = False;
+            log.debug("Found existing HippieOSSServiceInstance", si=oss_si)
+        except IndexError:
+            # create an HippieOSSServiceInstance, the validation will be triggered in the corresponding sync step
+            oss_si = self.stub.HippieOSSServiceInstance(
+                serial_number=event["serial_number"],
+                of_dpid=event["of_dpid"]
+            )
+            log.debug("Created new HippieOSSServiceInstance", si=oss_si)
+        
+        oss_si.save(always_update_timestamp=True)
 
 register_convenience_wrapper("HippieOSSService", ORMWrapperHippieOSSService)