From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 4 Apr 2016 21:37:21 +0000 (-0700)
Subject: Fix vppctl for multivpp
X-Git-Tag: v16.06-rc1~192
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=33007f505b540149b79b101c0346261b70983e9a;p=vpp.git

Fix vppctl for multivpp

Change-Id: If028aca042dbba653cc0f51a0149b36bed5c7853
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/vpp-api-test/scripts/vppctl b/vpp-api-test/scripts/vppctl
index 88b48d8b280..f4062b64f20 100755
--- a/vpp-api-test/scripts/vppctl
+++ b/vpp-api-test/scripts/vppctl
@@ -1,13 +1,29 @@
 #!/bin/bash
-if [ $# -gt 0 ]; then
-    echo exec ${@} | vpp_api_test | sed 's/vat# //g'
+PREFIX_ARGS=""
+CMD_ARGS=""
+while [[ $# -gt 0 ]]; do
+    arg=$1
+    shift
+    case ${arg} in
+	--prefix|-p)
+	    PREFIX_ARGS="chroot prefix ${1}"
+	    shift
+	;;
+	*)
+	    CMD_ARGS="$CMD_ARGS ${arg}"
+        ;;
+    esac
+done
+
+if [ "x${CMD_ARGS}" != "x" ]; then
+    echo exec ${CMD_ARGS} | vpp_api_test $PREFIX_ARGS | sed 's/vat# //g'
 else
     echo -n "vpp# "
     while read CMD; do
         if [ "x$CMD" == "xexit" ]; then
             exit
         elif [ "x$CMD" != "x" ]; then
-            echo exec $CMD | vpp_api_test | sed 's/vat# //g'
+            echo exec $CMD | vpp_api_test $PREFIX_ARGS| sed 's/vat# //g'
         fi
         echo -n "vpp# "
     done