Adding support for topology recipes and cleaning up topologies.

Cleaned-up a few STC scenarios.

Change-Id: I4ffa61953d8cf289406fa572ab7603d996e26a85
diff --git a/tools/test/bin/ogroup-opts b/tools/test/bin/ogroup-opts
index dd92944..fe35be2 100644
--- a/tools/test/bin/ogroup-opts
+++ b/tools/test/bin/ogroup-opts
@@ -46,6 +46,16 @@
 
 complete -F _cell-opts cell vicell
 
+# Tab completion settings for topo recipes
+function _topo-opts () {
+  local cur=${COMP_WORDS[COMP_CWORD]}
+  if [ $COMP_CWORD -eq 1 ]; then
+    COMPREPLY=( $( compgen -W "$(cd $ONOS_ROOT/tools/test/topos && ls -1 *.recipe | sed 's/\.recipe//g')" -- $cur ) )
+  fi
+}
+
+complete -F _topo-opts topo
+
 
 # Tab completion settings for onos-create-app.
 function _ocapp-opts () {