Support for Voltha 2.x with only 1 UNI per ONU
With this patch only one UNI per ONU is supported.
The UNI has to be the one with portname (in ONOS) that ends with '-1'.
All the other ports with related events coming from ONOS on the Kafka
topic onu.events are not considered.
Change-Id: I8c250a9a30e53cfbdf41c9810917c92dd95bcbad
diff --git a/xos/synchronizer/helpers.py b/xos/synchronizer/helpers.py
index 3cbedb8..d228890 100755
--- a/xos/synchronizer/helpers.py
+++ b/xos/synchronizer/helpers.py
@@ -40,7 +40,7 @@
whitelisted = matching_entries[0]
try:
- onu = model_accessor.ONUDevice.objects.get(serial_number=dt_si.serial_number)
+ onu = model_accessor.ONUDevice.objects.get(serial_number=dt_si.serial_number.split("-")[0])
pon_port = onu.pon_port
except IndexError:
raise DeferredException("ONU device %s is not know to XOS yet" % dt_si.serial_number)
@@ -65,7 +65,8 @@
def find_or_create_dt_si(model_accessor, log, event):
try:
dt_si = model_accessor.DtWorkflowDriverServiceInstance.objects.get(
- serial_number=event["serialNumber"]
+ # FIXME: in this way we support a single UNI port per ONU
+ serial_number=event["serialNumber"].split("-")[0]
)
log.debug("DtHelpers: Found existing DtWorkflowDriverServiceInstance", si=dt_si)
except IndexError: