From 7eae055bdfe5de9c286d77b29a338bbcdadb76d9 Mon Sep 17 00:00:00 2001
From: Biljana Bojovic <biljana.bojovic@gmail.com>
Date: Fri, 10 Mar 2017 02:40:42 +0100
Subject: [PATCH] lte: (fixes #2666) remove deprecated variables/config paths
 (thanks to Hongyu Deng)

---
 src/lte/helper/lte-helper.cc        |  1 -
 src/lte/model/lte-enb-net-device.cc | 15 ---------------
 src/lte/model/lte-enb-net-device.h  |  6 ------
 src/lte/model/lte-ue-net-device.cc  | 10 ----------
 src/lte/model/lte-ue-net-device.h   |  2 --
 src/lte/test/lte-test-mimo.cc       |  2 +-
 6 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc
index 1433f1c42..b0bce71be 100644
--- a/src/lte/helper/lte-helper.cc
+++ b/src/lte/helper/lte-helper.cc
@@ -706,7 +706,6 @@ LteHelper::InstallSingleEnbDevice (Ptr<Node> n)
   dev->SetAttribute ("LteEnbComponentCarrierManager", PointerValue (ccmEnbManager));
   dev->SetCcMap (ccMap);
   std::map<uint8_t,Ptr<ComponentCarrierEnb> >::iterator it = ccMap.begin ();
-  dev->SetAttribute ("FfMacScheduler", PointerValue (it->second->GetFfMacScheduler ()));
   dev->SetAttribute ("LteEnbRrc", PointerValue (rrc)); 
   dev->SetAttribute ("LteHandoverAlgorithm", PointerValue (handoverAlgorithm));
   dev->SetAttribute ("LteFfrAlgorithm", PointerValue (it->second->GetFfrAlgorithm ()));
diff --git a/src/lte/model/lte-enb-net-device.cc b/src/lte/model/lte-enb-net-device.cc
index f3633486b..13e2f33c5 100644
--- a/src/lte/model/lte-enb-net-device.cc
+++ b/src/lte/model/lte-enb-net-device.cc
@@ -82,21 +82,6 @@ TypeId LteEnbNetDevice::GetTypeId (void)
                    PointerValue (),
                    MakePointerAccessor (&LteEnbNetDevice::m_ffrAlgorithm),
                    MakePointerChecker <LteFfrAlgorithm> ())
-    .AddAttribute ("LteEnbMac",
-                   "The MAC associated to this EnbNetDevice",
-                   PointerValue (),
-                   MakePointerAccessor (&LteEnbNetDevice::m_mac),
-                   MakePointerChecker <LteEnbMac> ())
-    .AddAttribute ("FfMacScheduler",
-                   "The scheduler associated to this EnbNetDevice",
-                   PointerValue (),
-                   MakePointerAccessor (&LteEnbNetDevice::m_scheduler),
-                   MakePointerChecker <FfMacScheduler> ())
-    .AddAttribute ("LteEnbPhy",
-                   "The PHY associated to this EnbNetDevice",
-                   PointerValue (),
-                   MakePointerAccessor (&LteEnbNetDevice::m_phy),
-                   MakePointerChecker <LteEnbPhy> ())
     .AddAttribute ("LteEnbComponentCarrierManager",
                    "The RRC associated to this EnbNetDevice",
                    PointerValue (),
diff --git a/src/lte/model/lte-enb-net-device.h b/src/lte/model/lte-enb-net-device.h
index ad643b9ec..30d768c52 100644
--- a/src/lte/model/lte-enb-net-device.h
+++ b/src/lte/model/lte-enb-net-device.h
@@ -228,14 +228,8 @@ private:
    */
   void UpdateConfig ();
 
-  Ptr<LteEnbMac> m_mac; /**< DEPRECATED - It is maintained for backward compatibility after adding CA feature*/
-
-  Ptr<LteEnbPhy> m_phy; /**< DEPRECATED - It is maintained for backward compatibility after adding CA feature*/
-
   Ptr<LteEnbRrc> m_rrc; ///< the RRC
 
-  Ptr<FfMacScheduler> m_scheduler; /**< DEPRECATED - It is maintained for backward compatibility after adding CA feature*/
-
   Ptr<LteHandoverAlgorithm> m_handoverAlgorithm; ///< the handover algorithm
  
   Ptr<LteAnr> m_anr; ///< ANR
diff --git a/src/lte/model/lte-ue-net-device.cc b/src/lte/model/lte-ue-net-device.cc
index e9626cd03..806f451b6 100644
--- a/src/lte/model/lte-ue-net-device.cc
+++ b/src/lte/model/lte-ue-net-device.cc
@@ -74,16 +74,6 @@ TypeId LteUeNetDevice::GetTypeId (void)
                    PointerValue (),
                    MakePointerAccessor (&LteUeNetDevice::m_rrc),
                    MakePointerChecker <LteUeRrc> ())
-    .AddAttribute ("LteUeMac",
-                   "The MAC associated to this UeNetDevice",
-                   PointerValue (),
-                   MakePointerAccessor (&LteUeNetDevice::m_mac),
-                   MakePointerChecker <LteUeMac> ())
-    .AddAttribute ("LteUePhy",
-                   "The PHY associated to this UeNetDevice",
-                   PointerValue (),
-                   MakePointerAccessor (&LteUeNetDevice::m_phy),
-                   MakePointerChecker <LteUePhy> ())
     .AddAttribute ("LteUeComponentCarrierManager",
                    "The ComponentCarrierManager associated to this UeNetDevice",
                    PointerValue (),
diff --git a/src/lte/model/lte-ue-net-device.h b/src/lte/model/lte-ue-net-device.h
index 0b6e08c0a..68737843b 100644
--- a/src/lte/model/lte-ue-net-device.h
+++ b/src/lte/model/lte-ue-net-device.h
@@ -190,8 +190,6 @@ private:
 
   Ptr<LteEnbNetDevice> m_targetEnb; ///< target ENB
 
-  Ptr<LteUeMac> m_mac; ///< the MAC
-  Ptr<LteUePhy> m_phy; ///< the Phy
   Ptr<LteUeRrc> m_rrc; ///< the RRC
   Ptr<EpcUeNas> m_nas; ///< the NAS
   Ptr<LteUeComponentCarrierManager> m_componentCarrierManager; ///< the component carrier manager
diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc
index 5354c6929..81e6579fa 100644
--- a/src/lte/test/lte-test-mimo.cc
+++ b/src/lte/test/lte-test-mimo.cc
@@ -198,7 +198,7 @@ LenaMimoTestCase::DoRun (void)
   Ptr<LteEnbNetDevice> enbNetDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
   
   PointerValue ptrval;
-  enbNetDev->GetAttribute ("FfMacScheduler", ptrval);
+  enbNetDev->GetCcMap()[0]->GetAttribute ("FfMacScheduler", ptrval);
   Ptr<PfFfMacScheduler> pfsched;
   Ptr<RrFfMacScheduler> rrsched;
   if (m_schedulerType.compare ("ns3::RrFfMacScheduler") == 0)