fix u1404 test scripts

diff --git a/mcc-manual-add-static-env-109.sh b/mcc-manual-add-static-env-109.sh
index 87ae54d..10a072b 100755 (executable)
--- a/mcc-manual-add-static-env-109.sh
+++ b/mcc-manual-add-static-env-109.sh
@@ -1,13 +1,17 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
 export CNI_COMMAND=ADD
-export CNI_NETNS=/var/run/netns/mcc-cni-test2 
+export CNI_NETNS=/var/run/netns/mcc-cni-test2
 export CNI_CONTAINERID=mcc-cni-test2 
 
+##export CNI_ARGS="IP=172.19.99.99;UPLINK=eth1p0"
+#export CNI_ARGS="IP=172.19.99.99"
+#export CNI_ARGS+=";UPLINK=cbr0"
+
 export PATH=$CNI_PATH:$PATH
 export CNI_IFNAME=eth1 
 

diff --git a/mcc-manual-add.sh b/mcc-manual-add.sh
index b74ddfe..846ba8e 100755 (executable)
--- a/mcc-manual-add.sh
+++ b/mcc-manual-add.sh
@@ -1,8 +1,8 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
 export CNI_COMMAND=ADD
 export CNI_NETNS=/var/run/netns/mcc-cni-test1

diff --git a/mcc-manual-del-static-env-109.sh b/mcc-manual-del-static-env-109.sh
index 5d6fe71..976cb55 100755 (executable)
--- a/mcc-manual-del-static-env-109.sh
+++ b/mcc-manual-del-static-env-109.sh
@@ -1,13 +1,17 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
 export CNI_COMMAND=DEL
 export CNI_NETNS=/var/run/netns/mcc-cni-test2
 export CNI_CONTAINERID=mcc-cni-test2 
 
+##export CNI_ARGS="IP=172.19.99.99;UPLINK=eth1p0"
+#export CNI_ARGS="IP=172.19.99.99"
+#export CNI_ARGS+=";UPLINK=cbr0"
+
 export PATH=$CNI_PATH:$PATH
 export CNI_IFNAME=eth1 
 

diff --git a/mcc-manual-del.sh b/mcc-manual-del.sh
index d3a8080..c3af64e 100755 (executable)
--- a/mcc-manual-del.sh
+++ b/mcc-manual-del.sh
@@ -1,10 +1,10 @@
 #/bin/bash
 export DEBUG=1
 export NETCONFPATH=/etc/cni/net.d/
-#export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
-export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
+export CNI_PATH=/home/mcambria/go/src/github.com/containernetworking/cni/bin/
+#export CNI_PATH=/home/mcambria/go2/src/stash.verizon.com/cni/bin
 export NETCONFPATH=${NETCONFPATH-/etc/cni/net.d}
-export CNI_COMMAND=DEL
+export CNI_COMMAND=DEL 
 export CNI_NETNS=/var/run/netns/mcc-cni-test1
 export CNI_CONTAINERID=mcc-cni-test1