TestSpecs: update campaign and scenario files to integrate multiple internal-limitati...

diff --git a/TestSpecs/test-campaign.cfg b/TestSpecs/test-campaign.cfg
index 69366b0..3309236 100644 (file)
--- a/TestSpecs/test-campaign.cfg
+++ b/TestSpecs/test-campaign.cfg
@@ -3,5 +3,7 @@
 #   * pre-run and post-run scripts-aware campaign
 #
 # ScenarioDescription                  PlotScript
-test-scenario-pre-post.cfg             test-scenario-pre-post.r
+#test-scenario-pre-post.cfg            test-scenario-pre-post.r
 #test-scenario-pre-post-nop.cfg                test-scenario-pre-post-nop.r
+#test-scenario-pre-post-nop-ul.cfg     test-scenario-pre-post-nop-ul.r
+test-scenario-pre-post-nop-many.cfg    test-scenario-pre-post-nop-many.r

diff --git a/TestSpecs/test-campaign.html b/TestSpecs/test-campaign.html
index 1303f75..216641b 100644 (file)
--- a/TestSpecs/test-campaign.html
+++ b/TestSpecs/test-campaign.html
@@ -131,6 +131,20 @@
               <td>8 Mbit/s up/down</td>
               <td><a href="test-scenario-pre-post-nop/test-scenario-pre-post-nop-dlspeed-percent.png">dlspeed vs percent</a>; <a href="test-scenario-pre-post-nop/test-scenario-pre-post-nop-dlspeed-time.png">dlspeed vs time</a></td>
             </tr>
+            <tr>
+              <td>scenario-pre-post-nop-ul</td>
+              <td>1</td>
+              <td>1</td>
+              <td>8 Mbit/s up only</td>
+              <td><a href="test-scenario-pre-post-nop-ul/test-scenario-pre-post-nop-dlspeed-percent.png">dlspeed vs percent</a>; <a href="test-scenario-pre-post-nop-ul/test-scenario-pre-post-nop-dlspeed-time.png">dlspeed vs time</a></td>
+            </tr>
+            <tr>
+              <td>scenario-pre-post-nop-many</td>
+              <td>1</td>
+              <td>1</td>
+              <td>8 Mbit/s up only</td>
+              <td><a href="test-scenario-pre-post-nop-many/test-scenario-pre-post-nop-dlspeed-percent.png">dlspeed vs percent</a>; <a href="test-scenario-pre-post-nop-many/test-scenario-pre-post-nop-dlspeed-time.png">dlspeed vs time</a></td>
+            </tr>
           </tbody>
         </table>
       </div>

diff --git a/TestSpecs/test-scenario-pre-post-nop.r b/TestSpecs/test-scenario-pre-post-nop.r
index 57fffda..6d793e7 100644 (file)
--- a/TestSpecs/test-scenario-pre-post-nop.r
+++ b/TestSpecs/test-scenario-pre-post-nop.r
@@ -16,7 +16,7 @@ rm(args)
 
 # read data from the data file
 seeder=read.table(paste(target_folder, "p2p-next-03-101.log.data", sep="/"), header=T, sep=" ")
-leecher=read.table(paste(target_folder, "p2p-next-03-103.log.data", sep="/"), header=T, sep=" ")
+leecher=read.table(paste(target_folder, "p2p-next-03-102.log.data", sep="/"), header=T, sep=" ")
 
 
 # transform KB/s to Mbit/s
@@ -31,15 +31,15 @@ scale_x_continuous("Percent", limits=c(0, 100), breaks=seq(0, 100, 10)) +
 scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) +
 coord_cartesian() +
 scale_colour_manual("Legend") +
-opts(title=paste(campaign_name, "scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
+opts(title=paste(campaign_name, "test-scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "scenario-pre-post-nop-dlspeed-percent.eps", sep="/"))
+postscript(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-percent.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "scenario-pre-post-nop-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-percent.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()
 
@@ -53,14 +53,14 @@ scale_x_continuous("Time(s)") +
 scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) +
 coord_cartesian() +
 scale_colour_manual("Legend") +
-opts(title=paste(campaign_name, "scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
+opts(title=paste(campaign_name, "test-scenario-pre-post-nop: a test swarm (1 Seeder, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n"))
 
 # plot data as an eps file
-postscript(paste(target_folder, "scenario-pre-post-nop-dlspeed-time.eps", sep="/"))
+postscript(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-time.eps", sep="/"))
 print(p)
 dev.off()
 
 # plot data as an png file
-png(paste(target_folder, "scenario-pre-post-nop-dlspeed-time.png", sep="/"), width = 1280, height = 800)
+png(paste(target_folder, "test-scenario-pre-post-nop-dlspeed-time.png", sep="/"), width = 1280, height = 800)
 print(p)
 dev.off()