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

lte: tests mac trace path update

Browse Source
This commit is contained in:
Zoraze Ali
2017-11-28 10:36:04 +01:00
parent 0b2602efce
commit 10b43e833a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lte/test/lte-test-cqi-generation.cc
View File

@@ -218,16 +218,16 @@ LteCqiGenerationTestCase::DoRun (void)
lteHelper->ActivateDataRadioBearer (ueDevs1, bearer);
lteHelper->ActivateDataRadioBearer (ueDevs2, bearer);
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback, this));
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/UlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/UlScheduling",
MakeBoundCallback (&LteTestUlSchedulingCallback, this));
Config::Connect ("/NodeList/1/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/1/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback, this));
Config::Connect ("/NodeList/1/DeviceList/0/LteEnbMac/UlScheduling",
Config::Connect ("/NodeList/1/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/UlScheduling",
MakeBoundCallback (&LteTestUlSchedulingCallback, this));
Simulator::Stop (Seconds (1.100));
@@ -358,10 +358,10 @@ LteCqiGenerationDlPowerControlTestCase::DoRun (void)
simpleFfrAlgorithmEnb1->SetPdschConfigDedicated (pdschConfigDedicatedEnb1);
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback2, this));
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/UlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/UlScheduling",
MakeBoundCallback (&LteTestUlSchedulingCallback2, this));
Simulator::Stop (Seconds (1.100));

8
src/lte/test/lte-test-interference.cc
View File

@@ -188,10 +188,10 @@ LteInterferenceTestCase::DoRun (void)
testUlSinr1->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr1Catcher));
enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr1);
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback, this));
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/UlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/UlScheduling",
MakeBoundCallback (&LteTestUlSchedulingCallback, this));
@@ -209,10 +209,10 @@ LteInterferenceTestCase::DoRun (void)
testUlSinr2->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &ulSinr2Catcher));
enb1phy->GetUplinkSpectrumPhy ()->AddDataSinrChunkProcessor (testUlSinr2);
Config::Connect ("/NodeList/1/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/1/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback, this));
Config::Connect ("/NodeList/1/DeviceList/0/LteEnbMac/UlScheduling",
Config::Connect ("/NodeList/1/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/UlScheduling",
MakeBoundCallback (&LteTestUlSchedulingCallback, this));
// need to allow for RRC connection establishment + SRS

2
src/lte/test/lte-test-link-adaptation.cc
View File

@@ -211,7 +211,7 @@ LteLinkAdaptationTestCase::DoRun (void)
testSinr->AddCallback (MakeCallback (&LteSpectrumValueCatcher::ReportValue, &sinrCatcher));
uePhy->GetDownlinkSpectrumPhy ()->AddCtrlSinrChunkProcessor (testSinr);
Config::Connect ("/NodeList/0/DeviceList/0/LteEnbMac/DlScheduling",
Config::Connect ("/NodeList/0/DeviceList/0/ComponentCarrierMap/*/LteEnbMac/DlScheduling",
MakeBoundCallback (&LteTestDlSchedulingCallback, this));
Simulator::Stop (Seconds (0.040));