commit 88709c453e783b566722b7117982a6bfcbcfa565
author Matteo Scandolo <teo@opennetworking.org> Wed Jun 20 16:59:38 2018 -0700
committer Matteo Scandolo <teo@opennetworking.org> Wed Jun 20 16:59:38 2018 -0700
tree 0c4fe633799b1c1b56ca6badbb5c1f205dde1898
parent 8acfb409dee759f6b3f1860f3f9d414a57339c80

Fixing TOSCA_key for OLT_Device

Change-Id: I9a60c0110f8c5c86d7e19fc1ff6b9d5ca0cc99bd

xos/synchronizer/models/volt.xproto

diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index c612952..de66517 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -22,10 +22,10 @@
 
     required manytoone volt_service->VOLTService:volt_devices = 1 [db_index = True, null = False, blank = False];
     optional string name = 2 [help_text = "name of device", max_length = 254, null = True, db_index = False, blank = True, unique = True];
-    required string device_type = 3 [help_text = "Device Type", default = "asfvolt16_olt", max_length = 254, null = False, db_index = False, blank = False, tosca_key=True];
+    required string device_type = 3 [help_text = "Device Type", default = "openolt", max_length = 254, null = False, db_index = False, blank = False];
     optional string host = 4 [help_text = "Device IP", max_length = 254, null = True, db_index = False, blank = True];
-    optional int32 port = 5 [help_text = "Device port", null = True, db_index = False, blank = True, tosca_key_one_of=host];
-    optional string mac_address = 6 [help_text = "Device mac address", null = True, db_index = False, blank = True, tosca_key_one_of=host];
+    optional int32 port = 5 [help_text = "Device port", null = True, db_index = False, blank = True];
+    optional string mac_address = 6 [help_text = "Device mac address", null = True, db_index = False, blank = True];
 
     optional string device_id = 10 [help_text = "Device ID", null = True, db_index = False, blank = False, feedback_state = True];
     optional string admin_state = 11 [help_text = "admin_state", null = True, db_index = False, blank = False, feedback_state = True];
@@ -33,7 +33,7 @@
     optional string of_id = 13 [help_text = "openflow id", null = True, db_index = False, blank = False, feedback_state = True];
     optional string dp_id = 14 [help_text = "datapath id", null = True, db_index = False, blank = False, feedback_state = True];
 
-    required string uplink = 15 [default="129", help_text = "uplink port", null = False, db_index = False, blank = False];
+    required string uplink = 15 [help_text = "uplink port", null = False, db_index = False, blank = False];
     required string driver = 16 [default="voltha", help_text = "Olt driver", null = True, db_index = False, blank = False];
 
     optional string switch_datapath_id = 17 [help_text = "Fabric switch to which the OLT is connected", null = False, db_index = False, blank = False];

xos/synchronizer/steps/sync_olt_device.py

diff --git a/xos/synchronizer/steps/sync_olt_device.py b/xos/synchronizer/steps/sync_olt_device.py
index 29722f9..97e90a2 100644
--- a/xos/synchronizer/steps/sync_olt_device.py
+++ b/xos/synchronizer/steps/sync_olt_device.py
@@ -165,6 +165,7 @@
         else:
             log.info("OLT device already exists in VOLTHA", object=str(model), **model.tologdict())
 
+        # TODO configure onos only if we have: Switch datapath id, Switch port, Uplink
         self.configure_onos(model)
 
     def delete_record(self, model):