commit c6ac74aed0b5a6b3677162c4fd081d0a884a84d9
author Matteo Scandolo <teo@opennetworking.org> Fri Sep 14 08:14:51 2018 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri Sep 14 08:14:51 2018 -0700
tree c5164b1da690fa5c4f90a1f15bfe54bc9b3ca898
parent 075ec44c72e855af4303e12a7ae66f9ba61fd35e

Avoid saving of related objects if nothing has changed

Change-Id: I01f291dd66e0e1a37622c6af8667955e3f4fdf74

xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py

diff --git a/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py b/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
index e410561..a664dcd 100644
--- a/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_att_workflow_driver_serviceinstance.py
@@ -67,11 +67,13 @@
             self.update_onu(si.serial_number, "DISABLED")
 
     def update_onu(self, serial_number, admin_state):
-        # TODO if the status hasn't changed don't save it again
-        self.logger.debug("MODEL_POLICY: setting ONUDevice [%s] admin_state to %s" % (serial_number, admin_state))
-        onu = ONUDevice.objects.get(serial_number=serial_number)
-        onu.admin_state = admin_state
-        onu.save(always_update_timestamp=True)
+        onu = [onu for onu in ONUDevice.objects.all() if onu.serial_number.lower() == serial_number.lower()][0]
+        if onu.admin_state == admin_state:
+            self.logger.debug("MODEL_POLICY: ONUDevice [%s] already has admin_state to %s" % (serial_number, admin_state))
+        else:
+            self.logger.debug("MODEL_POLICY: setting ONUDevice [%s] admin_state to %s" % (serial_number, admin_state))
+            onu.admin_state = admin_state
+            onu.save(always_update_timestamp=True)
 
     def get_subscriber(self, serial_number):
         try:
@@ -82,7 +84,7 @@
             return None
 
     def update_subscriber(self, subscriber, si):
-        # TODO if the status hasn't changed don't save it again
+        cur_status = subscriber.status
         if si.authentication_state == "AWAITING":
             subscriber.status = "awaiting-auth"
             si.status_message += " - Awaiting Authentication"
@@ -98,9 +100,13 @@
         elif si.authentication_state == "DENIED":
             subscriber.status = "auth-failed"
             si.status_message += " - Authentication denied"
-        self.logger.debug("MODEL_POLICY: handling subscriber", onu_device=subscriber.onu_device, authentication_state=si.authentication_state, subscriber_status=subscriber.status)
 
-        subscriber.save(always_update_timestamp=True)
+        if cur_status == subscriber.status:
+            self.logger.debug("MODEL_POLICY: subscriber status has not changed", onu_device=subscriber.onu_device,
+                              authentication_state=si.authentication_state, subscriber_status=subscriber.status)
+        else:
+            self.logger.debug("MODEL_POLICY: updating subscriber", onu_device=subscriber.onu_device, authentication_state=si.authentication_state, subscriber_status=subscriber.status)
+            subscriber.save(always_update_timestamp=True)
 
     def handle_delete(self, si):
         pass