[CORD-2886] Sending device config to VOLTHA ONOS
Change-Id: Iec466bd5cf1528b2ca80064819de36a24b883e10
diff --git a/xos/synchronizer/steps/test_sync_olt_device.py b/xos/synchronizer/steps/test_sync_olt_device.py
index cd4906f..8143ef8 100644
--- a/xos/synchronizer/steps/test_sync_olt_device.py
+++ b/xos/synchronizer/steps/test_sync_olt_device.py
@@ -42,12 +42,12 @@
def match_onos_req(req):
r = req.json()['devices']
- if not r['abc']:
+ if not r['of:0000000ce2314000']:
return False
else:
- if not r['abc']['basic']['driver'] == 'pmc-olt':
+ if not r['of:0000000ce2314000']['basic']['driver'] == 'pmc-olt':
return False
- if not r['abc']['accessDevice']['vlan'] == "s_tag" or not r['abc']['accessDevice']['uplink'] == "129":
+ if not r['of:0000000ce2314000']['accessDevice']['vlan'] == "s_tag" or not r['of:0000000ce2314000']['accessDevice']['uplink'] == "129":
return False
return True
@@ -109,42 +109,25 @@
self.o = None
sys.path = self.sys_path_save
- def test_format_url(self):
- url = self.sync_step.format_url("onf.com")
- self.assertEqual(url, "http://onf.com")
- url = self.sync_step.format_url("http://onf.com")
- self.assertEqual(url, "http://onf.com")
- def test_get_voltha_info(self):
- voltha_dict = self.sync_step.get_voltha_info(self.o)
-
- self.assertEqual(voltha_dict["url"], "http://voltha_url")
- self.assertEqual(voltha_dict["user"], "voltha_user")
- self.assertEqual(voltha_dict["pass"], "voltha_pass")
-
- def test_get_onos_info(self):
- p_onos_dict = self.sync_step.get_p_onos_info(self.o)
-
- self.assertEqual(p_onos_dict["url"], "http://p_onos_url")
- self.assertEqual(p_onos_dict["user"], "p_onos_user")
- self.assertEqual(p_onos_dict["pass"], "p_onos_pass")
@requests_mock.Mocker()
def test_get_of_id_from_device(self, m):
logical_devices = {
"items": [
- {"root_device_id": "123", "id": "abc"},
+ {"root_device_id": "123", "id": "0001000ce2314000", "datapath_id": "55334486016"},
{"root_device_id": "0001cc4974a62b87", "id": "0001000000000001"}
]
}
m.get("http://voltha_url/api/v1/logical_devices", status_code=200, json=logical_devices)
self.o.device_id = "123"
- of_id = self.sync_step.get_of_id_from_device(self.o)
- self.assertEqual(of_id, "abc")
+ self.o = self.sync_step.get_ids_from_logical_device(self.o)
+ self.assertEqual(self.o.of_id, "0001000ce2314000")
+ self.assertEqual(self.o.dp_id, "of:0000000ce2314000")
with self.assertRaises(Exception) as e:
self.o.device_id = "idonotexist"
- self.sync_step.get_of_id_from_device(self.o)
+ self.sync_step.get_ids_from_logical_device(self.o)
self.assertEqual(e.exception.message, "Can't find a logical device for device id: idonotexist")
@requests_mock.Mocker()
@@ -191,7 +174,7 @@
m.get("http://voltha_url/api/v1/devices/123", json={"oper_status": "ENABLED", "admin_state": "ACTIVE"})
logical_devices = {
"items": [
- {"root_device_id": "123", "id": "abc"},
+ {"root_device_id": "123", "id": "0001000ce2314000", "datapath_id": "55334486016"},
{"root_device_id": "0001cc4974a62b87", "id": "0001000000000001"}
]
}
@@ -202,7 +185,8 @@
self.sync_step().sync_record(self.o)
self.assertEqual(self.o.admin_state, "ACTIVE")
self.assertEqual(self.o.oper_status, "ENABLED")
- self.assertEqual(self.o.of_id, "abc")
+ self.assertEqual(self.o.of_id, "0001000ce2314000")
+ # self.assertEqual(self.o.dp_id, "of:0000000ce2314000")
self.o.save.assert_called_once()
@requests_mock.Mocker()
@@ -212,7 +196,7 @@
self.o.device_id = "123"
self.o.admin_state = "ACTIVE"
self.o.oper_status = "ENABLED"
- self.o.of_id = "abc"
+ self.o.dp_id = "of:0000000ce2314000"
m.post("http://p_onos_url/onos/v1/network/configuration/", status_code=200, additional_matcher=match_onos_req, json={})
@@ -222,10 +206,10 @@
@requests_mock.Mocker()
def test_delete_record(self, m):
- self.o.of_id = "abc"
+ self.o.of_id = "0001000ce2314000"
self.o.device_id = "123"
- m.delete("http://p_onos_url/onos/v1/network/configuration/devices/abc", status_code=200)
+ m.delete("http://p_onos_url/onos/v1/network/configuration/devices/0001000ce2314000", status_code=200)
m.post("http://voltha_url/api/v1/devices/123/disable", status_code=200)
m.delete("http://voltha_url/api/v1/devices/123/delete", status_code=200)