Minor refactoring in the ONOS cell configuration:
* Each cell-specific variable is explicitly listed
in the cell config file:
ONOS_CELL, ONOS_NIC, OC1-OC9, OCN, OCI, ONOS_FEATURES
* Cleanup and bug fixes inside bash_profile:
- Don't export explicitly OCI and ONOS_CELL, because those
are now exported in the cell config file
- unset ONOS_CELL, ONOS_NIC, ONOS_FEATURES (the last two weren't
unset before)
- The built-in "cell" function shows OC1 to OC9 instead of OC0-OC9;
OC0 is never used/setup anywhere else
* Added two new shell commands:
- tools/test/bin/onos-lsit-cells : lists existing ONOS cell configurations
It is the equivalent of the "cells" built-in bash command
- tools/test/bin/onos-show-cell : shows the configuration of an ONOS cell
It is the equivalent of the "cell" built-in bash command, but
it can show also the configuration of any ONOS cell (not only
the default one).
diff --git a/tools/test/cells/cbench b/tools/test/cells/cbench
index 692bb53..2e0b478 100644
--- a/tools/test/cells/cbench
+++ b/tools/test/cells/cbench
@@ -1,7 +1,10 @@
# Local VirtualBox-based single ONOS instance & ONOS mininet box
+export ONOS_CELL="cbench"
+
export ONOS_NIC=192.168.56.*
export OC1="192.168.56.103"
export OCN="192.168.56.103"
+export OCI="${OC1}"
export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd"
diff --git a/tools/test/cells/local b/tools/test/cells/local
index 94fa24e..2edb074 100644
--- a/tools/test/cells/local
+++ b/tools/test/cells/local
@@ -1,7 +1,11 @@
# Local VirtualBox-based ONOS instances 1,2 & ONOS mininet box
+export ONOS_CELL="local"
+
export ONOS_NIC=192.168.56.*
export OC1="192.168.56.101"
export OC2="192.168.56.102"
-
export OCN="192.168.56.103"
+export OCI="${OC1}"
+
+export ONOS_FEATURES=""
diff --git a/tools/test/cells/office b/tools/test/cells/office
index 5ec108f..72520a0 100644
--- a/tools/test/cells/office
+++ b/tools/test/cells/office
@@ -1,6 +1,9 @@
# ProxMox-based cell of ONOS instance; no mininet-box
-export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd,onos-app-mobility,onos-app-tvue,onos-app-proxyarp"
+export ONOS_CELL="office"
export ONOS_NIC="10.128.4.*"
export OC1="10.128.4.60"
+export OCI="${OC1}"
+
+export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd,onos-app-mobility,onos-app-tvue,onos-app-proxyarp"
diff --git a/tools/test/cells/prox b/tools/test/cells/prox
index 1731eb8..557388f 100644
--- a/tools/test/cells/prox
+++ b/tools/test/cells/prox
@@ -1,7 +1,11 @@
# ProxMox-based cell of ONOS instances 1,2 & ONOS mininet box
+export ONOS_CELL="prox"
+
export ONOS_NIC="10.1.9.*"
export OC1="10.1.9.94"
export OC2="10.1.9.82"
-
export OCN="10.1.9.93"
+export OCI="${OC1}"
+
+export ONOS_FEATURES=""
diff --git a/tools/test/cells/single b/tools/test/cells/single
index 6dcd4d5..7c03ef4 100644
--- a/tools/test/cells/single
+++ b/tools/test/cells/single
@@ -1,5 +1,10 @@
# Local VirtualBox-based single ONOS instance & ONOS mininet box
+export ONOS_CELL="single"
+
export ONOS_NIC=192.168.56.*
export OC1="192.168.56.101"
export OCN="192.168.56.103"
+export OCI="${OC1}"
+
+export ONOS_FEATURES=""
diff --git a/tools/test/cells/triple b/tools/test/cells/triple
index fa4f052..104eb05 100644
--- a/tools/test/cells/triple
+++ b/tools/test/cells/triple
@@ -1,8 +1,12 @@
# Local VirtualBox-based ONOS instances 1,2,3 & ONOS mininet box
+export ONOS_CELL="triple"
+
export ONOS_NIC=192.168.56.*
export OC1="192.168.56.101"
export OC2="192.168.56.102"
export OC3="192.168.56.104"
-
export OCN="192.168.56.103"
+export OCI="${OC1}"
+
+export ONOS_FEATURES=""