autorun: dual-server test case

diff --git a/autorun/xml/nodes.xml b/autorun/xml/nodes.xml
index 0e549e9..4b7b231 100644 (file)
--- a/autorun/xml/nodes.xml
+++ b/autorun/xml/nodes.xml
@@ -1,15 +1,39 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <nodes>
     <node id="1">
-       <public_address>141.85.224.204</public_address>
-       <public_port>10150</public_port>
+       <public_address>141.85.224.201</public_address>
+       <public_port>50700</public_port>
        <public_iface>eth0</public_iface>
-       <private_address>172.16.20.3</private_address>
+       <private_address>172.16.10.7</private_address>
        <private_port></private_port>
        <private_iface>venet0:0</private_iface>
-       <ssh_port>20322</ssh_port>
+       <ssh_port>10722</ssh_port>
        <username>p2p</username>
-       <listen_port>10004</listen_port>
+       <listen_port>10740</listen_port>
+       <daemon_dir>/home/p2p/cs-p2p-next/autorun/server/</daemon_dir>
+       <daemon_file>Server.py</daemon_file>
+       <clients>
+           <client id="tribler">
+               <base>/home/p2p/p2p-clients/tribler</base>
+           </client>
+           <client id="libtorrent">
+               <base>/home/p2p/p2p-clients/libtorrent</base>
+           </client>
+           <client id="transmission">
+               <base>/usr/bin</base>
+           </client>
+        </clients>
+    </node>
+    <node id="2">
+       <public_address>141.85.224.201</public_address>
+       <public_port>50800</public_port>
+       <public_iface>eth0</public_iface>
+       <private_address>172.16.10.8</private_address>
+       <private_port></private_port>
+       <private_iface>venet0:0</private_iface>
+       <ssh_port>10822</ssh_port>
+       <username>p2p</username>
+       <listen_port>10840</listen_port>
        <daemon_dir>/home/p2p/cs-p2p-next/autorun/server/</daemon_dir>
        <daemon_file>Server.py</daemon_file>
        <clients>

diff --git a/autorun/xml/swarm.xml b/autorun/xml/swarm.xml
index b1b69dc..63aeaa4 100644 (file)
--- a/autorun/xml/swarm.xml
+++ b/autorun/xml/swarm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <swarm>
-    <torrent_file>/home/p2p/p2p-meta/himym520.torrent</torrent_file>
+       <torrent_file>/home/p2p/p2p-meta/so-vm-linux-krypton.tar.gz.torrent</torrent_file>
      <instance id="1">
        <node>1</node>
        <client>tribler</client>
@@ -19,5 +19,24 @@
            <action type="start" delay="00:25:00" />
            <action type="start" delay="end" />
        </actions>
-    </instance>  
+    </instance>
+     <instance id="2">
+       <node>2</node>
+       <client>tribler</client>
+       <upload_limit>512</upload_limit>
+       <download_limit>256</download_limit>
+       <download_dir>/home/p2p/p2p-dld/tribler</download_dir>
+       <log_dir>/home/p2p/p2p-log/tribler</log_dir>
+       <log_file>tribler-himym520.log</log_file>
+       <output_dir>/home/p2p/p2p-log/tribler</output_dir>
+       <output_file>tribler-himym520.out</output_file>
+       <actions>
+           <action type="start" delay="00:05:00" />
+           <action type="stop" delay="00:10:00" />
+           <action type="start" delay="00:15:00" />
+           <action type="stop" delay="00:20:00" />
+           <action type="start" delay="00:25:00" />
+           <action type="start" delay="end" />
+       </actions>
+    </instance>
 </swarm>