commit b31476031a55b415710cb2a08a32f22232c20886
author Hardik Windlass <hardik_windlass@infosys.com> Mon Mar 09 16:59:15 2020 +0530
committer Hardik Windlass <hardik_windlass@infosys.com> Mon Mar 09 16:59:15 2020 +0530
tree df9af16504daa1f36ed0cfec25dd39d31051df56
parent 726ff6ac2883ca2c1eec661f522a7c75d0b09016

Added Support/Option for Sadis Configuration File to use

voltha

diff --git a/voltha b/voltha
index 4574d24..99ec2fa 100755
--- a/voltha
+++ b/voltha
@@ -83,6 +83,7 @@
 WITH_PORT_FORWARDS=${WITH_PORT_FORWARDS:-yes}
 ONLY_ONE=${ONLY_ONE:-yes}
 CONFIG_SADIS=${CONFIG_SADIS:-no}
+SADIS_CFG=${SADIS_CFG:-onos-files/onos-sadis-sample.json}
 INSTALL_ONOS_APPS=${INSTALL_ONOS_APPS:-no}
 JUST_K8S=${JUST_K8S:-no}
 DEPLOY_K8S=${DEPLOY_K8S:-yes}
@@ -201,6 +202,7 @@
     ONOS_CHART_VERSION \
     ONOS_API_PORT \
     ONOS_SSH_PORT \
+    SADIS_CFG \
     VOLTHA_API_PORT \
     VOLTHA_SSH_PORT \
     VOLTHA_ETCD_PORT \
@@ -1220,9 +1222,8 @@
     if [ -f onos-files/onos-sadis.json ]; then
         push_onos_config "file" "[optional] Push ONOS SADIS Configuration" "network/configuration/apps/org.opencord.sadis" "onos-files/onos-sadis.json"
     elif [ "$CONFIG_SADIS" == "yes" ]; then
-        SADIS_CFG=onos-files/onos-sadis-sample.json
         check_onos_app_active org.opencord.sadis
-        push_onos_config "file" "[optional] Push ONOS SADIS Configuration" "network/configuration/apps/org.opencord.sadis" "$SADIS_CFG"
+        push_onos_config "file" "[optional] Push ONOS SADIS Configuration: $SADIS_CFG" "network/configuration/apps/org.opencord.sadis" "$SADIS_CFG"
     fi
 fi
 if [ "$WITH_TIMINGS" == "yes" ]; then