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

wifi: Cleanup invalid OFDMA PHY tests

Browse Source
This commit is contained in:
Sébastien Deronne
2022-09-27 21:37:08 +02:00
committed by Tom Henderson
parent 6b1c13a599
commit 6491f44169
1 changed files with 6 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/wifi/test/wifi-phy-ofdma-test.cc
View File

@@ -2941,8 +2941,6 @@ class TestUlOfdmaPhyTransmission : public TestCase
CHANNEL_WIDTH,
UL_LENGTH,
AID,
RU_TYPE,
MCS
};
TestUlOfdmaPhyTransmission();
@@ -3343,19 +3341,19 @@ TestUlOfdmaPhyTransmission::SetTrigVector(uint8_t bssColor, TrigVectorInfo error
HeRu::RuType ruType = HeRu::RU_106_TONE;
if (channelWidth == 20)
{
ruType = (error == RU_TYPE ? HeRu::RU_52_TONE : HeRu::RU_106_TONE);
ruType = HeRu::RU_106_TONE;
}
else if (channelWidth == 40)
{
ruType = (error == RU_TYPE ? HeRu::RU_106_TONE : HeRu::RU_242_TONE);
ruType = HeRu::RU_242_TONE;
}
else if (channelWidth == 80)
{
ruType = (error == RU_TYPE ? HeRu::RU_242_TONE : HeRu::RU_484_TONE);
ruType = HeRu::RU_484_TONE;
}
else if (channelWidth == 160)
{
ruType = (error == RU_TYPE ? HeRu::RU_484_TONE : HeRu::RU_996_TONE);
ruType = HeRu::RU_996_TONE;
}
else
{
@@ -3367,12 +3365,12 @@ TestUlOfdmaPhyTransmission::SetTrigVector(uint8_t bssColor, TrigVectorInfo error
HeRu::RuSpec ru1(ruType, 1, true);
txVector.SetRu(ru1, aid1);
txVector.SetMode((error == MCS ? HePhy::GetHeMcs5() : HePhy::GetHeMcs7()), aid1);
txVector.SetMode(HePhy::GetHeMcs7(), aid1);
txVector.SetNss(1, aid1);
HeRu::RuSpec ru2(ruType, (channelWidth == 160 ? 1 : 2), (channelWidth == 160 ? false : true));
txVector.SetRu(ru2, aid2);
txVector.SetMode((error == MCS ? HePhy::GetHeMcs5() : HePhy::GetHeMcs7()), aid2);
txVector.SetMode(HePhy::GetHeMcs7(), aid2);
txVector.SetNss(1, aid2);
uint16_t length;
@@ -4268,48 +4266,6 @@ TestUlOfdmaPhyTransmission::RunOne()
AID);
delay += Seconds(1.0);
//---------------------------------------------------------------------------
// Verify that HE TB PPDUs with RU type differing from TRIGVECTOR are discarded
Simulator::Schedule(delay,
&TestUlOfdmaPhyTransmission::LogScenario,
this,
"Dropping of HE TB PPDUs with RU type differing from TRIGVECTOR");
ScheduleTest(delay,
true,
WifiPhyState::IDLE,
0,
0,
0, // PSDU from STA 1 is not received (no TRIGVECTOR)
0,
0,
0, // PSDU from STA 2 is not received (no TRIGVECTOR)
true,
Seconds(0),
WifiPhyState::CCA_BUSY,
RU_TYPE);
delay += Seconds(1.0);
//---------------------------------------------------------------------------
// Verify that HE TB PPDUs with MCS differing from TRIGVECTOR are discarded
Simulator::Schedule(delay,
&TestUlOfdmaPhyTransmission::LogScenario,
this,
"Dropping of HE TB PPDUs with MCS differing from TRIGVECTOR");
ScheduleTest(delay,
true,
WifiPhyState::IDLE,
0,
0,
0, // PSDU from STA 1 is not received (no TRIGVECTOR)
0,
0,
0, // PSDU from STA 2 is not received (no TRIGVECTOR)
true,
Seconds(0),
WifiPhyState::CCA_BUSY,
MCS);
delay += Seconds(1.0);
//---------------------------------------------------------------------------
// Generate an interference on RU 1 and verify that only STA 1's solicited HE TB PPDU has been
// impacted