Revert "SEBA-357 remove OLTDevice.uplink_port"
This reverts commit b32c5841731b844597465fb92810c82e86337021.
Change-Id: Ie17a784e703e3a204829bb7a208e6924d20e520f
diff --git a/VERSION b/VERSION
index a39c0b7..8dbb0f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.11
+2.1.10
diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index cc9b652..60fb08d 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -34,6 +34,7 @@
optional string of_id = 13 [help_text = "openflow id", db_index = False, feedback_state = True];
optional string dp_id = 14 [help_text = "datapath id", db_index = False];
+ required string uplink = 15 [help_text = "uplink port", db_index = False];
required string driver = 16 [default="voltha", help_text = "Olt driver", db_index = False];
optional string switch_datapath_id = 17 [help_text = "Fabric switch to which the OLT is connected", db_index = False];
diff --git a/xos/synchronizer/steps/test_sync_olt_device.py b/xos/synchronizer/steps/test_sync_olt_device.py
index c656c1d..38da1a1 100644
--- a/xos/synchronizer/steps/test_sync_olt_device.py
+++ b/xos/synchronizer/steps/test_sync_olt_device.py
@@ -42,6 +42,17 @@
raise Exception("Unable to find service=%s xproto=%s" % (service_name, xproto_name))
# END generate model from xproto
+def match_onos_req(req):
+ request = req.json()['devices']
+ if not request['of:0000000ce2314000']:
+ return False
+ else:
+ if not request['of:0000000ce2314000']['basic']['driver'] == 'voltha':
+ return False
+ if not request['of:0000000ce2314000']['accessDevice']['vlan'] == 1 or not request['of:0000000ce2314000']['accessDevice']['uplink'] == "129":
+ return False
+ return True
+
def match_json(desired, req):
if desired!=req.json():
raise Exception("Got request %s, but body is not matching" % req.url)
@@ -93,6 +104,7 @@
o.device_type = "ponsim_olt"
o.host = "172.17.0.1"
o.port = "50060"
+ o.uplink = "129"
o.driver = "voltha"
o.name = "Test Device"