SEBA-612 Port SEBA-571 changes to tt-workflow-driver
Change-Id: I8d6933805fa0106979e9f2e4bd6ac68be0f51e6c
diff --git a/xos/synchronizer/model_policies/model_policy_tt_workflow_driver_serviceinstance.py b/xos/synchronizer/model_policies/model_policy_tt_workflow_driver_serviceinstance.py
index 95081c8..f9628e3 100644
--- a/xos/synchronizer/model_policies/model_policy_tt_workflow_driver_serviceinstance.py
+++ b/xos/synchronizer/model_policies/model_policy_tt_workflow_driver_serviceinstance.py
@@ -14,7 +14,7 @@
# limitations under the License.
-
+from helpers import TtHelpers
from xossynchronizer.model_policies.policy import Policy
import os
@@ -23,7 +23,6 @@
sync_path = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
sys.path.append(sync_path)
-from helpers import TtHelpers
class DeferredException(Exception):
pass
@@ -36,7 +35,7 @@
self.handle_update(si)
def handle_update(self, si):
- self.logger.debug("MODEL_POLICY: handle_update for TtWorkflowDriverServiceInstance %s " % (si.id), onu_state=si.onu_state)
+ self.logger.debug("MODEL_POLICY: handle_update for TtWorkflowDriverServiceInstance %s " % (si.id), onu_state=si.admin_onu_state)
self.process_onu_state(si)
self.process_dhcp_state(si)
@@ -51,28 +50,22 @@
si.save_changed_fields()
+ # Check the whitelist to see if the ONU is valid. If it is, make sure that it's enabled.
def process_onu_state(self, si):
[valid, message] = TtHelpers.validate_onu(self.model_accessor, self.logger, si)
- if si.onu_state == "AWAITING" or si.onu_state == "ENABLED":
- si.status_message = message
- if valid:
- si.onu_state = "ENABLED"
- self.update_onu(si.serial_number, "ENABLED")
- else:
- si.onu_state = "DISABLED"
- self.update_onu(si.serial_number, "DISABLED")
- else: # DISABLED
- if not valid:
- si.status_message = message
- else:
- si.status_message = "ONU has been disabled"
+ si.status_message = message
+ if valid:
+ si.admin_onu_state = "ENABLED"
+ self.update_onu(si.serial_number, "ENABLED")
+ else:
+ si.admin_onu_state = "DISABLED"
self.update_onu(si.serial_number, "DISABLED")
# The DhcpL2Relay ONOS app generates events that update the fields below.
# It only sends events when it processes DHCP packets. It keeps no internal state.
def process_dhcp_state(self, si):
- if si.onu_state in ["AWAITING", "DISABLED"]:
+ if si.admin_onu_state in ["AWAITING", "DISABLED"]:
si.ip_address = ""
si.mac_address = ""
si.dhcp_state = "AWAITING"
@@ -87,17 +80,20 @@
# ENABLED | *
# DISABLED | AWAITING
def validate_states(self, si):
- if (si.onu_state == "AWAITING" or si.onu_state == "DISABLED") and si.dhcp_state == "AWAITING":
+ if (si.admin_onu_state == "AWAITING" or si.admin_onu_state == "DISABLED") and si.dhcp_state == "AWAITING":
return
- if si.onu_state == "ENABLED":
+ if si.admin_onu_state == "ENABLED":
return
- self.logger.warning("MODEL_POLICY (validate_states): invalid state combination", onu_state=si.onu_state, dhcp_state=si.dhcp_state)
+ self.logger.warning("MODEL_POLICY (validate_states): invalid state combination", onu_state=si.admin_onu_state, dhcp_state=si.dhcp_state)
def update_onu(self, serial_number, admin_state):
- onu = [onu for onu in self.model_accessor.ONUDevice.objects.all() if onu.serial_number.lower() == serial_number.lower()][0]
+ onu = [onu for onu in self.model_accessor.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))
+ 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
@@ -105,10 +101,13 @@
def get_subscriber(self, serial_number):
try:
- return [s for s in self.model_accessor.RCORDSubscriber.objects.all() if s.onu_device.lower() == serial_number.lower()][0]
+ return [s for s in self.model_accessor.RCORDSubscriber.objects.all() if s.onu_device.lower()
+ == serial_number.lower()][0]
except IndexError:
# If the subscriber doesn't exist we don't do anything
- self.logger.debug("MODEL_POLICY: subscriber does not exists for this SI, doing nothing", onu_device=serial_number)
+ self.logger.debug(
+ "MODEL_POLICY: subscriber does not exists for this SI, doing nothing",
+ onu_device=serial_number)
return None
def update_subscriber_ip(self, subscriber, ip):
@@ -119,10 +118,15 @@
subscriber_id=subscriber.id,
ip=ip
)[0]
- self.logger.debug("MODEL_POLICY: found existing RCORDIpAddress for subscriber", onu_device=subscriber.onu_device, subscriber_status=subscriber.status, ip=ip)
+ self.logger.debug("MODEL_POLICY: found existing RCORDIpAddress for subscriber",
+ onu_device=subscriber.onu_device, subscriber_status=subscriber.status, ip=ip)
ip.save_changed_fields()
except IndexError:
- self.logger.debug("MODEL_POLICY: Creating new RCORDIpAddress for subscriber", onu_device=subscriber.onu_device, subscriber_status=subscriber.status, ip=ip)
+ self.logger.debug(
+ "MODEL_POLICY: Creating new RCORDIpAddress for subscriber",
+ onu_device=subscriber.onu_device,
+ subscriber_status=subscriber.status,
+ ip=ip)
ip = self.model_accessor.RCORDIpAddress(
subscriber_id=subscriber.id,
ip=ip,
@@ -136,25 +140,32 @@
subscriber_id=subscriber.id,
ip=ip
)[0]
- self.logger.debug("MODEL_POLICY: delete RCORDIpAddress for subscriber", onu_device=subscriber.onu_device, subscriber_status=subscriber.status, ip=ip)
+ self.logger.debug(
+ "MODEL_POLICY: delete RCORDIpAddress for subscriber",
+ onu_device=subscriber.onu_device,
+ subscriber_status=subscriber.status,
+ ip=ip)
ip.delete()
- except:
+ except BaseException:
self.logger.warning("MODEL_POLICY: no RCORDIpAddress object found, cannot delete", ip=ip)
def update_subscriber(self, subscriber, si):
cur_status = subscriber.status
# Don't change state if someone has disabled the subscriber
if subscriber.status != "disabled":
- if si.onu_state == "ENABLED":
+ if si.admin_onu_state == "ENABLED":
subscriber.status = "enabled"
- elif si.onu_state == "DISABLED":
+ elif si.admin_onu_state == "DISABLED":
subscriber.status = "awaiting-auth"
# NOTE we save the subscriber only if:
# - the status has changed
# - we get a DHCPACK event
if cur_status != subscriber.status or si.dhcp_state == "DHCPACK":
- self.logger.debug("MODEL_POLICY: updating subscriber", onu_device=subscriber.onu_device, subscriber_status=subscriber.status)
+ self.logger.debug(
+ "MODEL_POLICY: updating subscriber",
+ onu_device=subscriber.onu_device,
+ subscriber_status=subscriber.status)
if subscriber.status == "awaiting-auth":
self.delete_subscriber_ip(subscriber, si.ip_address)
subscriber.mac_address = ""