commit a259542e33eb875d8606963a7697ee5a55360721
author David Bainbridge <dbainbri@ciena.com> Tue Oct 22 03:54:28 2019 +0000
committer David Bainbridge <dbainbri@ciena.com> Tue Oct 22 03:54:28 2019 +0000
tree e8da61eafbbe3078865f85cccdf109fa978ccf92
parent c6a6eb685446d1afbfb1a8c79e5b758fb6d027a0

allow env to override port settings

voltha

diff --git a/voltha b/voltha
index fa89772..f4c2eb1 100755
--- a/voltha
+++ b/voltha
@@ -189,18 +189,19 @@
         START=$(expr $START + 1)
     done
     DELTA=$(expr $START - 81)
-    ONOS_API_PORT=${START}81
-    ONOS_SSH_PORT=${START}01
-    VOLTHA_API_PORT=5$(expr 55 + $DELTA)55
-    VOLTHA_SSH_PORT=$(expr 50 + $DELTA)22
-    VOLTHA_ETCD_PORT=$(expr 23 + $DELTA)79
+    ONOS_API_PORT=${ONOS_API_PORT:-${START}81}
+    ONOS_SSH_PORT=${ONOS_SSH_PORT:-${START}01}
+    VOLTHA_API_PORT=${VOLTHA_API_PORT:-5$(expr 55 + $DELTA)55}
+    VOLTHA_SSH_PORT=${VOLTHA_SSH_PORT:-$(expr 50 + $DELTA)22}
+    VOLTHA_ETCD_PORT=${VOLTHA_ETCD_PORT:-$(expr 23 + $DELTA)79}
 else
     VALUES=$(echo $HAVE | sed -e 's/\s//g' | cut -d= -f2)
-    ONOS_API_PORT=$(echo $VALUES | cut -d, -f1)
-    ONOS_SSH_PORT=$(echo $VALUES | cut -d, -f2)
-    VOLTHA_API_PORT=$(echo $VALUES | cut -d, -f3)
-    VOLTHA_SSH_PORT=$(echo $VALUES | cut -d, -f4)
-    VOLTHA_ETCD_PORT=$(echo $VALUES | cut -d, -f5)
+    echo "VALUES = $VALUES"
+    ONOS_API_PORT=${ONOS_API_PORT:-$(echo $VALUES | cut -d, -f1)}
+    ONOS_SSH_PORT=${ONOS_SSH_PORT:-$(echo $VALUES | cut -d, -f2)}
+    VOLTHA_API_PORT=${VOLTHA_API_PORT:-$(echo $VALUES | cut -d, -f3)}
+    VOLTHA_SSH_PORT=${VOLTHA_SSH_PORT:-$(echo $VALUES | cut -d, -f4)}
+    VOLTHA_ETCD_PORT=${VOLTHA_ETCD_PORT:-$(echo $VALUES | cut -d, -f5)}
 fi
 
 PORTTMP=$(mktemp -u)