SEBA-612 Port SEBA-571 changes to tt-workflow-driver

Change-Id: I8d6933805fa0106979e9f2e4bd6ac68be0f51e6c
diff --git a/xos/synchronizer/event_steps/onu_event.py b/xos/synchronizer/event_steps/onu_event.py
index 8d64254..f7f795f 100644
--- a/xos/synchronizer/event_steps/onu_event.py
+++ b/xos/synchronizer/event_steps/onu_event.py
@@ -32,16 +32,19 @@
         value = json.loads(event.value)
         self.log.info("onu.events: received event", value=value)
 
+        tt_si = TtHelpers.find_or_create_tt_si(self.model_accessor, self.log, value)
         if value["status"] == "activated":
             self.log.info("onu.events: activated onu", value=value)
             tt_si = TtHelpers.find_or_create_tt_si(self.model_accessor, self.log, value)
             tt_si.no_sync = False
             tt_si.uni_port_id = long(value["portNumber"])
             tt_si.of_dpid = value["deviceId"]
-            tt_si.onu_state = "ENABLED"
+            tt_si.oper_onu_status = "ENABLED"
             tt_si.save_changed_fields(always_update_timestamp=True)
         elif value["status"] == "disabled":
-            self.log.info("onu.events: disabled onu, not taking any action", value=value)
+            self.log.info("onu.events: disabled onu, resetting the subscriber", value=value)
+            tt_si.oper_onu_status = "DISABLED"
+            tt_si.save_changed_fields(always_update_timestamp=True)
             return
         else:
             self.log.warn("onu.events: Unknown status value: %s" % value["status"], value=value)