commit 4a24a3e06ffbfbeb37a11d482269f9dd5996c913
author Simon Hunt <simon@onlab.us> Wed Mar 09 18:50:43 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 23 17:55:36 2016 +0000
tree 0b68904b84082e620b4595f16e01e8107441f9d1
parent 80b03876631425e76c55600c50466bc9fc0ca256

Re-configuring simon's uk cells.

Change-Id: I54c53f58bf65e4b917b4335cf193ad5d81899805

tools/test/cells/simon-uk

diff --git a/tools/test/cells/simon-uk b/tools/test/cells/simon-uk
index fb8a0c4..6b0fa9a 100644
--- a/tools/test/cells/simon-uk
+++ b/tools/test/cells/simon-uk
@@ -10,7 +10,7 @@
 ###
 
 ## ONOS Cluster VM (has LXC containers for cluster nodes)
-export OCVM=192.168.56.102
+export OCVM=192.168.56.98
 
 #============================================
 # sdn@ocluster:~$ sudo lxc-ls --fancy
@@ -43,7 +43,14 @@
 export ONOS_APPS="drivers,openflow,proxyarp,drivermatrix,mlb"
 
 ## mininet VM
-export OCN="192.168.56.103"
+export OCN="192.168.56.99"
 
 export ONOS_WEB_USER=onos
 export ONOS_WEB_PASS=rocks
+
+# Verify route to LXC cluster
+netstat -nr | grep 10.0.3 | grep -q $OCVM && echo "Routes to LXC in place" || ( 
+  echo "Route to LXC not found. Adding...";
+  sudo bash -c "route -n delete 10.0.3.0/24; \
+                route -n add 10.0.3.0/24 192.168.56.98" >/dev/null 2>&1
+)

tools/test/cells/simon-uk4

diff --git a/tools/test/cells/simon-uk4 b/tools/test/cells/simon-uk4
index 43808e5..b86d853 100644
--- a/tools/test/cells/simon-uk4
+++ b/tools/test/cells/simon-uk4
@@ -10,7 +10,7 @@
 ###
 
 ## ONOS Cluster VM (has LXC containers for cluster nodes)
-export OCVM=192.168.56.102
+export OCVM=192.168.56.98
 
 #============================================
 # sdn@ocluster:~$ sudo lxc-ls --fancy
@@ -41,7 +41,14 @@
 export ONOS_APPS="drivers,openflow,proxyarp,drivermatrix,mlb"
 
 ## mininet VM
-export OCN="192.168.56.103"
+export OCN="192.168.56.99"
 
 export ONOS_WEB_USER=onos
 export ONOS_WEB_PASS=rocks
+
+# Verify route to LXC cluster
+netstat -nr | grep 10.0.3 | grep -q $OCVM && echo "Routes to LXC in place" || (
+  echo "Route to LXC not found. Adding...";
+  sudo bash -c "route -n delete 10.0.3.0/24; \
+                route -n add 10.0.3.0/24 192.168.56.98" >/dev/null 2>&1
+)