commit 8782a5454bd75ef3dd0edac79252a27060fc0e1b
author Scott Baker <smbaker@gmail.com> Tue Mar 12 15:38:14 2019 -0700
committer Scott Baker <smbaker@gmail.com> Tue Mar 12 16:10:36 2019 -0700
tree 4db0e1efdc18d09864a41cc60d9977e863186fd0
parent bf209940485b8a387ae598b2909b742cde83147d

SEBA-420 remove superfluous xproto options

Change-Id: I8c2242466947d5196579f904abe17d12891fa7ac

Dockerfile.synchronizer

diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 4ff68ac..0da2edb 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -17,7 +17,7 @@
 
 # xosproject/rcord-synchronizer
 
-FROM xosproject/xos-synchronizer-base:2.2.11
+FROM xosproject/xos-synchronizer-base:2.2.18
 
 COPY xos/synchronizer /opt/xos/synchronizers/rcord
 COPY VERSION /opt/xos/synchronizers/rcord/

xos/synchronizer/models/rcord.xproto

diff --git a/xos/synchronizer/models/rcord.xproto b/xos/synchronizer/models/rcord.xproto
index 2ba15be..13df2f6 100644
--- a/xos/synchronizer/models/rcord.xproto
+++ b/xos/synchronizer/models/rcord.xproto
@@ -9,7 +9,6 @@
     required string access = 11 [
         help_text = "Name of service that is managing the Access Network",
         default = "voltha", choices = "(('voltha', 'VOLTHA'), ('unknown', 'Unknown'))",
-        db_index = False,
         max_length = 30];
 }
 
@@ -26,7 +25,6 @@
     optional string status = 11 [
         help_text = "Status of subscriber provisioning and authentication",
         content_type = "stripped",
-        db_index = False,
         default = "enabled",
         choices = "(('enabled', 'Enabled'), ('disabled', 'Disabled'), ('pre-provisioned', 'Pre Provisioned'), ('awaiting-auth', 'Awaiting Authentication'), ('auth-failed', 'Authentication Failed'))",
         max_length = 30];
@@ -34,31 +32,24 @@
     // parameters for r-cord lite
     optional int32 c_tag = 12 [
         help_text = "Customer VLAN Tag, one half of the double-tag that identifies this subscriber's traffic",
-        db_index = False,
         min_value = 0,
         max_value = 4096];
     optional int32 s_tag = 19 [
         help_text = "Service VLAN Tag, one half of the double-tag that identifies this subscriber's traffic",
-        db_index = False,
         min_value = 0,
         max_value = 4096];
     required string onu_device = 13 [
-        help_text = "ONUDevice serial number",
-        db_index = False];
+        help_text = "ONUDevice serial number"];
     optional string mac_address = 18 [
-        help_text = "Subscriber MAC Address",
-        db_index = False];
+        help_text = "Subscriber MAC Address"];
 
     // operator specific fields
     optional string nas_port_id = 20 [
-        help_text = "NAS Port ID used in Radius to identify physical interface used to authenticate subscriber",
-        db_index = False];
+        help_text = "NAS Port ID used in Radius to identify physical interface used to authenticate subscriber"];
     optional string circuit_id = 21 [
-        help_text = "Option 82 Circuit ID for DHCP relay agent",
-        db_index = False];
+        help_text = "Option 82 Circuit ID for DHCP relay agent"];
     optional string remote_id = 22 [
-        help_text = "Option 82 Remote ID for DHCP relay agent",
-        db_index = False];
+        help_text = "Option 82 Remote ID for DHCP relay agent"];
 }
 
 message RCORDIpAddress(XOSBase) {
@@ -70,11 +61,9 @@
         db_index = True];
     required string ip = 2 [
         help_text = "The unique IP address (either IPv4 or IPv6 / netmask)",
-        db_index = False,
         max_length = 52,
         unique_with = "subscriber"];
     optional string description = 3 [
         help_text = "A short description of the IP address",
-        db_index = False,
         max_length = 254];
 }