Enhancing STC and cleaning up various test topos.
Change-Id: I7f5b349835ebf3d7da824be0aa2cddd860631f84
diff --git a/tools/test/scenarios/archetypes.xml b/tools/test/scenarios/archetypes.xml
index f83879c..5913aeb 100644
--- a/tools/test/scenarios/archetypes.xml
+++ b/tools/test/scenarios/archetypes.xml
@@ -41,5 +41,10 @@
exec="mvn clean install"/>
<step name="Reinstall-App-With-UI" requires="^,~Verify-CLI"
exec="onos-app ${OCI} reinstall! target/test-app-1.2.3.oar"/>
+ <step name="Verify-UI" requires="^"
+ exec="onos-check-views ${OCI} id=sample"/>
+
+ <step name="Uninstall-App" requires="^"
+ exec="onos-app ${OCI} uninstall org.foo.app"/>
</group>
</scenario>
diff --git a/tools/test/scenarios/basic-net.xml b/tools/test/scenarios/basic-net.xml
new file mode 100644
index 0000000..8d75d53
--- /dev/null
+++ b/tools/test/scenarios/basic-net.xml
@@ -0,0 +1,31 @@
+<!--
+ ~ Copyright 2015 Open Networking Laboratory
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<scenario name="basic-net" description="Basic network functionality test">
+ <group name="Basic-Net">
+ <step name="Install-Apps"
+ exec="onos ${OC1} app activate org.onosproject.proxyarp org.onosproject.fwd"/>
+ <step name="Check-Apps" requires="Install-Apps"
+ exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd"/>
+
+ <step name="Config-Topo"
+ exec="onos-topo-cfg ${OC1} ${ONOS_ROOT}/tools/test/topos/attmpls.json"/>
+ <step name="Check-Summary" requires="Config-Topo"
+ exec="onos-check-summary ${OC1} [0-9]* 25 0 25"/>
+
+ <step name="Start-Mininet" requires="Install-Apps,Check-Summary"
+ exec="echo onos-start-mininet not implemented yet"/>
+ </group>
+</scenario>
\ No newline at end of file
diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 1a8d754..8fefb81 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -20,10 +20,10 @@
<parallel var="${OC#}">
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
<step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
- <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
+ <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}" requires="Uninstall-${#}"/>
<step name="Install-${#}" exec="onos-install ${OC#}"
- requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
+ requires="Kill-${#},Push-Bits-${#},Push-Bits"/>
<step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
requires="Install-${#}"/>
@@ -31,9 +31,9 @@
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
- requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
+ requires="~Wait-for-Start-${#},"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#}"
- requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
+ requires="~Wait-for-Start-${#}"/>
</parallel>
</group>
</scenario>
diff --git a/tools/test/scenarios/tar-setup.xml b/tools/test/scenarios/tar-setup.xml
index 87ba8cd..b91cbf8 100644
--- a/tools/test/scenarios/tar-setup.xml
+++ b/tools/test/scenarios/tar-setup.xml
@@ -20,10 +20,10 @@
<parallel var="${OC#}">
<step name="Push-Bits-${#}" exec="onos-push-bits ${OC#}" unless="${OCT}"/>
<step name="Uninstall-${#}" exec="onos-uninstall ${OC#}"/>
- <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}"/>
+ <step name="Kill-${#}" env="~" exec="onos-kill ${OC#}" requires="Uninstall-${#}"/>
<step name="Untar-And-Run-${#}" exec="onos-untar-and-run ${OC#}"
- requires="Uninstall-${#},Push-Bits-${#},Push-Bits"/>
+ requires="Kill-${#},Push-Bits-${#},Push-Bits"/>
<step name="Wait-for-Start-${#}" exec="onos-wait-for-start ${OC#}"
requires="Untar-And-Run-${#}"/>
@@ -31,12 +31,12 @@
<step name="Check-Logs-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-${#}"/>
<step name="Check-Components-${#}" exec="onos-check-components ${OC#}"
- requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
+ requires="~Wait-for-Start-${#}"/>
<step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} drivers"
- requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
+ requires="~Wait-for-Start-${#}"/>
<step name="Check-Nodes-${#}" exec="onos-check-nodes ${OC#} ${OC#}"
- requires="~Wait-for-Start-${#},~Check-Logs-${#}"/>
+ requires="~Wait-for-Start-${#}"/>
</parallel>
</group>
@@ -49,12 +49,12 @@
<step name="Check-Logs-Again-${#}" exec="onos-check-logs ${OC#}"
requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Components-Again-${#}" exec="onos-check-components ${OC#}"
- requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
+ requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Apps-Again-${#}" exec="onos-check-apps ${OC#} drivers"
- requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
+ requires="~Wait-for-Start-Again-${#}"/>
<step name="Check-Nodes-Again-${#}" exec="onos-check-nodes ${OC#}"
- requires="~Wait-for-Start-Again-${#},~Check-Logs-Again-${#}"/>
+ requires="~Wait-for-Start-Again-${#}"/>
</parallel>
</group>