From 10b43e833a68ff466b817cf4f443f1f7ae3e1b4e Mon Sep 17 00:00:00 2001
From: Zoraze Ali <zoraze.ali@cttc.es>
Date: Tue, 28 Nov 2017 10:36:04 +0100
Subject: [PATCH] lte: tests mac trace path update

---
 src/lte/test/lte-test-cqi-generation.cc  | 12 ++++++------
 src/lte/test/lte-test-interference.cc    |  8 ++++----
 src/lte/test/lte-test-link-adaptation.cc |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lte/test/lte-test-cqi-generation.cc b/src/lte/test/lte-test-cqi-generation.cc
index c12961cfa..f1c9cb218 100644
--- a/src/lte/test/lte-test-cqi-generation.cc
+++ b/src/lte/test/lte-test-cqi-generation.cc
@@ -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));
diff --git a/src/lte/test/lte-test-interference.cc b/src/lte/test/lte-test-interference.cc
index 91c8c926d..8caebda0c 100644
--- a/src/lte/test/lte-test-interference.cc
+++ b/src/lte/test/lte-test-interference.cc
@@ -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
diff --git a/src/lte/test/lte-test-link-adaptation.cc b/src/lte/test/lte-test-link-adaptation.cc
index c40b6d35f..f5d2546fa 100644
--- a/src/lte/test/lte-test-link-adaptation.cc
+++ b/src/lte/test/lte-test-link-adaptation.cc
@@ -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));