Clean up handling of lat/long geo-coordinates.
Change-Id: I64fca56c7deb9a8baa6c68558365ec2a8c38168c
diff --git a/tools/test/topos/regions-topo-2 b/tools/test/topos/regions-topo-2
index befed3b..297bc65 100755
--- a/tools/test/topos/regions-topo-2
+++ b/tools/test/topos/regions-topo-2
@@ -7,12 +7,15 @@
onos ${host} wipe-out please
onos ${host} null-simulation start custom
+# null-create-device <type> <name> <#ports> <latitude> <longitude>
+# null-create-link <type> <src> <dst>
+
onos ${host} <<-EOF
-null-create-device switch s1 10 0 0
-null-create-device switch s2 10 0 0
-null-create-device switch s3 10 0 0
-null-create-device switch s4 10 0 0
+null-create-device switch s1-Bristol 10 51.4500 -2.5833
+null-create-device switch s2-London 10 51.5072 -0.1275
+null-create-device switch s3-Dover 10 51.1295 1.3089
+null-create-device switch s4-Brighton 10 50.8429 -0.1313
null-create-device switch s5 10 0 0
null-create-device switch s6 10 0 0
null-create-device switch s7 10 0 0
@@ -20,11 +23,11 @@
null-create-device switch s9 10 0 0
# null-create-device switch s10 10 0 0
-null-create-link direct s1 s2
-null-create-link direct s2 s3
-null-create-link direct s2 s4
-null-create-link direct s3 s4
-null-create-link direct s3 s5
+null-create-link direct s1-Bristol s2-London
+null-create-link direct s2-London s3-Dover
+null-create-link direct s2-London s4-Brighton
+null-create-link direct s3-Dover s4-Brighton
+null-create-link direct s3-Dover s5
null-create-link direct s6 s5
null-create-link direct s6 s8
null-create-link direct s7 s9