commit fa615493306a05f2889cc8c3a5c3425bb8fb3191
author Thomas Vachuska <tom@opennetworking.org> Mon Mar 19 09:11:51 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Mon Mar 19 16:36:02 2018 +0000
tree 6d8c143f91c4c00ea293a263c24ebe22d2fecb07
parent d29bc1ceef7c540ce57820d80ed5aa402fa6c25a

Adding auto-layout to the access-null simulation.
Enhancing the scale test for flows and routes.

Change-Id: Ib91720b409872e44eaff4263cf229bffa2e292fc

tools/package/bin/onos-service

diff --git a/tools/package/bin/onos-service b/tools/package/bin/onos-service
index 799bb2f..db7b006 100755
--- a/tools/package/bin/onos-service
+++ b/tools/package/bin/onos-service
@@ -4,7 +4,7 @@
 # -----------------------------------------------------------------------------
 
 # uncomment the following line for performance testing
-#export JAVA_OPTS="${JAVA_OPTS:--Xms8G -Xmx8G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+PrintGCDetails -XX:+PrintGCTimeStamps}"
+export JAVA_OPTS="${JAVA_OPTS:--Xms16G -Xmx16G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+PrintGCDetails -XX:+PrintGCTimeStamps}"
 
 # uncomment the following line for Netty TLS encryption
 # Do modify the keystore location/password and truststore location/password accordingly

tools/test/topos/access-null

diff --git a/tools/test/topos/access-null b/tools/test/topos/access-null
index 3ecefc3..460fb6b 100755
--- a/tools/test/topos/access-null
+++ b/tools/test/topos/access-null
@@ -62,7 +62,7 @@
 }
 
 function y {
-    let p="${3:-300} * ($1 - 1) - (${3:-300} * ($2 - 1)) / 2"
+    let p="${3:-400} * ($1 - 1) - (${3:-400} * ($2 - 1)) / 2 + ${4:-0}"
     echo $p
 }
 
@@ -88,8 +88,9 @@
 
     # Create hosts for each leaf group; multi-homed to each leaf in the pair
     [ $pair = A ] && pn=1 || pn=2
+    [ $pair = A ] && offset=-400 || offset=400
     for host in $(seq 1 $serviceHosts); do
-        sim "null-create-host Leaf-${pair}1,Leaf-${pair}2 10.${pn}.1.${host}"
+        sim "null-create-host Leaf-${pair}1,Leaf-${pair}2 10.${pn}.1.${host} -400 $(y $host $serviceHosts 60 $offset) grid"
     done
 done
 
@@ -104,7 +105,7 @@
     done
 
     # Create hosts for each access single leaf
-    sim "null-create-hosts Access-${access} 10.1${access}.1.*" $accessHosts
+    sim "null-create-hosts Access-${access} 10.1${access}.1.*" $accessHosts 500 $(y $access $accessLeaves) 6
     # sim "null-create-hosts Access-${access} 10.1${access}.2.*" $accessHosts
 done