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

move lena-test to lte-test

Browse Source
This commit is contained in:
mrequena
2011-05-02 17:57:57 +02:00
parent 46466c4fc1 ee05e0a8e0
commit bdc53daee2
5 changed files with 84 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lte/test/lena-test-pf-ff-mac-scheduler.cc → src/lte/test/lte-test-pf-ff-mac-scheduler.cc
View File

@@ -70,23 +70,18 @@ using namespace ns3;
// }
/**
* Test 1.5 Proportional Fair (PF) MAC Scheduler
*/
LenaTest1_5Suite::LenaTest1_5Suite ()
: TestSuite ("lenaTest1.5", SYSTEM)
LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite ()
: TestSuite ("lteTestPfFfMacScheduler", SYSTEM)
{
SetVerbose (true);
NS_LOG_INFO ("creating LenaPfFfMacSchedulerTestCase");
AddTestCase (new LenaPfFfMacSchedulerTestCase);
}
static LenaTest1_5Suite lenaTest1_5Suite;
static LenaTestPfFfMacSchedulerSuite lenaTestPfFfMacSchedulerSuite;
LenaPfFfMacSchedulerTestCase::LenaPfFfMacSchedulerTestCase ()
: TestCase ("Round Robin (RR) Mac Scheduler Test Case")
: TestCase ("Proportional Fair (PF) Mac Scheduler Test Case")
{
}
@@ -131,8 +126,8 @@ LenaPfFfMacSchedulerTestCase::DoRun (void)
*/
SetVerbose (true);
LenaHelper lena;
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;
NodeContainer ueNodes;
@@ -149,17 +144,17 @@ LenaPfFfMacSchedulerTestCase::DoRun (void)
// Create Devices and install them in the Nodes (eNB and UE)
NetDeviceContainer enbDevs;
NetDeviceContainer ueDevs;
lena.SetSchedulerType ("ns3::PfFfMacScheduler");
enbDevs = lena.InstallEnbDevice (enbNodes);
ueDevs = lena.InstallUeDevice (ueNodes);
lena->SetSchedulerType ("ns3::PfFfMacScheduler");
enbDevs = lena->InstallEnbDevice (enbNodes);
ueDevs = lena->InstallUeDevice (ueNodes);
// Attach a UE to a eNB
lena.Attach (ueDevs, enbDevs.Get (0));
lena->Attach (ueDevs, enbDevs.Get (0));
// Activate an EPS bearer
enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
EpsBearer bearer (q);
lena.ActivateEpsBearer (ueDevs, bearer);
lena->ActivateEpsBearer (ueDevs, bearer);
Simulator::Stop (Seconds (0.005));
@@ -181,7 +176,7 @@ LenaPfFfMacSchedulerTestCase::DoRun (void)
NS_LOG_INFO ("User 1 Rx Data: " << rlcStats->GetDlRxData (1,1));
NS_LOG_INFO ("User 2 Rx Data: " << rlcStats->GetDlRxData (2,1));
NS_TEST_ASSERT_MSG_EQ_TOL (rlcStats->GetDlRxData (1,1), rlcStats->GetDlRxData (2,1), 0.01, " Unfair Throughput!");
NS_TEST_ASSERT_MSG_EQ_TOL (rlcStats->GetDlRxData (1,1), rlcStats->GetDlRxData (2,1), 100, " Unfair Throughput!");
//NS_TEST_ASSERT_MSG_EQ_TOL (calculatedSinr, theoreticalSinr, 0.000001, "Wrong SINR !");
}

14
src/lte/test/lena-test-pf-ff-mac-scheduler.h → src/lte/test/lte-test-pf-ff-mac-scheduler.h
View File

