Fixed an issue in basic host and basic link config validations.
Added validation for basic device config.
Made all concrete configurations final (as they should be).
Changed stc to use the new onos-netcfg as a method to re-locate and name devices and hosts.
Change-Id: I372e6c7e6c0fa6fa52301568af73342aaae6347b
diff --git a/tools/test/scenarios/net-setup.xml b/tools/test/scenarios/net-setup.xml
index ce15bf8..4e5125a 100644
--- a/tools/test/scenarios/net-setup.xml
+++ b/tools/test/scenarios/net-setup.xml
@@ -24,8 +24,11 @@
<step name="Initial-Summary-Check" requires="~Wipe-Out-Data-Before"
exec="onos-check-summary ${OC1} [0-9]* 0 0 0"/>
+ <step name="Config-Topo" requires="~Initial-Summary-Check"
+ exec="onos-netcfg ${OC1} ${ONOS_ROOT}/tools/test/topos/attmpls-cfg.json"/>
+
<step name="Start-Mininet"
- requires="Install-Apps,Initial-Summary-Check,Push-Topos,Stop-Mininet-If-Needed"
+ requires="Install-Apps,Config-Topo,Push-Topos,Stop-Mininet-If-Needed"
exec="onos-mininet start topos/topo att-onos.py ${ONOS_INSTANCES}"/>
<step name="Wait-For-Mininet" requires="Start-Mininet"