commit b8621cd45f547245e81792dae279cd3a35be17b2
author Matteo Scandolo <teo@opennetworking.org> Wed Apr 04 17:12:37 2018 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri Apr 06 15:25:37 2018 -0700
tree 430ea8c0e11df3f1a5402261ea90e54c5030baf1
parent ce27e9c15a8b371e19e584e185cbea04f528f8d6

Prevent synchronizer to push OLTs to VOLTHA if they have feedback state
Moved the s_tag in the PONPort Model

Change-Id: I8e6b07ff925f0df7772a66425e9ddaa944cfe9fb

xos/synchronizer/models/volt.xproto

diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index a58b696..b66bddc 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -39,7 +39,6 @@
     optional string of_id = 13 [help_text = "openflow id", null = True, db_index = False, blank = False, feedback_state = True];
 
     required string uplink = 14 [default="129", help_text = "uplink port", null = False, db_index = False, blank = False];
-    required string vlan = 15 [default="3", help_text = "same as S-Tag", null = True, db_index = False, blank = False];
     required string driver = 16 [default="pmc-olt", help_text = "Olt driver", null = True, db_index = False, blank = False];
 }
 
@@ -55,7 +54,7 @@
     option verbose_name = "PON Port";
 
     required string name = 1 [db_index = True, null = False, blank = False];
-    required manytoone volt_device->OLTDevice:ports = 2 [db_index = True, null = False, blank = False];
-    required string port_id = 3 [help_text = "Port ID (Feedback State)", max_length = 254, null = False, db_index = False, blank = False];
+    required manytoone olt_device->OLTDevice:ports = 2 [db_index = True, null = False, blank = False];
+    required string port_id = 3 [help_text = "Port ID", max_length = 254, null = False, db_index = False, blank = False];
     required int32 s_tag = 4 [help_text = "S Tag", null = False, db_index = False, blank = False];
 }