opticalUtils.py modifications
o Topology.json matches what the network configuration system expects. New method
for converting opticalJSON added to add layer of indirection to (hopefully) make
changes easier in the future if syntax changes for any files.
o onos-topo-cfg takes a third argument for REST uri path. This is for backwards
compatibility, and can hopefully be removed when everything is ported away from
using the ConfigProvider.
Change-Id: I56a117f33194dd420ea4970cd612c980b5c020b9
diff --git a/tools/test/bin/onos-topo-cfg b/tools/test/bin/onos-topo-cfg
index 5f40d8e..489083f 100755
--- a/tools/test/bin/onos-topo-cfg
+++ b/tools/test/bin/onos-topo-cfg
@@ -8,7 +8,8 @@
node="${1:-$OCI}"
file="${2:-$ONOS_ROOT/tools/test/topos/oe-linear-3.json}"
+url="${3:-config/topology}"
curl -sS --fail -L --user $ONOS_WEB_USER:$ONOS_WEB_PASS \
-X POST -H 'Content-Type:application/json' \
- http://$node:8181/onos/v1/config/topology -d@$file
+ http://$node:8181/onos/v1/${url} -d@$file