Eliminated references to deprecated ONOS_NIC environment variable.
Change-Id: I9b709920c1aa2e7c1c4cb1f28f920dd2820b86ba
diff --git a/tools/dev/mininet/onos.py b/tools/dev/mininet/onos.py
index 6027180..f8e3703 100755
--- a/tools/dev/mininet/onos.py
+++ b/tools/dev/mininet/onos.py
@@ -111,7 +111,7 @@
def updateNodeIPs( env, nodes ):
"Update env dict and environ with node IPs"
# Get rid of stale junk
- for var in 'ONOS_NIC', 'ONOS_CELL', 'ONOS_INSTANCES':
+ for var in 'ONOS_CELL', 'ONOS_INSTANCES':
env[ var ] = ''
for var in environ.keys():
if var.startswith( 'OC' ):
diff --git a/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2 b/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
index 555c099..3a22e4e 100644
--- a/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
+++ b/tools/dev/vagrant/ansible/roles/onos-install/templates/one_node_cell.j2
@@ -1,4 +1,3 @@
-export ONOS_NIC="{{ onos_nic }}"
export OCI="{{ lxc.lxc_one.ip }}"
export OC1="{{ lxc.lxc_one.ip }}"
export ONOS_APPS="gui,drivers,openflow"
diff --git a/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2 b/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
index bd9c0ef..bc23f34 100644
--- a/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
+++ b/tools/dev/vagrant/ansible/roles/onos-install/templates/three_node_cell.j2
@@ -1,4 +1,3 @@
-export ONOS_NIC="{{ onos_nic }}"
export OCI="{{ lxc.lxc_one.ip }}"
export OC1="{{ lxc.lxc_one.ip }}"
export OC2="{{ lxc.lxc_two.ip }}"
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
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
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
diff --git a/tools/test/cells/demo b/tools/test/cells/demo
index 73137dc..c623f6d 100644
--- a/tools/test/cells/demo
+++ b/tools/test/cells/demo
@@ -1,6 +1,5 @@
# LXC demo environment for oneping tutorial
-export ONOS_NIC="10.0.3.*"
export OC1="10.0.3.101"
export OC2="10.0.3.102"
export OC3="10.0.3.103"
diff --git a/tools/test/cells/demo-eu b/tools/test/cells/demo-eu
index 0f7e8ef..0d9aa22 100644
--- a/tools/test/cells/demo-eu
+++ b/tools/test/cells/demo-eu
@@ -5,7 +5,6 @@
export OC2="10.100.198.202"
export OC3="10.100.198.203"
export OCN="10.100.198.200"
-export ONOS_NIC="10.100.198.*"
export ONOS_APPS=gui,drivers,openflow,proxyarp,mobility,mlb,pathpainter
export ONOS_GROUP=sdn
export ONOS_SCENARIOS=$ONOS/tools/test/scenarios
diff --git a/tools/test/cells/tutorial b/tools/test/cells/tutorial
index 6daf0c6..c97c73a 100644
--- a/tools/test/cells/tutorial
+++ b/tools/test/cells/tutorial
@@ -1,6 +1,5 @@
# LXC environment for distributed tutorial
-export ONOS_NIC="10.0.3.*"
export OC1="10.0.3.101"
export OC2="10.0.3.102"
export OC3="10.0.3.103"
diff --git a/tools/test/cells/vagrant b/tools/test/cells/vagrant
index b4c495e..b09c736 100644
--- a/tools/test/cells/vagrant
+++ b/tools/test/cells/vagrant
@@ -4,7 +4,6 @@
export OC3=10.100.198.203
export OCN=10.100.198.100
export ONOS_APPS=gui,drivers,openflow,proxyarp
-export ONOS_NIC=10.100.198.*
export ONOS_SCENARIOS=$ONOS_ROOT/tools/test/scenarios
export ONOS_USER=ubuntu
export ONOS_GROUP=ubuntu
diff --git a/tools/test/cells/virtual b/tools/test/cells/virtual
index 1657da1..90c0826 100644
--- a/tools/test/cells/virtual
+++ b/tools/test/cells/virtual
@@ -1,6 +1,5 @@
# Local VirtualBox-based ONOS instances 1,2 & ONOS mininet box
-export ONOS_NIC=192.168.56.*
export OC1="192.168.56.101"
export OC2="192.168.56.102"
export OC3="192.168.56.103"
diff --git a/tools/test/scenarios/prerequisites.xml b/tools/test/scenarios/prerequisites.xml
index 6d56bfe..3c22091 100644
--- a/tools/test/scenarios/prerequisites.xml
+++ b/tools/test/scenarios/prerequisites.xml
@@ -15,8 +15,7 @@
-->
<scenario name="prerequisites" description="ONOS test pre-requisites">
<group name="Prerequisites">
- <step name="Check-Environment"
- exec="test -n ${ONOS_ROOT} -a -n ${ONOS_NIC} -a -n ${OC1}"/>
+ <step name="Check-Environment" exec="test -n ${ONOS_ROOT} -a -n ${OC1}"/>
<step name="Check-ONOS-Bits" exec="onos-check-bits"/>
<step name="Set-OpenJDK-11-As-Default" if="${stcOpenJDK}" exec="stc-set-openjdk11"/>
<parallel var="${OC#}">