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

Update M1 scheduler test suites for working with new LenaHelper

Browse Source
This commit is contained in:
Marco Miozzo
2011-09-19 11:31:00 +02:00
parent 974c913c7c
commit 750cdb3df2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lte/test/lte-test-pf-ff-mac-scheduler.cc
View File

@@ -235,6 +235,8 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
SetVerbose (true);
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;
@@ -264,8 +266,6 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
EpsBearer bearer (q);
lena->ActivateEpsBearer (ueDevs, bearer);
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
enbPhy->SetAttribute ("TxPower", DoubleValue (30.0));
@@ -411,6 +411,8 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void)
SetVerbose (true);
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;
@@ -440,8 +442,6 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void)
EpsBearer bearer (q);
lena->ActivateEpsBearer (ueDevs, bearer);
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
enbPhy->SetAttribute ("TxPower", DoubleValue (30.0));

9
src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -56,6 +56,8 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite ()
NS_LOG_INFO ("creating LenaRrFfMacSchedulerTestCase");
AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
// DOWNLINK- DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 26 -> 2196 -> 2196000 bytes/sec
// 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
@@ -212,7 +214,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
// LogComponentEnable ("RrFfMacScheduler", LOG_LEVEL_ALL);
LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
// LogComponentEnable ("LteAmc", LOG_LEVEL_ALL);
// LogComponentEnable ("LenaHelper", LOG_LEVEL_ALL);
// LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
@@ -223,6 +225,8 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
SetVerbose (true);
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;
@@ -251,8 +255,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
EpsBearer bearer (q);
lena->ActivateEpsBearer (ueDevs, bearer);
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();