src: move c++/ned files, adjust includes/imports

So that simple module NED and C++ class impl are in the same directory.
Unipisa · Jan 23, 2025 · 395c9fe · 395c9fe
1 parent 7dc6366
commit 395c9fe
Show file tree

Hide file tree

Showing 123 changed files with 164 additions and 161 deletions.
diff --git a/src/apps/d2dMultihop/MultihopD2D.cc b/src/apps/d2dMultihop/MultihopD2D.cc
@@ -18,7 +18,7 @@
 
 #include "apps/d2dMultihop/MultihopD2D.h"
 #include "apps/d2dMultihop/TrickleTimerMsg_m.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 

diff --git a/src/apps/d2dMultihop/MultihopD2D.h b/src/apps/d2dMultihop/MultihopD2D.h
@@ -20,8 +20,8 @@
 #include "apps/d2dMultihop/MultihopD2DPacket_m.h"
 #include "apps/d2dMultihop/statistics/MultihopD2DStatistics.h"
 #include "apps/d2dMultihop/eventGenerator/EventGenerator.h"
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 

diff --git a/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc b/src/apps/d2dMultihop/eventGenerator/EventGenerator.cc
@@ -11,7 +11,7 @@
 
 #include "apps/d2dMultihop/eventGenerator/EventGenerator.h"
 #include "common/LteCommon.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 

diff --git a/src/apps/d2dMultihop/eventGenerator/EventGenerator.h b/src/apps/d2dMultihop/eventGenerator/EventGenerator.h
@@ -18,7 +18,7 @@
 
 #include "apps/d2dMultihop/MultihopD2D.h"
 #include "common/binder/Binder.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 

diff --git a/src/apps/mecRequestResponseApp/MecRequestApp.h b/src/apps/mecRequestResponseApp/MecRequestApp.h
@@ -19,7 +19,7 @@
 
 #include "apps/mecRequestResponseApp/packets/MecRequestResponsePacket_m.h"
 #include "apps/mecRequestResponseApp/packets/MigrationTimer_m.h"
