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

wifi: Use wifi- prefix for all test-suites and examples

Browse Source 
Will enable easier wildcarding
This commit is contained in:
Rediet
2019-07-17 15:35:33 +02:00
committed by Tom Henderson
parent 6b2aa28749
commit a9c54ea956
38 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/manual/source/test-framework.rst
View File

@@ -677,7 +677,7 @@ To debug test crashes, such as
.. sourcecode:: text
CRASH: TestSuite ns3-wifi-interference
CRASH: TestSuite wifi-interference
You can access the underlying test-runner program via gdb as follows, and
then pass the "--basedir=`pwd`" argument to run (you can also pass other
@@ -695,7 +695,7 @@ arguments as needed, but basedir is the minimum needed)::
and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu"...
(gdb) r --suite=
Starting program: <..>/build/utils/ns3-dev-test-runner-debug --suite=ns3-wifi-interference
Starting program: <..>/build/utils/ns3-dev-test-runner-debug --suite=wifi-interference
[Thread debugging using libthread_db enabled]
assert failed. file=../src/core/model/type-id.cc, line=138, cond="uid <= m_information.size () && uid != 0"
...

2
doc/tutorial/source/getting-started.rst
View File

@@ -965,7 +965,7 @@ executing each test, which will actually look something like::
topology-read uan virtual-net-device
visualizer wifi wimax
PASS: TestSuite ns3-wifi-interference
PASS: TestSuite wifi-interference
PASS: TestSuite histogram
...

64
examples/wireless/examples-to-run.py
View File

