SEBA-357 remove OLTDevice.uplink_port
Change-Id: I52b86af77937de16478e9badac48abaca47ce369
diff --git a/VERSION b/VERSION
index 8dbb0f2..a39c0b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.10
+2.1.11
diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index 60fb08d..cc9b652 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -34,7 +34,6 @@
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 38da1a1..c656c1d 100644
--- a/xos/synchronizer/steps/test_sync_olt_device.py
+++ b/xos/synchronizer/steps/test_sync_olt_device.py
@@ -42,17 +42,6 @@
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)
@@ -104,7 +93,6 @@
o.device_type = "ponsim_olt"
o.host = "172.17.0.1"
o.port = "50060"
- o.uplink = "129"
o.driver = "voltha"
o.name = "Test Device"