Correct Exclude usage in FIB matching scenario
refs #3693
Change-Id: Ia9714b79a60e0d4c47f6135601827b6eb3ebb919
diff --git a/test_fib_matching/README.md b/test_fib_matching/README.md
index 58842a3..25b3ec6 100644
--- a/test_fib_matching/README.md
+++ b/test_fib_matching/README.md
@@ -10,10 +10,10 @@
This test case will run the NFD, ndn-traffic and ndn-traffic-server to test NFD's fib matching. The following steps will be followed:
1. Start NFD.
-2. Start ndn-traffic-server to serve ndn:/ with Content "Z", FreshnessPeriod=10ms. Do prefix registration using NFD FibMgmt.
-3. Start ndn-traffic-server to serve ndn:/A with Content "A", FreshnessPeriod=10ms. Do prefix registration using NFD FibMgmt.
-4. Start ndn-traffic-server to serve ndn:/A/B/C with Content "C", FreshnessPeriod=10ms. Do prefix registration using NFD FibMgmt.
-5. Start ndn-traffic-server to serve ndn:/D/E with Content "E", FreshnessPeriod=10ms. Do prefix registration using NFD FibMgmt.
+2. Start ndn-traffic-server to serve ndn:/ with Content "Z", FreshnessPeriod=10ms.
+3. Start ndn-traffic-server to serve ndn:/A with Content "A", FreshnessPeriod=10ms.
+4. Start ndn-traffic-server to serve ndn:/A/B/C with Content "C", FreshnessPeriod=10ms.
+5. Start ndn-traffic-server to serve ndn:/D/E with Content "E", FreshnessPeriod=10ms.
6. Invoke ndn-traffic to request ndn:/ MustBeFresh=yes. Fail if unanswered. Fail if Content is not "Z".
7. Wait 100ms.
8. Invoke ndn-traffic to request ndn:/F MustBeFresh=yes. Fail if unanswered. Fail if Content is not "Z".
@@ -30,6 +30,6 @@
19. Wait 100ms.
20. Invoke ndn-traffic to request ndn:/A/B/C/P/Q/R/S/T/U/V/W/X/Y/Z MustBeFresh=yes. Fail if unanswered. Fail if Content is not "C".
21. Wait 100ms.
-22. Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,D]. Fail if unanswered. Fail if Content is not "Z".
+22. Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,D] (... is a zero-length generic component). Fail if unanswered. Fail if Content is not "Z".
23. Wait 100ms.
-24. Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,E]. Fail if unanswered. Fail if Content is not "Z".
+24. Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,E] (... is a zero-length generic component). Fail if unanswered. Fail if Content is not "Z".
diff --git a/test_fib_matching/test-traffic-client-10.conf b/test_fib_matching/test-traffic-client-10.conf
index 3cc199f..4236460 100644
--- a/test_fib_matching/test-traffic-client-10.conf
+++ b/test_fib_matching/test-traffic-client-10.conf
@@ -1,5 +1,5 @@
TrafficPercentage=100
Name=ndn:/D
MustBeFresh=1
-ExcludeBefore=E
+ExcludeRange=...,E
ExpectedContent=Z
diff --git a/test_fib_matching/test-traffic-client-9.conf b/test_fib_matching/test-traffic-client-9.conf
index 57fc450..c054149 100644
--- a/test_fib_matching/test-traffic-client-9.conf
+++ b/test_fib_matching/test-traffic-client-9.conf
@@ -1,5 +1,5 @@
TrafficPercentage=100
Name=ndn:/D
MustBeFresh=1
-ExcludeBefore=D
+ExcludeRange=...,D
ExpectedContent=Z
diff --git a/test_fib_matching/test_fib_matching.py b/test_fib_matching/test_fib_matching.py
index 0570f64..55c4788 100644
--- a/test_fib_matching/test_fib_matching.py
+++ b/test_fib_matching/test_fib_matching.py
@@ -205,14 +205,14 @@
#Wait 100ms
time.sleep(0.1)
- #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,D]
+ #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,D]
#Fail if unanswered. Fail if Content is not "Z".
clientConfigurationFile = os.path.abspath(
"test_fib_matching/test-traffic-client-9.conf")
self.startProcess("ndn-traffic-client-9",
["ndn-traffic", "-c 1", clientConfigurationFile],
("-> Starting Traffic Client 9 (Prefix=ndn:/D, MustBeFresh=Yes,"
- " ExcludeBefore=D, ExpectedContent=Z)"))
+ " ExcludeRange=...,D, ExpectedContent=Z)"))
self.waitForProcessCompletion("ndn-traffic-client-9", 10)
self.checkAndReportFailure("ndn-traffic-client-9", "Traffic Client 9")
print "-> Traffic Client 9 received data with Content=Z"
@@ -220,14 +220,14 @@
#Wait 100ms
time.sleep(0.1)
- #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[,E].
+ #Invoke ndn-traffic to request ndn:/D MustBeFresh=yes Exclude=[...,E]
#Fail if unanswered. Fail if Content is not "Z".
clientConfigurationFile = os.path.abspath(
"test_fib_matching/test-traffic-client-10.conf")
self.startProcess("ndn-traffic-client-10",
["ndn-traffic", "-c 1", clientConfigurationFile],
("-> Starting Traffic Client 10 (Prefix=ndn:/E, MustBeFresh=Yes,"
- " ExcludeBefore=E, ExpectedContent=Z)"))
+ " ExcludeRange=...,E, ExpectedContent=Z)"))
self.waitForProcessCompletion("ndn-traffic-client-10", 10)
self.checkAndReportFailure("ndn-traffic-client-10", "Traffic Client 10")
print "-> Traffic Client 10 received data with Content=Z"