Updated URL path for the REST to get the whole topology:
OLD: /wm/onos/topology/all
NEW: /wm/onos/topology

Also, fix a critical Python syntax bug inside onoscli, which was sneaked-in
during some of earlier merges.

Change-Id: I352a458e79a6157c5e38cfd59de5c0c242098084
diff --git a/onoscli b/onoscli
index 31d47f8..f5fc0e1 100755
--- a/onoscli
+++ b/onoscli
@@ -206,7 +206,7 @@
 	    #
 	    Command("show switch", "Show switches"),
 	    #
-	    Command("show switch all", "Show all switches", self.show_switch_all)
+	    Command("show switch all", "Show all switches", self.show_switch_all),
 	    #
 	    Command("show topology", "Show network topology"),
 	    #
@@ -376,7 +376,7 @@
     def show_topology_all(self, args):
 	"CLI command callback: show topology all"
 
-	url = "http://%s:%s/wm/onos/topology/all" % (self.onos_ip, self.onos_port)
+	url = "http://%s:%s/wm/onos/topology" % (self.onos_ip, self.onos_port)
 	result = get_json(url)
 	#
 	self.print_json_result(result)