rename BroadcastStrategy to MulticastStrategy
refs #3011
Change-Id: I53c0f4ad4b11c4438765cb697bdabf678d83b8e3
diff --git a/test_broadcast/test_broadcast.py b/test_broadcast/test_broadcast.py
deleted file mode 100644
index e830039..0000000
--- a/test_broadcast/test_broadcast.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/python2
-# -*- Mode:python; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
-#
-# Copyright (C) 2014 University of Arizona
-# Author: Yi Huang <ltr120@email.arizona.edu>
-# See COPYING for copyright and distribution information.
-#
-
-import os
-import unittest
-import subprocess
-
-class test_broadcast(unittest.TestCase):
- """Test case for broadcast scenario"""
-
- def setUp(self):
- print "\nTesting Broadcast scenario"
- print "**************************"
- os.chdir("test_broadcast")
-
- def tearDown(self):
- print "**************************"
- os.chdir("..")
-
- def test_broadcast(self):
- ret = subprocess.call(["./broadcast-test.sh"], shell=True)
- print "Test script return value:", ret
- errormsg = {
- 1 : "B did not receive at least 80 Interests.",
- 2 : "C did not receive at least 80 Interests.",
- 3 : "Incoming Data packets in D exceeded 120.",
- }
- if ret != 0:
- self.fail(errormsg[ret])
diff --git a/test_interest_loop/test_interest_loop.py b/test_interest_loop/test_interest_loop.py
index b4b1bf7..c22b146 100644
--- a/test_interest_loop/test_interest_loop.py
+++ b/test_interest_loop/test_interest_loop.py
@@ -29,9 +29,9 @@
print "******************************"
os.chdir("..")
- def test_broadcast(self):
- print ">>> Testing with Broadcast Strategy <<<"
- ret = subprocess.call(["./interest-loop-test.sh ndn:/localhost/nfd/strategy/broadcast broadcast"], shell=True)
+ def test_multicast(self):
+ print ">>> Testing with Multicast Strategy <<<"
+ ret = subprocess.call(["./interest-loop-test.sh ndn:/localhost/nfd/strategy/multicast multicast"], shell=True)
print "Test script return value:", ret
if ret != 0:
self.fail(self.errormsg[ret])
diff --git a/test_linkfail/README.md b/test_linkfail/README.md
index 2e5da51..6bf82b7 100644
--- a/test_linkfail/README.md
+++ b/test_linkfail/README.md
@@ -5,7 +5,7 @@
Three forwarding strategies are tested:
* NCC strategy
-* Broadcast strategy
+* Multicast strategy
* Best Route strategy: expected failure
## Topology
diff --git a/test_linkfail/test_linkfail.py b/test_linkfail/test_linkfail.py
index 0e1ea02..a665714 100644
--- a/test_linkfail/test_linkfail.py
+++ b/test_linkfail/test_linkfail.py
@@ -46,8 +46,8 @@
if self.getProcessReturnCode("ping") <> 0:
self.fail("ping loss or delay")
- def test_broadcast(self):
- self.run_strategy_test("broadcast", "ndn:/localhost/nfd/strategy/broadcast")
+ def test_multicast(self):
+ self.run_strategy_test("multicast", "ndn:/localhost/nfd/strategy/multicast")
def test_ncc(self):
self.run_strategy_test("ncc", "ndn:/localhost/nfd/strategy/ncc")
diff --git a/test_broadcast/NDNTrafficClient.conf b/test_multicast_strategy/NDNTrafficClient.conf
similarity index 78%
rename from test_broadcast/NDNTrafficClient.conf
rename to test_multicast_strategy/NDNTrafficClient.conf
index 79b6a94..847fc43 100644
--- a/test_broadcast/NDNTrafficClient.conf
+++ b/test_multicast_strategy/NDNTrafficClient.conf
@@ -1,6 +1,6 @@
##########
TrafficPercentage=100
-Name=ndn:/test-bcast/A
+Name=ndn:/test-mcast/A
ExpectedContent=AAAAAAAA
NameAppendBytes=8
##########
diff --git a/test_broadcast/NDNTrafficServer.conf b/test_multicast_strategy/NDNTrafficServer.conf
similarity index 64%
rename from test_broadcast/NDNTrafficServer.conf
rename to test_multicast_strategy/NDNTrafficServer.conf
index 499a882..00330e0 100644
--- a/test_broadcast/NDNTrafficServer.conf
+++ b/test_multicast_strategy/NDNTrafficServer.conf
@@ -1,4 +1,4 @@
##########
-Name=ndn:/test-bcast
+Name=ndn:/test-mcast
Content=AAAAAAAA
##########
diff --git a/test_broadcast/README.md b/test_multicast_strategy/README.md
similarity index 62%
rename from test_broadcast/README.md
rename to test_multicast_strategy/README.md
index 2b2068a..bd25d97 100644
--- a/test_broadcast/README.md
+++ b/test_multicast_strategy/README.md
@@ -1,16 +1,16 @@
-# BroadcastStrategy test scenario
+# MulticastStrategy test scenario
-Test Broadcast Strategy
+Test Multicast Strategy
Steps:
1. Start NFD on A,B,C,D.
-2. On host B,C, start ndn-traffic-server to serve `ndn:/test-bcast`.
-3. On host A, invoke nfdc to set BroadcastStrategy at `ndn:/test-bcast`.
-4. On host A, invoke nfdc to create UDP tunnel to B, and add nexthop for `ndn:/test-bcast` to this face with cost 10.
-5. On host A, invoke nfdc to create UDP tunnel to C, and add nexthop for `ndn:/test-bcast` to this face with cost 20.
-6. On host D, invoke nfdc to create UDP tunnel to A, and add nexthop for `ndn:/test-bcast` to this face.
-7. On host D, execute ndn-traffic-client to send 100 Interest to `ndn:/test-bcast/A/<random>`.
+2. On host B,C, start ndn-traffic-server to serve `ndn:/test-mcast`.
+3. On host A, invoke nfdc to set MulticastStrategy at `ndn:/test-mcast`.
+4. On host A, invoke nfdc to create UDP tunnel to B, and add nexthop for `ndn:/test-mcast` to this face with cost 10.
+5. On host A, invoke nfdc to create UDP tunnel to C, and add nexthop for `ndn:/test-mcast` to this face with cost 20.
+6. On host D, invoke nfdc to create UDP tunnel to A, and add nexthop for `ndn:/test-mcast` to this face.
+7. On host D, execute ndn-traffic-client to send 100 Interest to `ndn:/test-mcast/A/<random>`.
8. On host B,C, stop ndn-traffic-server.
Fail if total served Interests on either host is less than 80.
9. On host D, invoke nfd-status to observe counters on the face created in step 6.
diff --git a/test_broadcast/broadcast-test.sh b/test_multicast_strategy/test.sh
similarity index 90%
rename from test_broadcast/broadcast-test.sh
rename to test_multicast_strategy/test.sh
index 40e50ca..4b20fb6 100755
--- a/test_broadcast/broadcast-test.sh
+++ b/test_multicast_strategy/test.sh
@@ -32,13 +32,13 @@
# set up forwarding on A
echo "setting up forwarding on A..."
-nfdc set-strategy ndn:/test-bcast ndn:/localhost/nfd/strategy/broadcast
-nfdc add-nexthop -c 10 ndn:/test-bcast udp4://$IP4_B1
-nfdc add-nexthop -c 20 ndn:/test-bcast udp4://$IP4_C1
+nfdc set-strategy ndn:/test-mcast ndn:/localhost/nfd/strategy/multicast
+nfdc add-nexthop -c 10 ndn:/test-mcast udp4://$IP4_B1
+nfdc add-nexthop -c 20 ndn:/test-mcast udp4://$IP4_C1
# set up forwarding on D
echo "setting up forwarding on D..."
-ssh $CTRL_D "nfdc add-nexthop ndn:/test-bcast udp4://$IP4_A2"
+ssh $CTRL_D "nfdc add-nexthop ndn:/test-mcast udp4://$IP4_A2"
# run ndn-traffic client on D
echo "running ndn-traffic client on D..."
@@ -88,4 +88,4 @@
# clean up
clean_up
-echo "Breadcast Test PASSED"
+echo "MulticastStrategy PASSED"
diff --git a/test_multicast_strategy/test_multicast_strategy.py b/test_multicast_strategy/test_multicast_strategy.py
new file mode 100644
index 0000000..eb0bb0c
--- /dev/null
+++ b/test_multicast_strategy/test_multicast_strategy.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python2
+# -*- Mode:python; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+
+import os
+import unittest
+import subprocess
+
+class test_multicast_strategy(unittest.TestCase):
+ """Test suite for MulticastStrategy"""
+
+ def setUp(self):
+ print "\nTesting MulticastStrategy scenario"
+ print "**************************"
+ os.chdir("test_multicast_strategy")
+
+ def tearDown(self):
+ print "**************************"
+ os.chdir("..")
+
+ def test_strategy(self):
+ ret = subprocess.call(["./test.sh"], shell=True)
+ print "Test script return value:", ret
+ errormsg = {
+ 1 : "B did not receive at least 80 Interests.",
+ 2 : "C did not receive at least 80 Interests.",
+ 3 : "Incoming Data packets in D exceeded 120.",
+ }
+ if ret != 0:
+ self.fail(errormsg[ret])
diff --git a/test_nfdc/README.md b/test_nfdc/README.md
index 5803770..1c8ea51 100644
--- a/test_nfdc/README.md
+++ b/test_nfdc/README.md
@@ -37,7 +37,7 @@
12. Invoke nfdc to add a nexthop for ndn:/test-nfdc with cost 14 toward FaceId created in step 7.
13. Invoke nfdc to add a nexthop for ndn:/test-nfdc with cost 16 toward FaceId created in step 9.
14. Execute nfd-status. Check the existence of ndn:/test-nfdc FIB entry, and the correctness of cost on nexthop records.
-15. Invoke nfdc to choose BroadcastStrategy for ndn:/ namespace.
+15. Invoke nfdc to choose MulticastStrategy for ndn:/ namespace.
16. Invoke ndnping to send 100 Interests under ndn:/test-nfdc prefix.
17. Pause 50ms before sending each Interest.
18. Execute nfd-status. Verify NOutInterests counters of faces created in step 3,5,7,9 are greater than 60.
diff --git a/test_nfdc/nfdc-test.sh b/test_nfdc/nfdc-test.sh
index daa76da..fcaecc0 100755
--- a/test_nfdc/nfdc-test.sh
+++ b/test_nfdc/nfdc-test.sh
@@ -86,8 +86,8 @@
# check correctness of add-nexthop -c 16 ndn:/test-nfdc $faceIdUdp6
check_nfd_status_correctness $faceIdUdp6 udp6://[$IP6_B1] /test-nfdc 16
- # Invoke nfdc to choose BroadcastStrategy for ndn:/ namespace.
- nfdc set-strategy ndn:/ ndn:/localhost/nfd/strategy/broadcast
+ # Invoke nfdc to choose MulticastStrategy for ndn:/ namespace.
+ nfdc set-strategy ndn:/ ndn:/localhost/nfd/strategy/multicast
ndnping -c $NUM_OF_PINGS ndn:/test-nfdc