commit 5aa2402420e2049b0b534ebc1eeba21d83d32bd7
author Ayaka Koshibe <ayaka@onlab.us> Tue Sep 30 11:58:14 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Tue Sep 30 11:58:14 2014 -0700
tree 7ad427b72d7325eb7b928012f64c3d20053c247b
parent 751fb1efcc202a3ecaeab8364ae2c29417e55062
parent e797a5dba6db21e4f347250a276caf4672d03478

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

tools/build/onos-package

diff --git a/tools/build/onos-package b/tools/build/onos-package
index cf751c7..2d6b954 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -34,6 +34,8 @@
 mkdir -p $KARAF_DIST/system/org/onlab 
 cp -r $M2_REPO/org/onlab $KARAF_DIST/system/org/
 
+export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo}"
+
 # Cellar Patching --------------------------------------------------------------
 
 # Patch the Apache Karaf distribution file to add Cellar features repository
@@ -51,7 +53,7 @@
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 
 
 # Patch the Apache Karaf distribution file to load ONOS features
-perl -pi.old -e 's|^(featuresBoot=.*)|\1,webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo|' \
+perl -pi.old -e "s|^(featuresBoot=.*)|\1,$ONOS_FEATURES|" \
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg
 
 # Patch the Apache Karaf distribution with ONOS branding bundle

tools/dev/bash_profile

diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 821ee43..8389ff1 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -66,6 +66,7 @@
         env | egrep "OCI"
         env | egrep "OC[0-9]+" | sort
         env | egrep "OCN"
+        env | egrep "ONOS_" | egrep -v 'ONOS_ROOT|ONOS_CELL'
     fi
 }
 

tools/test/cells/office

diff --git a/tools/test/cells/office b/tools/test/cells/office
index 0edf04d..6053ec8 100644
--- a/tools/test/cells/office
+++ b/tools/test/cells/office
@@ -1,10 +1,9 @@
 # ProxMox-based cell of ONOS instances 1,2 & ONOS mininet box
 . $ONOS_ROOT/tools/test/cells/.reset
 
+export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-app-fwd,onos-app-mobility,onos-app-tvue"
+
 export ONOS_NIC="10.128.4.*"
 
 export OC1="10.128.4.60"
-#export OC2="192.168.97.131"
-
-#export OCN="192.168.97.130"
 

tools/test/cells/three

diff --git a/tools/test/cells/three b/tools/test/cells/three
new file mode 100644
index 0000000..38c934b
--- /dev/null
+++ b/tools/test/cells/three
@@ -0,0 +1,12 @@
+# Default virtual box ONOS instances 1,2 & ONOS mininet box
+
+export ONOS_NIC=192.168.56.*
+
+export ONOS_FEATURES="webconsole,onos-api,onos-core-trivial,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-foo"
+
+export OC1="192.168.56.101"
+export OC2="192.168.56.102"
+export OC3="192.168.56.104"
+
+export OCN="192.168.56.103"
+