@@ -9,13 +9,13 @@
# See test.py for more information.
cpp_examples = [
("mixed-wired-wireless", "True", "True"),
("multirate --totalTime=0.3s --rateManager=ns3::AarfcdWifiManager", "True", "True"),
("multirate --totalTime=0.3s --rateManager=ns3::AmrrWifiManager", "True", "False"),
("multirate --totalTime=0.3s --rateManager=ns3::CaraWifiManager", "True", "False"),
("multirate --totalTime=0.3s --rateManager=ns3::IdealWifiManager", "True", "False"),
("multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager", "True", "False"),
("multirate --totalTime=0.3s --rateManager=ns3::OnoeWifiManager", "True", "False"),
("multirate --totalTime=0.3s --rateManager=ns3::RraaWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::AarfcdWifiManager", "True", "True"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::AmrrWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::CaraWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::IdealWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::OnoeWifiManager", "True", "False"),
("wifi-multirate --totalTime=0.3s --rateManager=ns3::RraaWifiManager", "True", "False"),
("wifi-adhoc", "False", "True"), # Takes too long to run
("wifi-ap --verbose=0", "True", "True"), # Don't let it spew to stdout
("wifi-clear-channel-cmu", "False", "True"), # Requires specific hardware
@@ -27,33 +27,33 @@ cpp_examples = [
("wifi-sleep", "True", "True"),
("wifi-blockack", "True", "True"),
("wifi-timing-attributes --simulationTime=1", "True", "True"),
("power-adaptation-distance --manager=ns3::ParfWifiManager --outputFileName=parf --steps=5 --stepsSize=10", "True", "True"),
("power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf --steps=5 --stepsSize=10", "True", "False"),
("power-adaptation-distance --manager=ns3::RrpaaWifiManager --outputFileName=rrpaa --steps=5 --stepsSize=10", "True", "False"),
("power-adaptation-interference --simuTime=5", "True", "False"),
("dsss-validation", "True", "True"),
("ofdm-validation", "True", "True"),
("ofdm-ht-validation", "True", "True"),
("ofdm-vht-validation", "True", "True"),
("ofdm-he-validation", "True", "True"),
("80211n-mimo --simulationTime=0.1 --step=10", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=5 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=134", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=5 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=129", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=2.4 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=127", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=562", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=520", "True", "True"),
("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=0 --useExtendedBlockAck=1 --minExpectedThroughput=6 --maxExpectedThroughput=1033", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),
("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=223", "True", "True"),
("simple-ht-hidden-stations --simulationTime=1.5 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"),
("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=57 --maxExpectedThroughput=58", "True", "True"),
("mixed-network --simulationTime=1", "True", "True"),
("wifi-power-adaptation-distance --manager=ns3::ParfWifiManager --outputFileName=parf --steps=5 --stepsSize=10", "True", "True"),
("wifi-power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf --steps=5 --stepsSize=10", "True", "False"),
("wifi-power-adaptation-distance --manager=ns3::RrpaaWifiManager --outputFileName=rrpaa --steps=5 --stepsSize=10", "True", "False"),
("wifi-power-adaptation-interference --simuTime=5", "True", "False"),
("wifi-dsss-validation", "True", "True"),
("wifi-ofdm-validation", "True", "True"),
("wifi-ofdm-ht-validation", "True", "True"),
("wifi-ofdm-vht-validation", "True", "True"),
("wifi-ofdm-he-validation", "True", "True"),
("wifi-80211n-mimo --simulationTime=0.1 --step=10", "True", "True"),
("wifi-ht-network --simulationTime=0.2 --frequency=5 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=134", "True", "True"),
("wifi-ht-network --simulationTime=0.2 --frequency=5 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=129", "True", "True"),
("wifi-ht-network --simulationTime=0.2 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),
("wifi-ht-network --simulationTime=0.2 --frequency=2.4 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=127", "True", "True"),
("wifi-vht-network --simulationTime=0.2 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=562", "True", "True"),
("wifi-vht-network --simulationTime=0.2 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=520", "True", "True"),
("wifi-he-network --simulationTime=0.25 --frequency=5 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),
("wifi-he-network --simulationTime=0.3 --frequency=5 --useRts=0 --useExtendedBlockAck=1 --minExpectedThroughput=6 --maxExpectedThroughput=1033", "True", "True"),
("wifi-he-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),
("wifi-he-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
("wifi-he-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=223", "True", "True"),
("wifi-simple-ht-hidden-stations --simulationTime=1.5 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"),
("wifi-simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=57 --maxExpectedThroughput=58", "True", "True"),
("wifi-mixed-network --simulationTime=1", "True", "True"),
("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
("wifi-txop-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
("80211e-txop --simulationTime=1 --verifyResults=1", "True", "True"),
("wifi-80211e-txop --simulationTime=1 --verifyResults=1", "True", "True"),
("wifi-multi-tos --simulationTime=1 --nWifi=16 --useRts=1 --useShortGuardInterval=1", "True", "True"),
("wifi-tcp", "True", "True"),
("wifi-pcf --simulationTime=1 --withData=0", "True", "True"),

2
examples/wireless/80211e-txop.cc → examples/wireless/wifi-80211e-txop.cc
View File

@@ -55,7 +55,7 @@
//
// The user can select the distance between the stations and the APs, can enable/disable the RTS/CTS mechanism
// and can choose the payload size and the simulation duration.
// Example: ./waf --run "80211e-txop --distance=10 --simulationTime=20 --payloadSize=1000"
// Example: ./waf --run "wifi-80211e-txop --distance=10 --simulationTime=20 --payloadSize=1000"
//
// The output prints the throughput measured for the 4 cases/networks described above. When TXOP is enabled, results show
// increased throughput since the channel is granted for a longer duration. TXOP is enabled by default for AC_VI and AC_VO,

0
examples/wireless/80211n-mimo.cc → examples/wireless/wifi-80211n-mimo.cc
View File

0
examples/wireless/dsss-validation.cc → examples/wireless/wifi-dsss-validation.cc
View File

0
examples/wireless/he-wifi-network.cc → examples/wireless/wifi-he-network.cc
View File

0
examples/wireless/ht-wifi-network.cc → examples/wireless/wifi-ht-network.cc
View File

2
examples/wireless/mixed-network.cc → examples/wireless/wifi-mixed-network.cc
View File

@@ -63,7 +63,7 @@
// Block ACK together with a TXOP duration of 3008 microseconds have been set.
//
// The user can also select the payload size and can choose either an UDP or a TCP connection.
// Example: ./waf --run "mixed-network --isUdp=1"
// Example: ./waf --run "wifi-mixed-network --isUdp=1"
using namespace ns3;

6
examples/wireless/multirate.cc → examples/wireless/wifi-multirate.cc
View File

@@ -27,10 +27,10 @@
* ./waf
*
* To compile:
* ./waf --run multirate
* ./waf --run wifi-multirate
*
* To compile with command line(useful for varying parameters):
* ./waf --run "multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager"
* ./waf --run "wifi-multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager"
*
* To turn on NS_LOG:
* export NS_LOG=multirate=level_all
@@ -38,7 +38,7 @@
*
* To debug:
* ./waf --shell
* gdb ./build/debug/examples/wireless/multirate
* gdb ./build/debug/examples/wireless/wifi-multirate
*
* To view pcap files:
* tcpdump -nn -tt -r filename.pcap

0
examples/wireless/ofdm-he-validation.cc → examples/wireless/wifi-ofdm-he-validation.cc
View File

0
examples/wireless/ofdm-ht-validation.cc → examples/wireless/wifi-ofdm-ht-validation.cc
View File

0
examples/wireless/ofdm-validation.cc → examples/wireless/wifi-ofdm-validation.cc
View File

0
examples/wireless/ofdm-vht-validation.cc → examples/wireless/wifi-ofdm-vht-validation.cc
View File

6
examples/wireless/power-adaptation-distance.cc → examples/wireless/wifi-power-adaptation-distance.cc
View File

@@ -66,17 +66,17 @@
*
* To display all the possible arguments and their defaults:
* \code{.sh}
* ./waf --run "power-adaptation-distance --help"
* ./waf --run "wifi-power-adaptation-distance --help"
* \endcode
*
* Example usage (selecting Aparf rather than Parf):
* \code{.sh}
* ./waf --run "power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf"
* ./waf --run "wifi-power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf"
* \endcode
*
* Another example (moving towards the AP):
* \code{.sh}
* ./waf --run "power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf --stepsSize=-1 --STA1_x=200"
* ./waf --run "wifi-power-adaptation-distance --manager=ns3::AparfWifiManager --outputFileName=aparf --stepsSize=-1 --STA1_x=200"
* \endcode
*
* To enable the log of rate and power changes:

4
examples/wireless/power-adaptation-interference.cc → examples/wireless/wifi-power-adaptation-interference.cc
View File

@@ -41,12 +41,12 @@
*
* Example usage:
* \code{.sh}
* ./waf --run "power-adaptation-interference --manager=ns3::AparfWifiManager --outputFileName=aparf"
* ./waf --run "wifi-power-adaptation-interference --manager=ns3::AparfWifiManager --outputFileName=aparf"
* \endcode
*
* Another example (changing STAs position):
* \code{.sh}
* ./waf --run "power-adaptation-interference --manager=ns3::AparfWifiManager --outputFileName=aparf --STA1_x=5 --STA2_x=205"
* ./waf --run "wifi-power-adaptation-interference --manager=ns3::AparfWifiManager --outputFileName=aparf --STA1_x=5 --STA2_x=205"
* \endcode
*
* To enable the log of rate and power changes:

6
examples/wireless/rate-adaptation-distance.cc → examples/wireless/wifi-rate-adaptation-distance.cc
View File

@@ -38,13 +38,13 @@
* - (if logging is enabled) the changes of rate to standard output.
*
* Example usage:
* ./waf --run "rate-adaptation-distance --standard=802.11a --staManager=ns3::MinstrelWifiManager --apManager=ns3::MinstrelWifiManager --outputFileName=minstrel"
* ./waf --run "wifi-rate-adaptation-distance --standard=802.11a --staManager=ns3::MinstrelWifiManager --apManager=ns3::MinstrelWifiManager --outputFileName=minstrel"
*
* Another example (moving towards the AP):
* ./waf --run "rate-adaptation-distance --standard=802.11a --staManager=ns3::MinstrelWifiManager --apManager=ns3::MinstrelWifiManager --outputFileName=minstrel --stepsSize=1 --STA1_x=-200"
* ./waf --run "wifi-rate-adaptation-distance --standard=802.11a --staManager=ns3::MinstrelWifiManager --apManager=ns3::MinstrelWifiManager --outputFileName=minstrel --stepsSize=1 --STA1_x=-200"
*
* Example for HT rates with SGI and channel width of 40MHz:
* ./waf --run "rate-adaptation-distance --staManager=ns3::MinstrelHtWifiManager --apManager=ns3::MinstrelHtWifiManager --outputFileName=minstrelHt --shortGuardInterval=true --channelWidth=40"
* ./waf --run "wifi-rate-adaptation-distance --staManager=ns3::MinstrelHtWifiManager --apManager=ns3::MinstrelHtWifiManager --outputFileName=minstrelHt --shortGuardInterval=true --channelWidth=40"
*
* To enable the log of rate changes:
* export NS_LOG=RateAdaptationDistance=level_info

8
examples/wireless/wifi-simple-adhoc-grid.cc
View File

@@ -47,13 +47,13 @@
// the default of 500m.
// To see this effect, try running:
//
// ./waf --run "wifi-simple-adhoc --distance=500"
// ./waf --run "wifi-simple-adhoc --distance=1000"
// ./waf --run "wifi-simple-adhoc --distance=1500"
// ./waf --run "wifi-simple-adhoc-grid --distance=500"
// ./waf --run "wifi-simple-adhoc-grid --distance=1000"
// ./waf --run "wifi-simple-adhoc-grid --distance=1500"
//
// The source node and sink node can be changed like this:
//
// ./waf --run "wifi-simple-adhoc --sourceNode=20 --sinkNode=10"
// ./waf --run "wifi-simple-adhoc-grid --sourceNode=20 --sinkNode=10"
//
// This script can also be helpful to put the Wifi layer into verbose
// logging mode; this command will turn on all wifi logging:

2
examples/wireless/simple-ht-hidden-stations.cc → examples/wireless/wifi-simple-ht-hidden-stations.cc
View File

@@ -36,7 +36,7 @@
// This example considers two hidden stations in an 802.11n network which supports MPDU aggregation.
// The user can specify whether RTS/CTS is used and can set the number of aggregated MPDUs.
//
// Example: ./waf --run "simple-ht-hidden-stations --enableRts=1 --nMpdus=8"
// Example: ./waf --run "wifi-simple-ht-hidden-stations --enableRts=1 --nMpdus=8"
//
// Network topology:
//

2
examples/wireless/wifi-spectrum-per-example.cc
View File

@@ -20,7 +20,7 @@
* Sebastien Deronne <sebastien.deronne@gmail.com>
* Tom Henderson <tomhend@u.washington.edu>
*
* Adapted from ht-wifi-network.cc example
* Adapted from wifi-ht-network.cc example
*/
#include <iomanip>

2
examples/wireless/wifi-spectrum-per-interference.cc
View File

@@ -20,7 +20,7 @@
* Sebastien Deronne <sebastien.deronne@gmail.com>
* Tom Henderson <tomhend@u.washington.edu>
*
* Adapted from ht-wifi-network.cc example
* Adapted from wifi-ht-network.cc example
*/
#include <iomanip>

2
examples/wireless/wifi-spectrum-saturation-example.cc
View File

@@ -20,7 +20,7 @@
* Sebastien Deronne <sebastien.deronne@gmail.com>
* Tom Henderson <tomhend@u.washington.edu>
*
* Adapted from ht-wifi-network.cc example
* Adapted from wifi-ht-network.cc example
*/
#include <iomanip>

2
examples/wireless/wifi-txop-aggregation.cc
View File

@@ -57,7 +57,7 @@
//
// The user can select the distance between the stations and the APs, can enable/disable the RTS/CTS mechanism
// and can modify the duration of a TXOP.
// Example: ./waf --run "wifi-aggregation --distance=10 --enableRts=0 --simulationTime=20"
// Example: ./waf --run "wifi-txop-aggregation --distance=10 --enableRts=0 --simulationTime=20"
//
// The output prints the throughput and the maximum TXOP duration measured for the 4 cases/networks
// described above. When default aggregation parameters are enabled, the

0
examples/wireless/vht-wifi-network.cc → examples/wireless/wifi-vht-network.cc
View File

64
examples/wireless/wscript
View File

@@ -20,8 +20,8 @@ def build(bld):
obj = bld.create_ns3_program('wifi-wired-bridging', ['wifi', 'csma', 'bridge', 'applications'])
obj.source = 'wifi-wired-bridging.cc'
obj = bld.create_ns3_program('multirate', ['wifi', 'flow-monitor', 'olsr', 'applications'])
obj.source = 'multirate.cc'
obj = bld.create_ns3_program('wifi-multirate', ['wifi', 'flow-monitor', 'olsr', 'applications'])
obj.source = 'wifi-multirate.cc'
obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'wifi'])
obj.source = 'wifi-simple-adhoc.cc'
@@ -38,26 +38,26 @@ def build(bld):
obj = bld.create_ns3_program('wifi-blockack', ['wifi', 'applications'])
obj.source = 'wifi-blockack.cc'
obj = bld.create_ns3_program('dsss-validation', ['wifi'])
obj.source = 'dsss-validation.cc'
obj = bld.create_ns3_program('wifi-dsss-validation', ['wifi'])
obj.source = 'wifi-dsss-validation.cc'
obj = bld.create_ns3_program('ofdm-validation', ['wifi'])
obj.source = 'ofdm-validation.cc'
obj = bld.create_ns3_program('wifi-ofdm-validation', ['wifi'])
obj.source = 'wifi-ofdm-validation.cc'
obj = bld.create_ns3_program('ofdm-ht-validation', ['wifi'])
obj.source = 'ofdm-ht-validation.cc'
obj = bld.create_ns3_program('wifi-ofdm-ht-validation', ['wifi'])
obj.source = 'wifi-ofdm-ht-validation.cc'
obj = bld.create_ns3_program('ofdm-vht-validation', ['wifi'])
obj.source = 'ofdm-vht-validation.cc'
obj = bld.create_ns3_program('wifi-ofdm-vht-validation', ['wifi'])
obj.source = 'wifi-ofdm-vht-validation.cc'
obj = bld.create_ns3_program('wifi-hidden-terminal', ['wifi', 'applications', 'flow-monitor'])
obj.source = 'wifi-hidden-terminal.cc'
obj = bld.create_ns3_program('ht-wifi-network', ['wifi', 'applications'])
obj.source = 'ht-wifi-network.cc'
obj = bld.create_ns3_program('wifi-ht-network', ['wifi', 'applications'])
obj.source = 'wifi-ht-network.cc'
obj = bld.create_ns3_program('vht-wifi-network', ['wifi', 'applications'])
obj.source = 'vht-wifi-network.cc'
obj = bld.create_ns3_program('wifi-vht-network', ['wifi', 'applications'])
obj.source = 'wifi-vht-network.cc'
obj = bld.create_ns3_program('wifi-timing-attributes', ['wifi', 'applications'])
obj.source = 'wifi-timing-attributes.cc'
@@ -65,14 +65,14 @@ def build(bld):
obj = bld.create_ns3_program('wifi-sleep', ['wifi', 'applications'])
obj.source = 'wifi-sleep.cc'
obj = bld.create_ns3_program('power-adaptation-distance', ['wifi', 'applications'])
obj.source = 'power-adaptation-distance.cc'
obj = bld.create_ns3_program('wifi-power-adaptation-distance', ['wifi', 'applications'])
obj.source = 'wifi-power-adaptation-distance.cc'
obj = bld.create_ns3_program('power-adaptation-interference', ['wifi', 'applications', 'flow-monitor'])
obj.source = 'power-adaptation-interference.cc'
obj = bld.create_ns3_program('wifi-power-adaptation-interference', ['wifi', 'applications', 'flow-monitor'])
obj.source = 'wifi-power-adaptation-interference.cc'
obj = bld.create_ns3_program('rate-adaptation-distance', ['wifi', 'applications'])
obj.source = 'rate-adaptation-distance.cc'
obj = bld.create_ns3_program('wifi-rate-adaptation-distance', ['wifi', 'applications'])
obj.source = 'wifi-rate-adaptation-distance.cc'
obj = bld.create_ns3_program('wifi-aggregation', ['wifi', 'applications'])
obj.source = 'wifi-aggregation.cc'
@@ -80,20 +80,20 @@ def build(bld):
obj = bld.create_ns3_program('wifi-txop-aggregation', ['wifi', 'applications'])
obj.source = 'wifi-txop-aggregation.cc'
obj = bld.create_ns3_program('simple-ht-hidden-stations', ['wifi', 'applications'])
obj.source = 'simple-ht-hidden-stations.cc'
obj = bld.create_ns3_program('wifi-simple-ht-hidden-stations', ['wifi', 'applications'])
obj.source = 'wifi-simple-ht-hidden-stations.cc'
obj = bld.create_ns3_program('80211n-mimo', ['wifi', 'applications'])
obj.source = '80211n-mimo.cc'
obj = bld.create_ns3_program('wifi-80211n-mimo', ['wifi', 'applications'])
obj.source = 'wifi-80211n-mimo.cc'
obj = bld.create_ns3_program('mixed-network', ['wifi', 'applications'])
obj.source = 'mixed-network.cc'
obj = bld.create_ns3_program('wifi-mixed-network', ['wifi', 'applications'])
obj.source = 'wifi-mixed-network.cc'
obj = bld.create_ns3_program('wifi-tcp', ['wifi', 'applications'])
obj.source = 'wifi-tcp.cc'
obj = bld.create_ns3_program('80211e-txop', ['wifi', 'applications'])
obj.source = '80211e-txop.cc'
obj = bld.create_ns3_program('wifi-80211e-txop', ['wifi', 'applications'])
obj.source = 'wifi-80211e-txop.cc'
obj = bld.create_ns3_program('wifi-spectrum-per-example', ['wifi', 'applications'])
obj.source = 'wifi-spectrum-per-example.cc'
@@ -104,11 +104,11 @@ def build(bld):
obj = bld.create_ns3_program('wifi-spectrum-saturation-example', ['wifi', 'applications'])
obj.source = 'wifi-spectrum-saturation-example.cc'
obj = bld.create_ns3_program('ofdm-he-validation', ['wifi'])
obj.source = 'ofdm-he-validation.cc'
obj = bld.create_ns3_program('wifi-ofdm-he-validation', ['wifi'])
obj.source = 'wifi-ofdm-he-validation.cc'
obj = bld.create_ns3_program('he-wifi-network', ['wifi', 'applications'])
obj.source = 'he-wifi-network.cc'
obj = bld.create_ns3_program('wifi-he-network', ['wifi', 'applications'])
obj.source = 'wifi-he-network.cc'
obj = bld.create_ns3_program('wifi-multi-tos', ['wifi', 'applications'])
obj.source = 'wifi-multi-tos.cc'

2
src/test/ns3wifi/wifi-ac-mapping-test-suite.cc
View File

@@ -250,7 +250,7 @@ public:
};
WifiAcMappingTestSuite::WifiAcMappingTestSuite ()
: TestSuite ("ns3-wifi-ac-mapping", SYSTEM)
: TestSuite ("wifi-ac-mapping", SYSTEM)
{
AddTestCase (new WifiAcMappingTest (0xb8, 2), TestCase::QUICK); // EF in AC_VI
AddTestCase (new WifiAcMappingTest (0x28, 1), TestCase::QUICK); // AF11 in AC_BK

2
src/test/ns3wifi/wifi-interference-test-suite.cc
View File

@@ -295,7 +295,7 @@ public:
};
WifiInterferenceTestSuite::WifiInterferenceTestSuite ()
: TestSuite ("ns3-wifi-interference", UNIT)
: TestSuite ("wifi-interference", UNIT)
{
AddTestCase (new WifiInterferenceTestCase, TestCase::QUICK);
}

2
src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc
View File

@@ -191,7 +191,7 @@ public:
};
WifiMsduAggregatorTestSuite::WifiMsduAggregatorTestSuite ()
: TestSuite ("ns3-wifi-msdu-aggregator", SYSTEM)
: TestSuite ("wifi-msdu-aggregator", SYSTEM)
{
AddTestCase (new WifiMsduAggregatorThroughputTest, TestCase::QUICK);
}

6
src/wifi/doc/source/wifi-testing.rst
View File

@@ -41,7 +41,7 @@ Figure :ref:`fig-clear-channel-80211b`.
Validation results for the 802.11a/g OFDM error model are available in this
`technical report <https://www.nsnam.org/~pei/80211ofdm.pdf>`__. The curves
can be reproduced by running the ``ofdm-validation.cc`` example program
can be reproduced by running the ``wifi-ofdm-validation.cc`` example program
in the ``examples/wireless`` directory, and the figure is reproduced below
in Figure :ref:`fig-nist-frame-success-rate`.
@@ -52,8 +52,8 @@ in Figure :ref:`fig-nist-frame-success-rate`.
Frame error rate (NIST model) for 802.11a/g (OFDM) Wi-Fi
Similar curves for 802.11n/ac/ax can be obtained by running the ``ofdm-ht-validation.cc``,
``ofdm-vht-validation.cc`` and ``ofdm-he-validation.cc`` example programs
Similar curves for 802.11n/ac/ax can be obtained by running the ``wifi-ofdm-ht-validation.cc``,
``wifi-ofdm-vht-validation.cc`` and ``wifi-ofdm-he-validation.cc`` example programs
in the ``examples/wireless`` directory, and the figures are reproduced below
in Figure :ref:`fig-nist-frame-success-rate-n`, Figure :ref:`fig-nist-frame-success-rate-ac`
and Figure :ref:`fig-nist-frame-success-rate-ax`, respectively.

0
src/wifi/examples/test-interference-helper.cc → src/wifi/examples/wifi-test-interference-helper.cc
View File

4
src/wifi/examples/wscript
View File

@@ -8,9 +8,9 @@ def build(bld):
['wifi'])
obj.source = 'wifi-phy-test.cc'
obj = bld.create_ns3_program('test-interference-helper',
obj = bld.create_ns3_program('wifi-test-interference-helper',
['wifi'])
obj.source = 'test-interference-helper.cc'
obj.source = 'wifi-test-interference-helper.cc'
obj = bld.create_ns3_program('wifi-manager-example',
['wifi'])

2
src/wifi/test/channel-access-manager-test.cc
View File

@@ -938,7 +938,7 @@ public:
};
DcfTestSuite::DcfTestSuite ()
: TestSuite ("devices-wifi-dcf", UNIT)
: TestSuite ("wifi-devices-dcf", UNIT)
{
AddTestCase (new ChannelAccessManagerTest, TestCase::QUICK);
}

10
src/wifi/test/examples-to-run.py
View File

@@ -303,11 +303,11 @@ cpp_examples = [
("wifi-manager-example --wifiManager=Ideal --standard=802.11ax-2.4GHz --serverChannelWidth=40 --clientChannelWidth=40 --serverShortGuardInterval=800 --clientShortGuardInterval=800 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"),
("wifi-manager-example --wifiManager=Ideal --standard=802.11ax-2.4GHz --serverChannelWidth=40 --clientChannelWidth=40 --serverShortGuardInterval=1600 --clientShortGuardInterval=1600 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"),
("wifi-manager-example --wifiManager=Ideal --standard=802.11ax-2.4GHz --serverChannelWidth=40 --clientChannelWidth=40 --serverShortGuardInterval=3200 --clientShortGuardInterval=3200 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"),
("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=17 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=20 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=30 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("test-interference-helper --enableCapture=1 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=1", "True", "False"),
("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=17 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=20 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=30 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"),
("wifi-test-interference-helper --enableCapture=1 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=1", "True", "False"),
]
# A list of Python examples to run in order to ensure that they remain

2
src/wifi/test/power-rate-adaptation-test.cc
View File

@@ -1027,7 +1027,7 @@ public:
};
PowerRateAdaptationTestSuite::PowerRateAdaptationTestSuite ()
: TestSuite ("power-rate-adaptation-wifi", UNIT)
: TestSuite ("wifi-power-rate-adaptation", UNIT)
{
AddTestCase (new PowerRateAdaptationTest, TestCase::QUICK);
}

2
src/wifi/test/spectrum-wifi-phy-test.cc
View File

@@ -326,7 +326,7 @@ public:
};
SpectrumWifiPhyTestSuite::SpectrumWifiPhyTestSuite ()
: TestSuite ("spectrum-wifi-phy", UNIT)
: TestSuite ("wifi-spectrum-wifi-phy", UNIT)
{
AddTestCase (new SpectrumWifiPhyBasicTest, TestCase::QUICK);
AddTestCase (new SpectrumWifiPhyListenerTest, TestCase::QUICK);

2
src/wifi/test/tx-duration-test.cc
View File

@@ -439,7 +439,7 @@ public:
};
TxDurationTestSuite::TxDurationTestSuite ()
: TestSuite ("devices-wifi-tx-duration", UNIT)
: TestSuite ("wifi-devices-tx-duration", UNIT)
{
AddTestCase (new TxDurationTest, TestCase::QUICK);
}

2
src/wifi/test/wifi-aggregation-test.cc
View File

@@ -614,7 +614,7 @@ public:
};
WifiAggregationTestSuite::WifiAggregationTestSuite ()
: TestSuite ("aggregation-wifi", UNIT)
: TestSuite ("wifi-aggregation", UNIT)
{
AddTestCase (new AmpduAggregationTest, TestCase::QUICK);
AddTestCase (new TwoLevelAggregationTest, TestCase::QUICK);

2
src/wifi/test/wifi-test.cc
View File

@@ -2187,7 +2187,7 @@ public:
};
WifiTestSuite::WifiTestSuite ()
: TestSuite ("devices-wifi", UNIT)
: TestSuite ("wifi-devices", UNIT)
{
AddTestCase (new WifiTest, TestCase::QUICK);
AddTestCase (new QosUtilsIsOldPacketTest, TestCase::QUICK);