From 28d4657304002017feb8a9b77c56a2238cf58ed6 Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Tue, 5 Dec 2017 13:39:27 -0800 Subject: [PATCH] Changing cell configuration to reflect the move to flex data center. Change-Id: I0b3710b8e9b329b62a765ac87a269cd7aac4d7dd (cherry picked from commit d2535d768d7b0c2385c907e060fe6e5ded899942) --- tools/dev/bash_profile | 4 ++-- tools/test/cells/beast | 20 ++++++++++---------- tools/test/cells/beast-1 | 11 +++++++---- tools/test/cells/beast-3 | 15 +++++++++------ tools/test/cells/beast-5 | 23 ++++++++++++----------- 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile index 991cfaf99b..6d382697cb 100644 --- a/tools/dev/bash_profile +++ b/tools/dev/bash_profile @@ -194,8 +194,8 @@ function setMinorityMajority { } # ON.Lab shared test cell warden address -export CELL_WARDEN="10.254.1.19" -export CELL_SLAVES="$CELL_WARDEN 10.254.1.18 10.254.1.17" +export CELL_WARDEN="10.192.19.72" +export CELL_SLAVES="$CELL_WARDEN 10.192.19.71 10.192.19.70" # Clears cell environment function clearCell { diff --git a/tools/test/cells/beast b/tools/test/cells/beast index baa97b0fa7..a4a161ddf3 100644 --- a/tools/test/cells/beast +++ b/tools/test/cells/beast @@ -1,21 +1,21 @@ # Bare metal cluster (7-node) # Use the 1G NIC for cluster communications -export ONOS_NIC="10.254.1.*" +export ONOS_NIC="10.192.19.*" # ONOS Test proxy -export OCT=10.254.1.200 +export OCT=10.192.19.69 # Use the 1G NICs for external access -export OC1=10.254.1.201 -export OC2=10.254.1.202 -export OC3=10.254.1.203 -export OC4=10.254.1.204 -export OC5=10.254.1.205 -export OC6=10.254.1.206 -export OC7=10.254.1.207 +export OC1=10.192.19.68 +export OC2=10.192.19.67 +export OC3=10.192.19.66 +export OC4=10.192.19.65 +export OC5=10.192.19.64 +export OC6=10.192.19.63 +export OC7=10.192.19.62 # IP address of Mininet -export OCN=10.254.1.200 +export OCN=10.192.19.69 export ONOS_APPS="drivers,null,intentperf" diff --git a/tools/test/cells/beast-1 b/tools/test/cells/beast-1 index 698eded71b..27ef405451 100644 --- a/tools/test/cells/beast-1 +++ b/tools/test/cells/beast-1 @@ -1,12 +1,15 @@ -# Bare metal cluster (1-node) +# Bare metal cluster (7-node) # Use the 1G NIC for cluster communications -export ONOS_NIC="10.254.1.*" +export ONOS_NIC="10.192.19.*" # ONOS Test proxy -export OCT=10.254.1.200 +export OCT=10.192.19.69 # Use the 1G NICs for external access -export OC1=10.254.1.201 +export OC1=10.192.19.68 + +# IP address of Mininet +export OCN=10.192.19.69 export ONOS_APPS="drivers,null,intentperf" diff --git a/tools/test/cells/beast-3 b/tools/test/cells/beast-3 index 6586ddc37c..fc39f70899 100644 --- a/tools/test/cells/beast-3 +++ b/tools/test/cells/beast-3 @@ -1,14 +1,17 @@ -# Bare metal cluster (3-node) +# Bare metal cluster (7-node) # Use the 1G NIC for cluster communications -export ONOS_NIC="10.254.1.*" +export ONOS_NIC="10.192.19.*" # ONOS Test proxy -export OCT=10.254.1.200 +export OCT=10.192.19.69 # Use the 1G NICs for external access -export OC1=10.254.1.201 -export OC2=10.254.1.202 -export OC3=10.254.1.203 +export OC1=10.192.19.68 +export OC2=10.192.19.67 +export OC3=10.192.19.66 + +# IP address of Mininet +export OCN=10.192.19.69 export ONOS_APPS="drivers,null,intentperf" diff --git a/tools/test/cells/beast-5 b/tools/test/cells/beast-5 index e23f077104..0c84dbb4ec 100644 --- a/tools/test/cells/beast-5 +++ b/tools/test/cells/beast-5 @@ -1,18 +1,19 @@ -# Bare metal cluster (5-node) +# Bare metal cluster (7-node) # Use the 1G NIC for cluster communications -export ONOS_NIC="10.254.1.*" +export ONOS_NIC="10.192.19.*" # ONOS Test proxy -export OCT=10.254.1.200 - -export OCN=10.254.1.200 +export OCT=10.192.19.69 # Use the 1G NICs for external access -export OC1=10.254.1.201 -export OC2=10.254.1.202 -export OC3=10.254.1.203 -export OC4=10.254.1.204 -export OC5=10.254.1.205 +export OC1=10.192.19.68 +export OC2=10.192.19.67 +export OC3=10.192.19.66 +export OC4=10.192.19.65 +export OC5=10.192.19.64 -export ONOS_APPS="drivers,openflow,proxyarp,fwd" +# IP address of Mininet +export OCN=10.192.19.69 + +export ONOS_APPS="drivers,null,intentperf"