@@ -29,8 +29,14 @@ using namespace ns3;
/**
* Test 1.5 Proportional Fair MAC Scheduler
*/
* This system test program creates different test cases with a single eNB and
* several UEs, all having the same Radio Bearer specification. In each test
* case, the UEs see the same SINR from the eNB; different test cases are
* implemented obtained by using different SINR values and different numbers of
* UEs. The test consists on checking that the obtained throughput performance
* is equal among users is consistent with the definition of proportional
* fair scheduling
*/
class LenaPfFfMacSchedulerTestCase : public TestCase
{
public:
@@ -43,10 +49,10 @@ class LenaPfFfMacSchedulerTestCase : public TestCase
class LenaTest1_5Suite : public TestSuite
class LenaTestPfFfMacSchedulerSuite : public TestSuite
{
public:
LenaTest1_5Suite ();
LenaTestPfFfMacSchedulerSuite ();
};

109
src/lte/test/lena-test-rr-ff-mac-scheduler.cc → src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -41,49 +41,46 @@ NS_LOG_COMPONENT_DEFINE ("LenaTestRrFfMacCheduler");
using namespace ns3;
// void
// UlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize)
// {
// rlcStats->UlTxPdu(rnti, lcid, packetSize);
// }
//
// void
// UlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
// {
// rlcStats->UlRxPdu(rnti, lcid, packetSize, delay);
// }
//
// void
// DlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize)
// {
// rlcStats->DlTxPdu(rnti, lcid, packetSize);
// }
//
// void
// DlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
// uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
// {
// rlcStats->DlRxPdu(rnti, lcid, packetSize, delay);
// }
void
UlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
rlcStats->UlTxPdu(rnti, lcid, packetSize);
}
void
UlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
rlcStats->UlRxPdu(rnti, lcid, packetSize, delay);
}
void
DlTxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize)
{
rlcStats->DlTxPdu(rnti, lcid, packetSize);
}
void
DlRxPduCallback(Ptr<RlcStatsCalculator> rlcStats, std::string path,
uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
{
rlcStats->DlRxPdu(rnti, lcid, packetSize, delay);
}
/**
* Test 1.4 Round Robin (RR) MAC Scheduler
*/
LenaTest1_4Suite::LenaTest1_4Suite ()
: TestSuite ("lenaTest1.4", SYSTEM)
LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite ()
: TestSuite ("lteTestRrFfMacScheduler", SYSTEM)
{
SetVerbose (true);
NS_LOG_INFO ("creating LenaRrFfMacSchedulerTestCase");
AddTestCase (new LenaRrFfMacSchedulerTestCase);
}
static LenaTest1_4Suite lenaTest1_4Suite;
static LenaTestRrFfMacSchedulerSuite lenaTestRrFfMacSchedulerSuite;
LenaRrFfMacSchedulerTestCase::LenaRrFfMacSchedulerTestCase ()
: TestCase ("Round Robin (RR) Mac Scheduler Test Case")
@@ -123,8 +120,9 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
LogComponentEnable ("LteUeNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("LteEnbNetDevice", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestSinrChunkProcessor", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTest", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
/**
* Initialize Simulation Scenario: 1 eNB and 2 UEs
@@ -132,7 +130,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
SetVerbose (true);
LenaHelper lena;
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;
NodeContainer ueNodes;
@@ -149,22 +147,31 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
// Create Devices and install them in the Nodes (eNB and UE)
NetDeviceContainer enbDevs;
NetDeviceContainer ueDevs;
lena.SetSchedulerType ("ns3::RrFfMacScheduler");
enbDevs = lena.InstallEnbDevice (enbNodes);
ueDevs = lena.InstallUeDevice (ueNodes);
lena->SetSchedulerType ("ns3::RrFfMacScheduler");
enbDevs = lena->InstallEnbDevice (enbNodes);
ueDevs = lena->InstallUeDevice (ueNodes);
// Attach a UE to a eNB
lena.Attach (ueDevs, enbDevs.Get (0));
lena->Attach (ueDevs, enbDevs.Get (0));
// Activate an EPS bearer
enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
EpsBearer bearer (q);
lena.ActivateEpsBearer (ueDevs, bearer);
lena->ActivateEpsBearer (ueDevs, bearer);
Simulator::Stop (Seconds (0.005));
Simulator::Stop (Seconds (0.050));
Ptr<RlcStatsCalculator> rlcStats = CreateObject<RlcStatsCalculator> ();
Config::Connect("/NodeList/0/DeviceList/0/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/TxPDU",
MakeBoundCallback(&DlTxPduCallback, rlcStats));
Config::Connect("/NodeList/*/DeviceList/0/LteUeRrc/RlcMap/*/RxPDU",
MakeBoundCallback(&DlRxPduCallback, rlcStats));
Config::Connect("/NodeList/*/DeviceList/0/LteUeRrc/RlcMap/*/TxPDU",
MakeBoundCallback(&UlTxPduCallback, rlcStats));
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbRrc/UeMap/*/RadioBearerMap/*/LteRlc/RxPDU",
MakeBoundCallback(&UlRxPduCallback, rlcStats));
Simulator::Run ();
@@ -186,21 +193,3 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
//NS_TEST_ASSERT_MSG_EQ_TOL (calculatedSinr, theoreticalSinr, 0.000001, "Wrong SINR !");
}
// class LenaTest1_4Suite : public TestSuite
// {
// public:
// LenaTest1_4Suite ();
// };
//
// LenaTest1_4Suite::LenaTest1_4Suite ()
// : TestSuite ("lenaTest1.4", SYSTEM)
// {
// AddTestCase (new LenaRrFfMacSchedulerTestCase ());
// }
//
// static LenaTest1_4Suite lenaTest1_4Suite;

12
src/lte/test/lena-test-rr-ff-mac-scheduler.h → src/lte/test/lte-test-rr-ff-mac-scheduler.h
View File

@@ -29,7 +29,13 @@ using namespace ns3;
/**
* Test 1.4 Round Robin (RR) MAC Scheduler
* This system test program creates different test cases with a single eNB and
* several UEs, all having the same Radio Bearer specification. In each test
* case, the UEs see the same SINR from the eNB; different test cases are
* implemented obtained by using different SINR values and different numbers of
* UEs. The test consists on checking that the obtained throughput performance
* is equal among users and matches a reference throughput value within a given
* tolerance.
*/
class LenaRrFfMacSchedulerTestCase : public TestCase
{
@@ -43,10 +49,10 @@ class LenaRrFfMacSchedulerTestCase : public TestCase
class LenaTest1_4Suite : public TestSuite
class LenaTestRrFfMacSchedulerSuite : public TestSuite
{
public:
LenaTest1_4Suite ();
LenaTestRrFfMacSchedulerSuite ();
};

8
src/lte/wscript
View File

@@ -49,8 +49,8 @@ def build(bld):
'test/lte-test-downlink-sinr.cc',
'test/lte-test-uplink-sinr.cc',
'test/lte-test-sinr-chunk-processor.cc',
'test/lena-test-rr-ff-mac-scheduler.cc',
'test/lena-test-pf-ff-mac-scheduler.cc',
'test/lte-test-rr-ff-mac-scheduler.cc',
'test/lte-test-pf-ff-mac-scheduler.cc',
'test/lte-test-earfcn.cc',
]
@@ -103,8 +103,8 @@ def build(bld):
'test/lte-test-downlink-sinr.h',
'test/lte-test-uplink-sinr.h',
'test/lte-test-sinr-chunk-processor.h',
'test/lena-test-rr-ff-mac-scheduler.h',
'test/lena-test-pf-ff-mac-scheduler.h',
'test/lte-test-rr-ff-mac-scheduler.h',
'test/lte-test-pf-ff-mac-scheduler.h',
]
if (bld.env['ENABLE_EXAMPLES']):