Merge with master and fix conflicts

[simgrid.git] / teshsuite / simdag / platforms / test_of_is_router.xml

diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml
index 0b51230ba8efa244e219c95009991939c4a0e1d8..3a797e952cfdc25216a9c57806d02ff89a8b1751 100644 (file)
--- a/teshsuite/simdag/platforms/test_of_is_router.xml
+++ b/teshsuite/simdag/platforms/test_of_is_router.xml
@@ -23,16 +23,11 @@
           <host id="host08" power="500000000"/>
           <router id="router4"/>
        </AS>
-       <AS  id="AS4"  routing="none">
+       <AS  id="AS4"  routing="None">
           <host id="host09" power="1000000000"/>
           <host id="host10" power="500000000"/>
           <router id="router5"/>
        </AS>
-       <AS  id="AS5"  routing="RuleBased">
-          <host id="host11" power="1000000000"/>
-          <host id="host12" power="500000000"/>
-          <router id="router6"/>          
-       </AS>
        
 </AS>
 </platform>