a platform to test the AS bypass feature

diff --git a/teshsuite/simdag/CMakeLists.txt b/teshsuite/simdag/CMakeLists.txt
index cde7cfc..a0fd7e4 100644 (file)
--- a/teshsuite/simdag/CMakeLists.txt
+++ b/teshsuite/simdag/CMakeLists.txt
@@ -33,7 +33,8 @@ set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/flatifier/bogus_
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
                                     PARENT_SCOPE)
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-sym-full.tesh
                                     ${CMAKE_CURRENT_SOURCE_DIR}/basic-parsing-test/basic-parsing-test-bypass.tesh
                                     PARENT_SCOPE)

-set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml
+set(xml_files     ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/platforms/ASbypass.xml
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/platforms/four_hosts_floyd.xml

                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/two_hosts_multi_hop.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/host_attributes.xml
                                     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/link_attributes.xml

diff --git a/teshsuite/simdag/platforms/ASbypass.xml b/teshsuite/simdag/platforms/ASbypass.xml
new file mode 100644 (file)
index 0000000..6fcd678
--- /dev/null
+++ b/teshsuite/simdag/platforms/ASbypass.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+    <AS id="AS0" routing="Full">
+        <AS id="AS1" routing="Full">
+       
+            <cluster id="mycluster" prefix="my" radical="1,2" suffix=".cluster" speed="4200Mf" 
+                     bw="1000Mbps" lat="500us" sharing_policy="FATPIPE" router_id="mycluster_router"> 
+            </cluster>
+      
+            <AS id="AS1_gw" routing="Full">
+                <router id="AS1_router"/>
+            </AS>
+              
+            <link id="AS1_backbone" bandwidth="100Gbps" latency="250us"/>
+ 
+            <ASroute src="mycluster" dst="AS1_gw" gw_src="mycluster_router" gw_dst="AS1_router">
+                <link_ctn id="AS1_backbone"/>
+            </ASroute>
+        </AS>
+          
+        <AS id="AS2" routing="None">
+            <host id="myhost" speed="5Gf" core="48"/>
+        </AS>
+                 
+        <link id="AS1-AS2" bandwidth="24885480000bps" latency="500us"/>
+        <link id="AS1-AS2-mycluster" bandwidth="24885480000bps" latency="500us"/>
+        <link id="mycluster-AS1-AS2" bandwidth="12442740000bps" latency="500us"/>
+
+        <ASroute src="AS1" dst="AS2" gw_src="AS1_router" gw_dst="myhost">
+            <link_ctn id="AS1-AS2"/> 
+        </ASroute>
+
+        <bypassASroute src="mycluster" dst="AS2" gw_src="mycluster_router" gw_dst="myhost">
+            <link_ctn id="mycluster-AS1-AS2"/>
+            <link_ctn id="AS1-AS2"/>
+        </bypassASroute>
+        <bypassASroute src="AS2" dst="mycluster" gw_src="myhost" gw_dst="mycluster_router">
+            <link_ctn id="AS1-AS2"/>
+            <link_ctn id="AS1-AS2-mycluster"/>
+        </bypassASroute>
+    </AS>
+</platform>
\ No newline at end of file