From e9bb60be43af477f17b30ee1f2ba205565b7fa15 Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Mon, 19 Oct 2015 10:14:31 -0700
Subject: Updated onos src tree to commit id
 1e60f97ae50c05b94fcb6a10520738bfb5efdfd1

---
 .../src/onos/tools/test/scenarios/net-topo.xml     | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'framework/src/onos/tools/test/scenarios/net-topo.xml')

diff --git a/framework/src/onos/tools/test/scenarios/net-topo.xml b/framework/src/onos/tools/test/scenarios/net-topo.xml
index e8e23997..abcf8642 100644
--- a/framework/src/onos/tools/test/scenarios/net-topo.xml
+++ b/framework/src/onos/tools/test/scenarios/net-topo.xml
@@ -16,60 +16,60 @@
 <scenario name="net-topo"
           description="Network topology test">
     <!-- TODO: parametrize this via recipes -->
-    <group name="Net-topo">
+    <group name="Net-Topo">
 
         <!-- Verify the overall topology using the REST API -->
-        <step name="Net-topo.Query-Topo"
+        <step name="Net-Topo.Query-Topo"
               exec="query-topo.py ${OC1} topo"/>
-        <step name="Net-topo.Verify-Topo-Devices" requires="Net-topo.Query-Topo"
+        <step name="Net-Topo.Verify-Topo-Devices" requires="Net-Topo.Query-Topo"
               exec="test ${topoDevices} == 25"/>
-        <step name="Net-topo.Verify-Topo-Links" requires="Net-topo.Query-Topo"
+        <step name="Net-Topo.Verify-Topo-Links" requires="Net-Topo.Query-Topo"
               exec="test ${topoLinks} == 140"/>
-        <step name="Net-topo.Verify-Topo-Clusters" requires="Net-topo.Query-Topo"
+        <step name="Net-Topo.Verify-Topo-Clusters" requires="Net-Topo.Query-Topo"
               exec="test ${topoClusters} == 1"/>
 
         <!-- Verify the cluster topology using the REST API -->
-        <step name="Net-topo.Query-Cluster0"
+        <step name="Net-Topo.Query-Cluster0"
               exec="query-cluster.py ${OC1} clusterTopo0 0"/>
-        <step name="Net-topo.Verify-Cluster0-Id" requires="Net-topo.Query-Cluster0"
+        <step name="Net-Topo.Verify-Cluster0-Id" requires="Net-Topo.Query-Cluster0"
               exec="test ${clusterTopo0Id} == 0"/>
-        <step name="Net-topo.Verify-Cluster0-DeviceCount" requires="Net-topo.Query-Cluster0"
+        <step name="Net-Topo.Verify-Cluster0-DeviceCount" requires="Net-Topo.Query-Cluster0"
               exec="test ${clusterTopo0DeviceCount} == 25"/>
-        <step name="Net-topo.Verify-Cluster0-LinkCount" requires="Net-topo.Query-Cluster0"
+        <step name="Net-Topo.Verify-Cluster0-LinkCount" requires="Net-Topo.Query-Cluster0"
               exec="test ${clusterTopo0LinkCount} == 140"/>
-        <step name="Net-topo.Verify-Cluster0-Root" requires="Net-topo.Query-Cluster0"
+        <step name="Net-Topo.Verify-Cluster0-Root" requires="Net-Topo.Query-Cluster0"
               exec="test '${clusterTopo0Root}' == 'of:000000000000000a'"/>
 
         <!-- Verify the list of devices for the cluster -->
-        <step name="Net-topo.Verify-Cluster0-Devices"
+        <step name="Net-Topo.Verify-Cluster0-Devices"
               exec="verify-topo-devices.py ${OC1} 0 0 24"/>
 
         <!-- Spot check some known links in the topology -->
-        <step name="Net-topo.Verify-Cluster0-Link1"
+        <step name="Net-Topo.Verify-Cluster0-Link1"
               exec="find-link-in-cluster.py ${OC1} link1 0 140 of:000000000000000f 8 of:0000000000000015 3"/>
-        <step name="Net-topo.Verify-Cluster0-Link2"
+        <step name="Net-Topo.Verify-Cluster0-Link2"
               exec="find-link-in-cluster.py ${OC1} link2 0 140 of:0000000000000008 3 of:0000000000000005 4"/>
-        <step name="Net-topo.Verify-Cluster0-Link3"
+        <step name="Net-Topo.Verify-Cluster0-Link3"
               exec="find-link-in-cluster.py ${OC1} link3 0 140 of:0000000000000011 2 of:0000000000000002 9"/>
-        <step name="Net-topo.Verify-Cluster0-Link4"
+        <step name="Net-Topo.Verify-Cluster0-Link4"
               exec="find-link-in-cluster.py ${OC1} link4 0 140 of:000000000000000f 3 of:000000000000000d 10"/>
-        <step name="Net-topo.Verify-Cluster0-Link5"
+        <step name="Net-Topo.Verify-Cluster0-Link5"
               exec="find-link-in-cluster.py ${OC1} link5 0 140 of:000000000000000d 13 of:0000000000000010 6"/>
 
         <!--  Verify the topology infrastructure query -->
-        <step name="Net-topo.Query-Cluster0-Infra1"
+        <step name="Net-Topo.Query-Cluster0-Infra1"
               exec="find-topo-infrastructure.py ${OC1} infra1 of:000000000000000f:8"/>
-        <step name="Net-topo.Verify-Cluster0-Infra1" requires="Net-topo.Query-Cluster0-Infra1"
+        <step name="Net-Topo.Verify-Cluster0-Infra1" requires="Net-Topo.Query-Cluster0-Infra1"
               exec="test '${infra1Infrastructure}' == 'True'"/>
 
-        <step name="Net-topo.Query-Cluster0-Infra2"
+        <step name="Net-Topo.Query-Cluster0-Infra2"
               exec="find-topo-infrastructure.py ${OC1} infra2 of:000000000000000d:8"/>
-        <step name="Net-topo.Verify-Cluster0-Infra2" requires="Net-topo.Query-Cluster0-Infra2"
+        <step name="Net-Topo.Verify-Cluster0-Infra2" requires="Net-Topo.Query-Cluster0-Infra2"
               exec="test '${infra2Infrastructure}' == 'True'"/>
 
-        <step name="Net-topo.Query-Cluster0-Infra3"
+        <step name="Net-Topo.Query-Cluster0-Infra3"
               exec="find-topo-infrastructure.py ${OC1} infra3 of:0000000000000012:8"/>
-        <step name="Net-topo.Verify-Cluster0-Infra3" requires="Net-topo.Query-Cluster0-Infra3"
+        <step name="Net-Topo.Verify-Cluster0-Infra3" requires="Net-Topo.Query-Cluster0-Infra3"
               exec="test '${infra3Infrastructure}' == 'False'"/>
 
     </group>
-- 
cgit 1.2.3-korg