diff --git a/tools/test/topos/access-gw.json b/tools/test/topos/access-gw.json
new file mode 100644
index 0000000..7268110
--- /dev/null
+++ b/tools/test/topos/access-gw.json
@@ -0,0 +1,28 @@
+{
+  "hosts" : {
+    "00:00:00:00:00:01/None" : {
+      "basic" : {
+        "name" : "GW-A1",
+        "roles" : [ "gateway" ], "gridX" : 0.0, "gridY" : 0.0, "locType" : "grid", "uiType" : "router"
+      }
+    },
+    "00:00:00:00:00:02/None" : {
+      "basic" : {
+        "name" : "GW-A2",
+        "roles" : [ "gateway" ], "gridX" : 0.0, "gridY" : 0.0, "locType" : "grid", "uiType" : "router"
+      }
+    },
+    "00:00:00:00:00:0D/None" : {
+      "basic" : {
+        "name" : "GW-B1",
+        "roles" : [ "gateway" ], "gridX" : 0.0, "gridY" : 0.0, "locType" : "grid", "uiType" : "router"
+      }
+    },
+    "00:00:00:00:00:0E/None" : {
+      "basic" : {
+        "name" : "GW-B2",
+        "roles" : [ "gateway" ], "gridX" : 0.0, "gridY" : 0.0, "locType" : "grid", "uiType" : "router"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tools/test/topos/co-fo-access-null b/tools/test/topos/co-fo-access-null
index 80a3751..3c07f5b 100755
--- a/tools/test/topos/co-fo-access-null
+++ b/tools/test/topos/co-fo-access-null
@@ -1,14 +1,13 @@
 #!/bin/bash
 # -----------------------------------------------------------------------------
-# Creates a spine-leaf fabric with large number of hosts using null providers
+# Creates a hierarchical access spine-leaf fabric with large number of hosts
+# using null providers.
 #
 # Default setup as follows:
-#   2 spines, can potentially be few more
-#   12 leaves in total
-#       2 leaf pair
-#       8 non-paired
-#   Host per leaf up to 1K
-#
+#   2 primary spines (or more if needed, but this is typically not the case)
+#   2 aggregating spines per access headend
+#   ~3 access leaves per headend
+#   2 leaf pairs for connecting gateways and compute (services/caching/etc.)
 # -----------------------------------------------------------------------------
 
 function usage {
@@ -18,6 +17,7 @@
     echo "  -s spines"
     echo "  -l spineLinks"
     echo "  -S serviceHosts"
+    echo "  -G gateways"
     echo "  -f fieldOffices"
     echo "  -a accessLeaves"
     echo "  -A accessHosts"
@@ -31,9 +31,10 @@
 fieldOffices=3
 accessLeaves=3
 accessHosts=60
+gateways=2
 
 # Scan arguments for user/password or other options...
-while getopts s:l:a:f:A:S:?h o; do
+while getopts s:l:a:f:A:S:G:?h o; do
     case "$o" in
         s) spines=$OPTARG;;
         l) spineLinks=$OPTARG;;
@@ -41,6 +42,7 @@
         f) fieldOffices=$OPTARG;;
         A) accessHosts=$OPTARG;;
         S) serviceHosts=$OPTARG;;
+        G) gateways=$OPTARG;;
         *) usage $0;;
     esac
 done
@@ -60,8 +62,8 @@
 node=${1:-$OCI}
 
 # Create the script of ONOS commands first and then execute it all at once.
-export CMDS="/tmp/fab-onos.cmds"
-rm $CMDS
+export CMDS="/tmp/access-onos.cmds"
+rm -f $CMDS 2>/dev/null
 
 function sim {
     echo "$@" >> $CMDS
@@ -92,8 +94,14 @@
         done
     done
 
-    # Create hosts for each leaf group; multi-homed to each leaf in the pair
+    # Create gateways attached to each leaf group; multi-homed to each leaf in the pair
     [ $pair = A ] && pn=1 || pn=2
+    [ $pair = A ] && gwy=-800 || gwy=800
+    for gw in $(seq 1 $gateways); do
+        sim "null-create-host Leaf-${pair}1,Leaf-${pair}2 10.${pn}.0.${gw} $(y $gw $gateways 200 -200) ${gwy} grid"
+    done
+
+    # Create hosts for each leaf group; multi-homed to each leaf in the pair
     [ $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} -400 $(y $host $serviceHosts 60 $offset) grid"
diff --git a/tools/test/topos/wipe-ui-annotations b/tools/test/topos/wipe-ui-annotations
new file mode 100755
index 0000000..b6cfd52
--- /dev/null
+++ b/tools/test/topos/wipe-ui-annotations
@@ -0,0 +1,16 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Wipes out UI annotations from all devices and hosts.
+# -----------------------------------------------------------------------------
+
+aux=/tmp/wua.$$.json
+
+host=${1:-$OCI}
+
+onos $host netcfg devices | sed -E 's/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
+onos-netcfg $host $aux devices
+
+onos $host netcfg hosts | sed -E 's/("grid[XY]")( : )([-0-9.]*)/\1\20.0/' > $aux
+onos-netcfg $host $aux hosts
+
+rm -f $aux