From ef307bd6f88a739f403e805bee8e10cdae484bda Mon Sep 17 00:00:00 2001
From: Robert Ricci <ricci@cs.utah.edu>
Date: Wed, 28 Aug 2002 22:50:06 +0000
Subject: [PATCH] Two new tests: widearea_types and widearea_mapped . Both
request widearea nodes, the former by asking for types, the latter by asking
for a specific toplogy.
These are only frontend tests, so they don't test that setup on the
nodes is done correctly, something we'll want to add tests for
eventually.
---
testsuite/testlists/frontend | 2 ++
testsuite/tests/widearea_mapped/info | 2 ++
testsuite/tests/widearea_mapped/nsfile.ns | 17 +++++++++++++++++
testsuite/tests/widearea_mapped/test | 6 ++++++
testsuite/tests/widearea_types/info | 1 +
testsuite/tests/widearea_types/nsfile.ns | 17 +++++++++++++++++
testsuite/tests/widearea_types/test | 6 ++++++
7 files changed, 51 insertions(+)
create mode 100644 testsuite/tests/widearea_mapped/info
create mode 100644 testsuite/tests/widearea_mapped/nsfile.ns
create mode 100644 testsuite/tests/widearea_mapped/test
create mode 100644 testsuite/tests/widearea_types/info
create mode 100644 testsuite/tests/widearea_types/nsfile.ns
create mode 100644 testsuite/tests/widearea_types/test
diff --git a/testsuite/testlists/frontend b/testsuite/testlists/frontend
index aa51d51545..a7b5a3b40b 100644
--- a/testsuite/testlists/frontend
+++ b/testsuite/testlists/frontend
@@ -21,3 +21,5 @@ vtypes
simplex
red
cbr
+widearea_types
+widearea_mapped
diff --git a/testsuite/tests/widearea_mapped/info b/testsuite/tests/widearea_mapped/info
new file mode 100644
index 0000000000..dc88788703
--- /dev/null
+++ b/testsuite/tests/widearea_mapped/info
@@ -0,0 +1,2 @@
+A widearea test that asks for specific links between nodes, which must be
+mapped with the WAN solver.
diff --git a/testsuite/tests/widearea_mapped/nsfile.ns b/testsuite/tests/widearea_mapped/nsfile.ns
new file mode 100644
index 0000000000..8ac035dacf
--- /dev/null
+++ b/testsuite/tests/widearea_mapped/nsfile.ns
@@ -0,0 +1,17 @@
+set ns [new Simulator]
+source tb_compat.tcl
+
+set nodeA [$ns node]
+set nodeB [$ns node]
+set nodeC [$ns node]
+
+tb-set-hardware $nodeA pcvron
+tb-set-hardware $nodeB pcvron
+tb-set-hardware $nodeC pcvron
+
+set link0 [$ns duplex-link $nodeA $nodeB 2Mb 50ms DropTail]
+set link1 [$ns duplex-link $nodeA $nodeC 1Mb 75ms DropTail]
+set link2 [$ns duplex-link $nodeB $nodeC 0.5Mb 100ms DropTail]
+
+$ns run
+
diff --git a/testsuite/tests/widearea_mapped/test b/testsuite/tests/widearea_mapped/test
new file mode 100644
index 0000000000..78e9a5be8c
--- /dev/null
+++ b/testsuite/tests/widearea_mapped/test
@@ -0,0 +1,6 @@
+tb_prerun("tbprerun",0);
+tb_run("tbswapin",0);
+tb_run("tbswapout",0);
+tb_run("tbswapin",0);
+tb_run("tbswapout",0);
+tb_run("tbend",0);
diff --git a/testsuite/tests/widearea_types/info b/testsuite/tests/widearea_types/info
new file mode 100644
index 0000000000..d22b900231
--- /dev/null
+++ b/testsuite/tests/widearea_types/info
@@ -0,0 +1 @@
+Tests widearea nodes, using general types, such as Internet, Internet2, etc.
diff --git a/testsuite/tests/widearea_types/nsfile.ns b/testsuite/tests/widearea_types/nsfile.ns
new file mode 100644
index 0000000000..860edf7621
--- /dev/null
+++ b/testsuite/tests/widearea_types/nsfile.ns
@@ -0,0 +1,17 @@
+set ns [new Simulator]
+source tb_compat.tcl
+
+set nodeA [$ns node]
+set nodeB [$ns node]
+set nodeC [$ns node]
+set nodeD [$ns node]
+set nodeE [$ns node]
+
+tb-set-hardware $nodeA pcvroninet2
+tb-set-hardware $nodeB pcvroninet
+tb-set-hardware $nodeC pcvronintl
+tb-set-hardware $nodeD pcvrondsl
+tb-set-hardware $nodeE pcvwainet
+
+$ns run
+
diff --git a/testsuite/tests/widearea_types/test b/testsuite/tests/widearea_types/test
new file mode 100644
index 0000000000..78e9a5be8c
--- /dev/null
+++ b/testsuite/tests/widearea_types/test
@@ -0,0 +1,6 @@
+tb_prerun("tbprerun",0);
+tb_run("tbswapin",0);
+tb_run("tbswapout",0);
+tb_run("tbswapin",0);
+tb_run("tbswapout",0);
+tb_run("tbend",0);
--
GitLab