commit 785f5814082f4ffc138e27e821efcfdfbaaa3532
author Thomas Vachuska <tom@onlab.us> Thu Mar 19 01:11:00 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Mar 20 00:37:50 2015 +0000
tree f59f66f8673323fde6877dc2a9f535d7662eb7c8
parent da2f3cc041886342ce34eb30658baf53640463e3

ONOS-1328 Converted ONOS features to apps.

ONOS_FEATURES env. var is now deprecated!

Cells are expected to use ONOS_APPS env. var to tailor which builtin apps should be activated by default.  All builtin apps are installed by default, but can be uninstalled if desired.

Cleaned up cell definitions accordingly.

Change-Id: If3bb4691a73543a69197f4bf1855c8368f558450

tools/test/bin/onos-config

diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index 082f506..178bd23 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -8,9 +8,11 @@
 
 remote=$ONOS_USER@${1:-$OCI}
 
-# Customize features
-export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow}"
+# ONOS boot features
+export ONOS_BOOT_FEATURES="${ONOS_BOOT_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui}"
 
+# ONOS builtin apps and providers ignited by default
+export ONOS_APPS="${ONOS_APPS:-openflow}"
 
 # Generate a cluster.json from the ON* environment variables
 CDEF_FILE=/tmp/${remote}.cluster.json
@@ -40,9 +42,14 @@
     echo "log4j.logger.com.hazelcast.cluster.impl.MulticastService= ERROR" \
         >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
 
-    # Patch the Apache Karaf distribution file to load ONOS features
-    perl -pi.old -e \"s|^(featuresBoot=.*,management)(,webconsole,.*)|\1,$ONOS_FEATURES|\" \
+    # Patch the Apache Karaf distribution file to load ONOS boot features
+    perl -pi.old -e \"s|^(featuresBoot=.*,management)(,webconsole,.*)|\1,$ONOS_BOOT_FEATURES|\" \
         $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.apache.karaf.features.cfg
+
+    # Customize which builtin apps should be ignited
+    for app in $(echo $ONOS_APPS | tr ',' ' '); do
+        touch $ONOS_INSTALL_DIR/apps/org.onosproject.\$app/active
+    done
 "
 
 # Generate a default tablets.json from the ON* environment variables
@@ -52,4 +59,3 @@
 
 # copy tools/package/config/ to remote
 scp -qr ${ONOS_ROOT}/tools/package/config/ $remote:$ONOS_INSTALL_DIR/
-

tools/test/bin/onos-show-cell

diff --git a/tools/test/bin/onos-show-cell b/tools/test/bin/onos-show-cell
index 3b11a1d..f5c7572 100755
--- a/tools/test/bin/onos-show-cell
+++ b/tools/test/bin/onos-show-cell
@@ -51,5 +51,7 @@
     fi
 done
 echo "OCN=${OCN}"
+echo "OCT=${OCT}"
 echo "OCI=${OCI}"
-echo "ONOS_FEATURES=${ONOS_FEATURES}"
+echo "ONOS_APPS=${ONOS_APPS}"
+echo "ONOS_BOOT_FEATURES=${ONOS_BOOT_FEATURES}"