[SEBA-251] Adding OLT name into onos netcfg
Change-Id: I28f4a574dc7c450886be7cc1e0c08d92622eafda
diff --git a/xos/synchronizer/steps/sync_olt_device.py b/xos/synchronizer/steps/sync_olt_device.py
index 241e507..301f123 100644
--- a/xos/synchronizer/steps/sync_olt_device.py
+++ b/xos/synchronizer/steps/sync_olt_device.py
@@ -124,6 +124,39 @@
return model
+ def configure_onos(self, model):
+
+ log.info("Adding OLT device in onos-voltha", object=str(model), **model.tologdict())
+
+ onos_voltha = Helpers.get_onos_voltha_info(model.volt_service)
+ onos_voltha_basic_auth = HTTPBasicAuth(onos_voltha['user'], onos_voltha['pass'])
+
+ # Add device info to onos-voltha
+ data = {
+ "devices": {
+ model.dp_id: {
+ "basic": {
+ "name": model.name
+ }
+ }
+ }
+ }
+
+ log.info("Calling ONOS", data=data)
+
+ url = "%s:%d/onos/v1/network/configuration/" % (onos_voltha['url'], onos_voltha['port'])
+ request = requests.post(url, json=data, auth=onos_voltha_basic_auth)
+
+ if request.status_code != 200:
+ log.error(request.text)
+ raise Exception("Failed to add OLT device %s into ONOS" % model.name)
+ else:
+ try:
+ print request.json()
+ except Exception:
+ print request.text
+ return model
+
def sync_record(self, model):
log.info("Synching device", object=str(model), **model.tologdict())
@@ -137,6 +170,8 @@
else:
log.info("OLT device already exists in VOLTHA", object=str(model), **model.tologdict())
+ self.configure_onos(model)
+
def delete_record(self, model):
log.info("Deleting OLT device", object=str(model), **model.tologdict())
diff --git a/xos/synchronizer/steps/test_sync_olt_device.py b/xos/synchronizer/steps/test_sync_olt_device.py
index 6fdf546..dd3f249 100644
--- a/xos/synchronizer/steps/test_sync_olt_device.py
+++ b/xos/synchronizer/steps/test_sync_olt_device.py
@@ -95,11 +95,17 @@
o.volt_service.voltha_user = "voltha_user"
o.volt_service.voltha_pass = "voltha_pass"
+ o.volt_service.onos_voltha_port = 4321
+ o.volt_service.onos_voltha_url = "onos"
+ o.volt_service.onos_voltha_user = "karaf"
+ o.volt_service.onos_voltha_pass = "karaf"
+
o.device_type = "ponsim_olt"
o.host = "172.17.0.1"
o.port = "50060"
o.uplink = "129"
o.driver = "voltha"
+ o.name = "Test Device"
# feedback state
o.device_id = None
@@ -196,6 +202,18 @@
}
m.get("http://voltha_url:1234/api/v1/logical_devices", status_code=200, json=logical_devices)
+ onos_expected_conf = {
+ "devices": {
+ "of:0000000ce2314000": {
+ "basic": {
+ "name": self.o.name
+ }
+ }
+ }
+ }
+ m.post("http://onos:4321/onos/v1/network/configuration/", status_code=200, json=onos_expected_conf,
+ additional_matcher=functools.partial(match_json, onos_expected_conf))
+
self.sync_step().sync_record(self.o)
self.assertEqual(self.o.admin_state, "ENABLED")
self.assertEqual(self.o.oper_status, "ACTIVE")
@@ -217,6 +235,18 @@
"mac_address": self.o.mac_address
}
+ onos_expected_conf = {
+ "devices": {
+ "of:0000000ce2314000": {
+ "basic": {
+ "name": self.o.name
+ }
+ }
+ }
+ }
+ m.post("http://onos:4321/onos/v1/network/configuration/", status_code=200, json=onos_expected_conf,
+ additional_matcher=functools.partial(match_json, onos_expected_conf))
+
m.post("http://voltha_url:1234/api/v1/devices", status_code=200, json={"id": "123"},
additional_matcher=functools.partial(match_json, expected_conf))
m.post("http://voltha_url:1234/api/v1/devices/123/enable", status_code=200)
@@ -279,6 +309,18 @@
self.o.dp_id = "of:0000000ce2314000"
self.o.of_id = "0001000ce2314000"
+ expected_conf = {
+ "devices": {
+ self.o.dp_id: {
+ "basic": {
+ "name": self.o.name
+ }
+ }
+ }
+ }
+ m.post("http://onos:4321/onos/v1/network/configuration/", status_code=200, json=expected_conf,
+ additional_matcher=functools.partial(match_json, expected_conf))
+
self.sync_step().sync_record(self.o)
self.o.save.assert_not_called()