-#include "stack/phy/layer/NRPhyUe.h"
+#include "stack/phy/NRPhyUe.h"
 
 namespace simu5g {
 

diff --git a/src/common/LteCommon.cc b/src/common/LteCommon.cc
@@ -20,7 +20,7 @@
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
 #include "corenetwork/trafficFlowFilter/TftControlInfo_m.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "x2/packet/X2ControlInfo_m.h"
 
 namespace simu5g {

diff --git a/src/common/binder/Binder.cc b/src/common/binder/Binder.cc
@@ -17,8 +17,8 @@
 #include "common/binder/Binder.h"
 #include "corenetwork/statsCollector/BaseStationStatsCollector.h"
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacUe.h"
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/mac/LteMacUe.h"
+#include "stack/phy/LtePhyUe.h"
 
 namespace simu5g {
 

diff --git a/src/common/binder/Binder.h b/src/common/binder/Binder.h
@@ -22,7 +22,7 @@
 #include "common/LteCommon.h"
 #include "common/blerCurves/PhyPisaData.h"
 #include "nodes/ExtCell.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 
 namespace simu5g {
 

diff --git a/src/corenetwork/statsCollector/BaseStationStatsCollector.cc b/src/corenetwork/statsCollector/BaseStationStatsCollector.cc
@@ -12,9 +12,7 @@
 #include "corenetwork/statsCollector/BaseStationStatsCollector.h"
 #include "corenetwork/statsCollector/UeStatsCollector.h"
 #include "stack/packetFlowManager/PacketFlowManagerEnb.h"
-#include "stack/rlc/um/LteRlcUm.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include <string>
 
 namespace simu5g {

diff --git a/src/corenetwork/statsCollector/BaseStationStatsCollector.h b/src/corenetwork/statsCollector/BaseStationStatsCollector.h
@@ -21,8 +21,8 @@
 #include <map>
 #include "corenetwork/statsCollector/L2Measures/L2MeasBase.h"
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 #include "stack/rlc/um/LteRlcUm.h"
 #include "stack/packetFlowManager/PacketFlowManagerEnb.h"
 

diff --git a/src/corenetwork/statsCollector/UeStatsCollector.cc b/src/corenetwork/statsCollector/UeStatsCollector.cc
@@ -13,9 +13,9 @@
 #include <inet/networklayer/common/NetworkInterface.h>
 
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/packetFlowManager/PacketFlowManagerUe.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 

diff --git a/src/corenetwork/statsCollector/UeStatsCollector.h b/src/corenetwork/statsCollector/UeStatsCollector.h
@@ -20,9 +20,9 @@
 #include "corenetwork/statsCollector/L2Measures/L2MeasBase.h"
 #include <string>
 #include "corenetwork/statsCollector/UeStatsCollector.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/packetFlowManager/PacketFlowManagerUe.h"
-// #include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+// #include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 

diff --git a/src/nodes/backgroundCell/BackgroundCellChannelModel.cc b/src/nodes/backgroundCell/BackgroundCellChannelModel.cc
@@ -11,8 +11,8 @@
 
 #include "nodes/backgroundCell/BackgroundCellChannelModel.h"
 #include "nodes/backgroundCell/BackgroundScheduler.h"
-#include "stack/phy/layer/LtePhyBase.h"
-#include "stack/phy/layer/LtePhyUe.h"
+#include "stack/phy/LtePhyBase.h"
+#include "stack/phy/LtePhyUe.h"
 #include "stack/phy/ChannelModel/LteRealisticChannelModel.h"
 
 namespace simu5g {

diff --git a/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc b/src/nodes/backgroundCell/BackgroundCellTrafficManager.cc
@@ -14,8 +14,8 @@
 #include "nodes/backgroundCell/BackgroundCellAmc.h"
 #include "nodes/backgroundCell/BackgroundCellAmcNr.h"
 #include "stack/backgroundTrafficGenerator/ActiveUeNotification_m.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 #include "stack/phy/ChannelModel/LteChannelModel.h"
 
 namespace simu5g {

diff --git a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManager.h
@@ -18,8 +18,8 @@
 #include "common/blerCurves/PhyPisaData.h"
 #include "stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h"
 #include "stack/backgroundTrafficGenerator/generators/TrafficGeneratorBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h b/src/stack/backgroundTrafficGenerator/BackgroundTrafficManagerBase.h
@@ -18,8 +18,8 @@
 #include "common/blerCurves/PhyPisaData.h"
 #include "stack/backgroundTrafficGenerator/IBackgroundTrafficManager.h"
 #include "stack/backgroundTrafficGenerator/generators/TrafficGeneratorBase.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/phy/layer/LtePhyEnb.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/phy/LtePhyEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/compManager/LteCompManagerBase.h b/src/stack/compManager/LteCompManagerBase.h
@@ -13,7 +13,7 @@
 #define LTE_LTECOMPMANAGERBASE_H_
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "x2/packet/X2ControlInfo_m.h"
 #include "stack/compManager/X2CompMsg.h"

diff --git a/src/stack/d2dModeSelection/D2DModeSelectionBase.h b/src/stack/d2dModeSelection/D2DModeSelectionBase.h
@@ -14,7 +14,7 @@
 
 #include <inet/common/ModuleRefByPar.h>
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 

diff --git a/...lectionBestCqi/D2DModeSelectionBestCqi.cc → ...dModeSelection/D2DModeSelectionBestCqi.cc b/...lectionBestCqi/D2DModeSelectionBestCqi.cc → ...dModeSelection/D2DModeSelectionBestCqi.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/d2dModeSelection/d2dModeSelectionBestCqi/D2DModeSelectionBestCqi.h"
+#include "stack/d2dModeSelection/D2DModeSelectionBestCqi.h"
 
 namespace simu5g {
 

diff --git a/...electionBestCqi/D2DModeSelectionBestCqi.h → ...2dModeSelection/D2DModeSelectionBestCqi.h b/...electionBestCqi/D2DModeSelectionBestCqi.h → ...2dModeSelection/D2DModeSelectionBestCqi.h
diff --git a/src/stack/dualConnectivityManager/DualConnectivityManager.h b/src/stack/dualConnectivityManager/DualConnectivityManager.h
@@ -17,7 +17,7 @@
 #include "common/LteCommon.h"
 #include "x2/packet/X2ControlInfo_m.h"
 #include "stack/dualConnectivityManager/X2DualConnectivityDataMsg.h"
-#include "stack/pdcp_rrc/layer/LtePdcpRrc.h"
+#include "stack/pdcp_rrc/LtePdcpRrc.h"
 
 namespace simu5g {
 

diff --git a/src/stack/ip2nic/IP2Nic.cc b/src/stack/ip2nic/IP2Nic.cc
@@ -28,7 +28,7 @@
 #include <inet/linklayer/common/InterfaceTag_m.h>
 
 #include "stack/ip2nic/IP2Nic.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
 

diff --git a/src/stack/mac/layer/LteMacBase.cc → src/stack/mac/LteMacBase.cc b/src/stack/mac/layer/LteMacBase.cc → src/stack/mac/LteMacBase.cc
@@ -12,7 +12,7 @@
 #include "common/LteControlInfo.h"
 #include "common/binder/Binder.h"
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/mac/buffer/harq/LteHarqBufferTx.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferRxD2D.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
@@ -23,7 +23,7 @@
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "assert.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/layer/LteMacBase.h → src/stack/mac/LteMacBase.h b/src/stack/mac/layer/LteMacBase.h → src/stack/mac/LteMacBase.h
diff --git a/src/stack/mac/layer/LteMacEnb.cc → src/stack/mac/LteMacEnb.cc b/src/stack/mac/layer/LteMacEnb.cc → src/stack/mac/LteMacEnb.cc
@@ -15,8 +15,8 @@
 #include <inet/common/TimeTag_m.h>
 
 #include "common/LteCommon.h"
-#include "stack/mac/layer/LteMacEnb.h"
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacEnb.h"
+#include "stack/mac/LteMacUe.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "stack/mac/buffer/LteMacQueue.h"
@@ -30,12 +30,12 @@
 #include "stack/mac/amc/UserTxParams.h"
 #include "stack/mac/packet/LteRac_m.h"
 #include "stack/mac/packet/LteMacSduRequest.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/rlc/packet/LteRlcDataPdu.h"
 #include "stack/rlc/am/packet/LteRlcAmPdu_m.h"
 #include "stack/packetFlowManager/PacketFlowManagerBase.h"
 #include "stack/rlc/um/LteRlcUm.h"
-#include "stack/pdcp_rrc/layer/NRPdcpRrcEnb.h"
+#include "stack/pdcp_rrc/NRPdcpRrcEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/layer/LteMacEnb.h → src/stack/mac/LteMacEnb.h b/src/stack/mac/layer/LteMacEnb.h → src/stack/mac/LteMacEnb.h
@@ -15,7 +15,7 @@
 #include <inet/common/ModuleRefByPar.h>
 
 #include "common/cellInfo/CellInfo.h"
-#include "stack/mac/layer/LteMacBase.h"
+#include "stack/mac/LteMacBase.h"
 #include "stack/mac/amc/LteAmc.h"
 #include "common/LteCommon.h"
 #include "stack/backgroundTrafficGenerator/IBackgroundTrafficManager.h"

diff --git a/src/stack/mac/layer/LteMacEnbD2D.cc → src/stack/mac/LteMacEnbD2D.cc b/src/stack/mac/layer/LteMacEnbD2D.cc → src/stack/mac/LteMacEnbD2D.cc
@@ -9,8 +9,8 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 #include "stack/phy/packet/LteFeedbackPkt.h"
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/amc/AmcPilotD2D.h"

diff --git a/src/stack/mac/layer/LteMacEnbD2D.h → src/stack/mac/LteMacEnbD2D.h b/src/stack/mac/layer/LteMacEnbD2D.h → src/stack/mac/LteMacEnbD2D.h
@@ -12,7 +12,7 @@
 #ifndef _LTE_LTEMACENBD2D_H_
 #define _LTE_LTEMACENBD2D_H_
 
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 #include "stack/mac/buffer/LteMacBuffer.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferMirrorD2D.h"
 #include "stack/d2dModeSelection/D2DModeSwitchNotification_m.h"

diff --git a/src/stack/mac/layer/LteMacUe.cc → src/stack/mac/LteMacUe.cc b/src/stack/mac/layer/LteMacUe.cc → src/stack/mac/LteMacUe.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacUe.h"
+#include "stack/mac/LteMacUe.h"
 
 #include <inet/networklayer/ipv4/Ipv4InterfaceData.h>
 

diff --git a/src/stack/mac/layer/LteMacUe.h → src/stack/mac/LteMacUe.h b/src/stack/mac/layer/LteMacUe.h → src/stack/mac/LteMacUe.h
@@ -12,8 +12,8 @@
 #ifndef _LTE_LTEMACUE_H_
 #define _LTE_LTEMACUE_H_
 
-#include "stack/mac/layer/LteMacBase.h"
-#include "stack/phy/layer/LtePhyBase.h"
+#include "stack/mac/LteMacBase.h"
+#include "stack/phy/LtePhyBase.h"
 #include "stack/mac/buffer/harq/LteHarqBufferTx.h"
 #include "stack/phy/feedback/LteFeedback.h"
 

diff --git a/src/stack/mac/layer/LteMacUeD2D.cc → src/stack/mac/LteMacUeD2D.cc b/src/stack/mac/layer/LteMacUeD2D.cc → src/stack/mac/LteMacUeD2D.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 
 #include "stack/mac/buffer/harq/LteHarqBufferRx.h"
 #include "stack/mac/buffer/LteMacQueue.h"

diff --git a/src/stack/mac/layer/LteMacUeD2D.h → src/stack/mac/LteMacUeD2D.h b/src/stack/mac/layer/LteMacUeD2D.h → src/stack/mac/LteMacUeD2D.h
@@ -12,8 +12,8 @@
 #ifndef _LTE_LTEMACUED2D_H_
 #define _LTE_LTEMACUED2D_H_
 
-#include "stack/mac/layer/LteMacUe.h"
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacUe.h"
+#include "stack/mac/LteMacEnbD2D.h"
 #include "stack/mac/buffer/harq_d2d/LteHarqBufferTxD2D.h"
 
 namespace simu5g {

diff --git a/src/stack/mac/layer/NRMacGnb.cc → src/stack/mac/NRMacGnb.cc b/src/stack/mac/layer/NRMacGnb.cc → src/stack/mac/NRMacGnb.cc
@@ -8,7 +8,7 @@
 // The above files and the present reference are part of the software itself,
 // and cannot be removed from it.
 //
-#include "stack/mac/layer/NRMacGnb.h"
+#include "stack/mac/NRMacGnb.h"
 #include "stack/mac/scheduler/NRSchedulerGnbUl.h"
 
 namespace simu5g {

diff --git a/src/stack/mac/layer/NRMacGnb.h → src/stack/mac/NRMacGnb.h b/src/stack/mac/layer/NRMacGnb.h → src/stack/mac/NRMacGnb.h
@@ -12,7 +12,7 @@
 #ifndef _NRMACGNB_H_
 #define _NRMACGNB_H_
 
-#include "stack/mac/layer/LteMacEnbD2D.h"
+#include "stack/mac/LteMacEnbD2D.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/layer/NRMacUe.cc → src/stack/mac/NRMacUe.cc b/src/stack/mac/layer/NRMacUe.cc → src/stack/mac/NRMacUe.cc
@@ -9,7 +9,7 @@
 // and cannot be removed from it.
 //
 
-#include "stack/mac/layer/NRMacUe.h"
+#include "stack/mac/NRMacUe.h"
 
 #include <inet/common/TimeTag_m.h>
 

diff --git a/src/stack/mac/layer/NRMacUe.h → src/stack/mac/NRMacUe.h b/src/stack/mac/layer/NRMacUe.h → src/stack/mac/NRMacUe.h
@@ -12,7 +12,7 @@
 #ifndef _NRMACUED2D_H_
 #define _NRMACUED2D_H_
 
-#include "stack/mac/layer/LteMacUeD2D.h"
+#include "stack/mac/LteMacUeD2D.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/allocator/LteAllocationModule.cc b/src/stack/mac/allocator/LteAllocationModule.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/allocator/LteAllocationModule.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/allocator/LteAllocationModule.h b/src/stack/mac/allocator/LteAllocationModule.h
@@ -15,7 +15,7 @@
 #include "common/LteCommon.h"
 #include "stack/mac/allocator/LteAllocatorUtils.h"
 
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc b/src/stack/mac/allocator/LteAllocationModuleFrequencyReuse.cc
@@ -10,7 +10,7 @@
 //
 
 #include "stack/mac/allocator/LteAllocationModuleFrequencyReuse.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 namespace simu5g {
 

diff --git a/src/stack/mac/amc/LteAmc.cc b/src/stack/mac/amc/LteAmc.cc
@@ -12,7 +12,7 @@
 #include <omnetpp.h>
 
 #include "stack/mac/amc/LteAmc.h"
-#include "stack/mac/layer/LteMacEnb.h"
+#include "stack/mac/LteMacEnb.h"
 
 // NOTE: AMC Pilots header file inclusions must go here
 #include "stack/mac/amc/AmcPilotAuto.h"