Fix cloud.xml: symmetrical routes are implicit.

Add file to basic_parsing_test so that it doesn't remain untested..

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 44c41dd..8474f26 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -69,18 +69,6 @@
                gw_dst="gw_dc1_horizdist">
         <link_ctn id="link_dc1_cb2"/>
       </zoneRoute> 
-      <zoneRoute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com"
-               gw_src="gw_dc1_horizdist">
-        <link_ctn id="link_dc1_cb1"/>
-      </zoneRoute>
-      <zoneRoute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com"
-               gw_src="gw_dc1_horizdist">
-        <link_ctn id="link_dc1_cb3"/>
-      </zoneRoute>
-      <zoneRoute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com"
-               gw_src="gw_dc1_horizdist">
-        <link_ctn id="link_dc1_cb2"/>
-      </zoneRoute>
     </zone>
 
     <zone id="AS2_dc2" routing="Full">
@@ -234,30 +222,6 @@
                gw_dst="gw_dc2_horizdist">
         <link_ctn id="link_dc2_cb1"/>
       </zoneRoute> 
-      <zoneRoute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb6"/>
-      </zoneRoute>
-      <zoneRoute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb4"/>
-      </zoneRoute>
-      <zoneRoute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb5"/>
-      </zoneRoute>
-      <zoneRoute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb2"/>
-      </zoneRoute>
-      <zoneRoute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb3"/>
-      </zoneRoute>
-      <zoneRoute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com"
-               gw_src="gw_dc2_horizdist">
-        <link_ctn id="link_dc2_cb1"/>
-      </zoneRoute> 
     </zone>
 
     <zone id="AS3_dc3" routing="Full">  
@@ -350,22 +314,6 @@
                gw_dst="gw_dc3_horizdist">
         <link_ctn id="link_dc3_cb4"/>
       </zoneRoute>
-      <zoneRoute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com"
-               gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb3"/>
-      </zoneRoute>
-      <zoneRoute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com"
-               gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb2"/>
-      </zoneRoute>
-      <zoneRoute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com"
-               gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb1"/>
-      </zoneRoute>
-      <zoneRoute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com"
-               gw_src="gw_dc3_horizdist">
-        <link_ctn id="link_dc3_cb4"/>
-      </zoneRoute>
     </zone>
   </zone>
 </platform>

diff --git a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh
index 011a6f8..19981aa 100644 (file)
--- a/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh
+++ b/teshsuite/s4u/basic-parsing-test/basic-parsing-test.tesh
@@ -31,6 +31,10 @@ $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/two_hosts_
 $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/four_hosts_floyd.xml --log=root.fmt=%m%n
 > Workstation number: 4, link number: 5
 
+! output sort
+$ ${bindir:=.}/basic-parsing-test ${platfdir:=.}/cloud.xml --log=root.fmt=%m%n
+> Workstation number: 510, link number: 1056
+
 $ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/../../simdag/platforms/properties.xml --log=root.fmt=%m%n
 > Configuration change: Set 'cpu/optim' to 'TI'
 > Configuration change: Set 'host/model' to 'compound'