fixed a SADIS_VER bug and added WITH_TP option
diff --git a/onos-files/install-onos-applications.sh b/onos-files/install-onos-applications.sh
index 66fd15d..5b12064 100755
--- a/onos-files/install-onos-applications.sh
+++ b/onos-files/install-onos-applications.sh
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SADIS_VER=${SADIS_VERSION:-3.1.0}
+SADIS_VER=${SADIS_VER:-3.1.0}
OLT_VER=${OLT_VER:-3.0.1}
AAA_VER=${AAA_VER:-1.9.0}
DHCP_VER=${DHCP_VER:-1.6.0}
diff --git a/voltha b/voltha
index 4340e59..04cd2ff 100755
--- a/voltha
+++ b/voltha
@@ -44,6 +44,7 @@
WITH_BBSIM=${WITH_BBSIM:-no}
WITH_RADIUS=${WITH_RADIUS:-no}
WITH_ONOS=${WITH_ONOS:-yes}
+WITH_TP=${WITH_TP:-yes}
JUST_K8S=${JUST_K8S:-no}
DEPLOY_K8S=${DEPLOY_K8S:-yes}
SKIP_RESTART_API=${SKIP_RESTART_API:-no}
@@ -91,6 +92,17 @@
WITH_RADIUS=no
fi
+# Verify WITH_TP settting and convert uniform value of yes or no
+if [ $(echo ":y:yes:true:n:no:false:1:0:" | grep -ic ":$WITH_TP:") -eq 0 ]; then
+ >&2 echo -e "${RED}${BOLD}${ERROR}ERROR:${NORMAL}${RED} Invalid \$WITH_TP value of '$WITH_TP'. Should be 'yes' or 'no'${NORMAL}"
+ exit 1
+fi
+if [ $(echo ":y:yes:true:1:" | grep -ic ":$WITH_TP:") -eq 1 ]; then
+ WITH_TP=yes
+else
+ WITH_TP=no
+fi
+
# Verify WITH_ONOS settting and convert uniform value of yes or no
if [ $(echo ":y:yes:true:n:no:false:1:0:" | grep -ic ":$WITH_ONOS:") -eq 0 ]; then
>&2 echo -e "${RED}${BOLD}${ERROR}ERROR:${NORMAL}${RED} Invalid \$WITH_ONOS value of '$WITH_ONOS'. Should be 'yes' or 'no'${NORMAL}"
@@ -171,10 +183,10 @@
fi
if [ "$TYPE" == "full" ]; then
- ONOS_API_PORT=${ONOS_API_PORT:-8182}
- ONOS_SSH_PORT=${ONOS_SSH_PORT:-8102}
- VOLTHA_API_PORT=${VOLTHA_API_PORT:-55556}
- VOLTHA_SSH_PORT=${VOLTHA_SSH_PORT:-5023}
+ ONOS_API_PORT=${ONOS_API_PORT:-8182}
+ ONOS_SSH_PORT=${ONOS_SSH_PORT:-8102}
+ VOLTHA_API_PORT=${VOLTHA_API_PORT:-55556}
+ VOLTHA_SSH_PORT=${VOLTHA_SSH_PORT:-5023}
else
ONOS_API_PORT=${ONOS_API_PORT:-8181}
ONOS_SSH_PORT=${ONOS_SSH_PORT:-8101}
@@ -182,6 +194,20 @@
VOLTHA_SSH_PORT=${VOLTHA_SSH_PORT:-5022}
fi
+if [ "$WITH_TP" == "yes" ]; then
+ SADIS_VER=3.1.0
+ OLT_VER=3.0.1
+ AAA_VER=1.9.0
+ DHCP_VER=1.6.0
+else
+ SADIS_VER=2.2.0
+ OLT_VER=2.1.0
+ AAA_VER=1.8.0
+ DHCP_VER=1.5.0
+fi
+
+export SADIS_VER OLT_VER AAA_VER DHCP_VER
+
if [ "$1" == "get" -a "$2" == "voltconfig" ]; then
echo "$HOME/.volt/config-$TYPE"
exit
@@ -220,7 +246,7 @@
# Output install options to log
echo "OPTIONS" >> $LOG
-ALL_OPTIONS="TYPE WITH_BBSIM WITH_RADIUS WITH_ONOS JUST_K8S DEPLOY_K8S \
+ALL_OPTIONS="TYPE WITH_BBSIM WITH_RADIUS WITH_ONOS WITH_TP JUST_K8S DEPLOY_K8S \
SKIP_RESTART_API INSTALL_KUBECTL INSTALL_HELM USE_GO VOLTHA_LOG_LEVEL \
VOLTHA_CHART VOLTHA_ADAPTER_SIM_CHART VOLTHA_ADAPTER_OPEN_OLT_CHART \
VOLTHA_ADAPTER_OPEN_ONU_CHART SADIS_VER OLT_VER AAA_VER DHCP_VER"