Make test tools available in installed ONOS
Part of ONOS-6597
onos-app, onos-netcfg
Change-Id: Ic58156700e357c9564e9bd9fe1173310ec6f0502
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 65c7003..6308334 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -25,6 +25,7 @@
# Setup a path
export PATH="$PATH:$ONOS_ROOT/tools/dev/bin"
export PATH="$PATH:$ONOS_ROOT/tools/test/bin:$ONOS_ROOT/tools/test/scenarios/bin"
+export PATH="$ONOS_ROOT/tools/package/runtime/bin:$PATH"
export PATH="$PATH:$ONOS_ROOT/tools/build"
export PATH="$PATH:$MAVEN/bin:$KARAF_ROOT/bin"
diff --git a/tools/dev/bin/onos-app b/tools/dev/bin/onos-app
deleted file mode 100755
index d724f96..0000000
--- a/tools/dev/bin/onos-app
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# -----------------------------------------------------------------------------
-# Tool to manage ONOS applications using REST API.
-# -----------------------------------------------------------------------------
-
-node=${1:-$OCI}
-cmd=${2:-list}
-app=${3}
-
-export URL=http://$node:8181/onos/v1/applications
-export HDR="-HContent-Type:application/octet-stream"
-export HAJ="-HContent-Type:application/json"
-export curl="curl -sS --user $ONOS_WEB_USER:$ONOS_WEB_PASS --noproxy localhost "
-
-# Prints usage help
-function usage {
- echo "usage: onos-app <node-ip> list" >&2
- echo " onos-app <node-ip> {install|install!} <app-file>" >&2
- echo " onos-app <node-ip> {reinstall|reinstall!} [<app-name>] <app-file>" >&2
- echo " onos-app <node-ip> {activate|deactivate|uninstall} <app-name>" >&2
- exit 1
-}
-
-# Extract app name from the specified *.oar file
-function appName {
- aux=/tmp/aux$$.jar
- cp $1 $aux
- pushd /tmp >/dev/null
- jar xf $aux app.xml && grep name= app.xml | cut -d\" -f2
- rm -f $aux /tmp/app.xml
- popd >/dev/null
-}
-
-[ -z $node -o "$node" = "-h" -o "$node" = "--help" -o "$node" = "-?" ] && usage
-
-case $cmd in
- list) $curl -X GET $URL;;
- installUrl!|installUrl)
- activate="false"
- [ $cmd = "installUrl!" ] && activate="true"
- [ $# -lt 3 ] && usage
- appurl=$3
- $curl -X POST $HAJ -d '{"url" : "'"$appurl"'", "activate" : "'$activate'" }' $URL
- ;;
- install!|install)
- [ $cmd = "install!" ] && activate="?activate=true"
- [ $# -lt 3 -o ! -f $app ] && usage
- $curl -X POST $HDR $URL$activate --data-binary @$app
- ;;
-
- reinstall!|reinstall)
- [ $cmd = "reinstall!" ] && activate="?activate=true"
- [ $# -lt 4 -a ! -f "$3" ] && usage
- [ $# -eq 4 -a ! -f "$4" ] && usage
- oar=$4
- [ $# -lt 4 ] && oar=$3 && app=$(appName $oar)
- $curl -X DELETE $URL/$app
- $curl -X POST $HDR $URL$activate --data-binary @$oar
- ;;
-
- uninstall)
- [ $# -lt 3 ] && usage
- $curl -X DELETE $URL/$app
- ;;
- activate)
- [ $# -lt 3 ] && usage
- $curl -X POST $URL/$app/active
- ;;
- deactivate)
- [ $# -lt 3 ] && usage
- $curl -X DELETE $URL/$app/active
- ;;
-
- *) usage;;
-esac
-
-
-status=$?
-echo # new line for prompt
-exit $status