commit 125952302eee7bce92802cebf4757464bebfc405
author Ray Milkey <ray@onlab.us> Wed May 18 11:06:01 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 20 22:00:59 2016 +0000
tree 7278f4345d2815ce66f013ef577c7f6ce6c5cd52
parent 888eeda7592805d9eb91935a160fe385bef94832

Fix check for valid cluster root

Change-Id: Id4d785977a0c0b6d176bbd15d9b2c81b46b45e97

tools/test/scenarios/net-topo.xml

diff --git a/tools/test/scenarios/net-topo.xml b/tools/test/scenarios/net-topo.xml
index 3f00f78..ecc54ce 100644
--- a/tools/test/scenarios/net-topo.xml
+++ b/tools/test/scenarios/net-topo.xml
@@ -38,7 +38,7 @@
         <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"
-              exec="test '${clusterTopo0Root}' == 'of:000000000000000a' -o '${clusterTopo0Root}' == 'of:000000000000000c'"/>
+              exec="echo '${clusterTopo0Root}' | egrep -e 'of:000000000000000[0-9a-f]'"/>
 
         <!-- Verify the list of devices for the cluster -->
         <step name="Net-Topo.Verify-Cluster0-Devices"