F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the stream assignment of some additional random variables in OLSR test suite

Browse Source
This commit is contained in:
Tom Henderson
2014-09-11 11:23:03 -07:00
parent 87c3097be5
commit 9db13b8df4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/olsr/test/bug780-test.cc
View File

@@ -127,7 +127,7 @@ Bug780Test::CreateNodes (void)
// Assign 6 streams per Wifi device
NS_TEST_ASSERT_MSG_EQ (streamsUsed, (adhocDevices.GetN () * 6), "Stream assignment mismatch");
streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed);
// Assign 0 streams per channel for this configuration
// Assign 0 additional streams per channel for this configuration
NS_TEST_ASSERT_MSG_EQ (streamsUsed, (adhocDevices.GetN () * 6), "Stream assignment mismatch");
OlsrHelper olsr;
@@ -135,8 +135,12 @@ Bug780Test::CreateNodes (void)
InternetStackHelper internet;
internet.SetRoutingHelper (olsr);
internet.Install (adhocNodes);
// Assign 3 streams per node to internet stack for this configuration
streamsUsed += internet.AssignStreams (adhocNodes, streamsUsed);
NS_TEST_ASSERT_MSG_EQ (streamsUsed, (adhocDevices.GetN () * 6) + (adhocNodes.GetN () * 3), "Stream assignment mismatch");
// Olsr uses one additional stream per wifi device for this configuration
streamsUsed += olsr.AssignStreams (adhocNodes, 0);
NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((adhocDevices.GetN () * 6) + nWifis), "Should have assigned 3 streams");
NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((adhocDevices.GetN () * 6) + (adhocDevices.GetN () * 3) + nWifis), "Should have assigned 3 streams");
Ipv4AddressHelper addressAdhoc;
addressAdhoc.SetBase ("10.1.1.0", "255.255.255.0");