commit 5d80e4579ebf60f7a382b40919bfc272baf9efbc
author Thomas Vachuska <tom@opennetworking.org> Thu Mar 21 14:10:13 2019 -0700
committer Thomas Vachuska <tom@opennetworking.org> Thu Mar 21 23:48:22 2019 +0000
tree bcf131238c6ee7a1b6ac19933c09c98446cc34d3
parent 97642361e7c8a366b65d2f74a6b37f3aeace541a

Eliminated references to deprecated ONOS_NIC environment variable.

Change-Id: I9b709920c1aa2e7c1c4cb1f28f920dd2820b86ba

tools/test/bin/onos-config

diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index d1f6e89..7ada015 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -39,10 +39,7 @@
 export ONOS_APPS="${ONOS_APPS:-gui,drivers,openflow}"
 
 ssh -tt $remote "
-    echo \"onos.ip = \$(sudo ifconfig | grep $ONOS_NIC | cut -d: -f2 | cut -d\\  -f1)\" \
-        >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/system.properties
-
-    # Drop copycat related log level for the console
+    # Drop atomix related log level for the console
     echo "log4j2.logger.atomix.name = io.atomix.protocols.raft" >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
     echo "log4j2.logger.atomix.level = INFO" >> $ONOS_INSTALL_DIR/$KARAF_DIST/etc/org.ops4j.pax.logging.cfg
 

tools/test/bin/onos-show-cell

diff --git a/tools/test/bin/onos-show-cell b/tools/test/bin/onos-show-cell
index bc54240..139dd45 100755
--- a/tools/test/bin/onos-show-cell
+++ b/tools/test/bin/onos-show-cell
@@ -41,7 +41,6 @@
 . $ONOS_ROOT/tools/test/cells/${cell}
 
 echo "ONOS_CELL=${ONOS_CELL}"
-echo "ONOS_NIC=${ONOS_NIC}"
 # get number of OC variables
 max=$( env | egrep '^OC[0-9]+' | wc -l )
 for n in $( seq 0 ${max} ); do

tools/test/bin/onos-untar-and-run

diff --git a/tools/test/bin/onos-untar-and-run b/tools/test/bin/onos-untar-and-run
index 7438e57..6741df6 100755
--- a/tools/test/bin/onos-untar-and-run
+++ b/tools/test/bin/onos-untar-and-run
@@ -16,7 +16,6 @@
     tar zxf /tmp/$ONOS_BITS.tar.gz
 
     cd $ONOS_TMP
-    export ONOS_NIC=$ONOS_NIC
     bin/onos-service server 1>/tmp/onos.out 2>/tmp/onos.err &
 
     # Setup a few symlinks to allow other tools to work