commit 77eac1dcdb986936a0a39a8d534abc37ffb94e60
author Scott Baker <smbaker@gmail.com> Fri Oct 26 17:32:04 2018 -0700
committer Scott Baker <smbaker@gmail.com> Tue Oct 30 13:08:38 2018 -0700
tree edb5d74633553b59a1451777bfe25aa86d9219cf
parent f140dedf01a751f2a42f5fb320e4bac5979340bb

SEBA-324 reverse field numbers for manytoone relations

Change-Id: I2725a85c1c0526875864880e7d3707052dd32b98

Dockerfile.synchronizer

diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index a9fc894..edf0cef 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -16,7 +16,7 @@
 
 # xosproject/volt-synchronizer
 
-FROM xosproject/xos-synchronizer-base:2.1.19
+FROM xosproject/xos-synchronizer-base:2.1.21
 
 COPY xos/synchronizer /opt/xos/synchronizers/volt
 COPY VERSION /opt/xos/synchronizers/volt/

VERSION

diff --git a/VERSION b/VERSION
index 08ec77d..04b10b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.6-dev
+2.1.7

xos/synchronizer/models/volt.xproto

diff --git a/xos/synchronizer/models/volt.xproto b/xos/synchronizer/models/volt.xproto
index 6be0fca..60fb08d 100644
--- a/xos/synchronizer/models/volt.xproto
+++ b/xos/synchronizer/models/volt.xproto
@@ -20,7 +20,7 @@
     option verbose_name = "OLT Device";
     option description="Represents a physical OLT device";
 
-    required manytoone volt_service->VOLTService:volt_devices = 1 [db_index = True];
+    required manytoone volt_service->VOLTService:volt_devices = 1:1001 [db_index = True];
     optional string name = 2 [help_text = "name of device", max_length = 254, db_index = False, unique = True];
     required string device_type = 3 [help_text = "Device Type", default = "openolt", max_length = 254, db_index = False];
     optional string host = 4 [help_text = "Device IP", max_length = 254, db_index = False];
@@ -58,19 +58,19 @@
     option verbose_name = "PON Port";
     option description="PON Port";
 
-    required manytoone olt_device->OLTDevice:pon_ports = 1 [db_index = True];
+    required manytoone olt_device->OLTDevice:pon_ports = 1:1001 [db_index = True];
 }
 
 message NNIPort (PortBase) {
     option verbose_name = "NNI Port";
-    required manytoone olt_device->OLTDevice:nni_ports = 1 [db_index = True];
+    required manytoone olt_device->OLTDevice:nni_ports = 1:1002 [db_index = True];
 }
 
 message ONUDevice (XOSBase){
     option verbose_name = "ONU Device";
     option description = "Represents a physical ONU device";
 
-    required manytoone pon_port->PONPort:onu_devices = 1 [db_index = True];
+    required manytoone pon_port->PONPort:onu_devices = 1:1001 [db_index = True];
     required string serial_number = 2 [max_length = 254, db_index = False, tosca_key=True, unique = True];
     required string vendor = 3 [max_length = 254, db_index = False];
     required string device_type = 4 [help_text = "Device Type", default = "asfvolt16_olt", max_length = 254, db_index = False];
@@ -84,12 +84,12 @@
 message PONONUPort (PortBase) {
     option verbose_name = "ANI Port";
     option description="ANI Port";
-    required manytoone onu_device->ONUDevice:pononu_ports = 1 [db_index = True];
+    required manytoone onu_device->ONUDevice:pononu_ports = 1:1001 [db_index = True];
 }
 
 message UNIPort (PortBase) {
     option verbose_name = "UNI Port";
-    required manytoone onu_device->ONUDevice:uni_ports = 1 [db_index = True];
+    required manytoone onu_device->ONUDevice:uni_ports = 1:1002 [db_index = True];
 }
 
 message VOLTServiceInstance (ServiceInstance){
@@ -98,5 +98,5 @@
     option verbose_name = "vOLT Service Instance";
 
     optional string description = 1 [max_length = 254, db_index = False];
-    optional manytoone onu_device->ONUDevice:volt_service_instances = 2 [db_index = True];
+    optional manytoone onu_device->ONUDevice:volt_service_instances = 2:1003 [db_index = True];
 }