Skip to content

Commit 6051d74

Browse files
avargaavarga
committed
DualConnectivityManager: renamed to DcX2Forwarder
1 parent 743ac26 commit 6051d74

11 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎src/simu5g/stack/LteNicEnb.ned‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package simu5g.stack;
1414

1515
import simu5g.background.trafficGenerator.BackgroundTrafficGenerator;
1616
import simu5g.stack.compManager.ILteCompManager;
17-
import simu5g.stack.dualConnectivityManager.DualConnectivityManager;
17+
import simu5g.stack.dcX2Forwarder.DcX2Forwarder;
1818
import simu5g.stack.pdcp.DcMux;
1919
import simu5g.stack.handoverManager.LteHandoverManager;
2020
import simu5g.x2.LteX2Manager;
@@ -59,7 +59,7 @@ module LteNicEnb extends LteNicBase
5959
handoverManager: LteHandoverManager {
6060
@display("p=717,50;is=s");
6161
}
62-
dualConnectivityManager: DualConnectivityManager if dualConnectivityEnabled {
62+
dcX2Forwarder: DcX2Forwarder if dualConnectivityEnabled {
6363
@display("p=609,190;is=s");
6464
}
6565
bgTrafficGenerator[numCarriers]: BackgroundTrafficGenerator {
@@ -74,10 +74,10 @@ module LteNicEnb extends LteNicBase
7474
handoverManager.x2ManagerOut --> x2Manager.dataPortIn++;
7575
handoverManager.tunnelOut --> handoverPacketHolder.x2In;
7676
handoverPacketHolder.hoManagerOut --> handoverManager.dataIn;
77-
dualConnectivityManager.x2ManagerIn <-- x2Manager.dataPortOut++ if dualConnectivityEnabled;
78-
dualConnectivityManager.x2ManagerOut --> x2Manager.dataPortIn++ if dualConnectivityEnabled;
79-
pdcpDcMux.dcManagerOut --> dualConnectivityManager.dataIn if dualConnectivityEnabled;
80-
dualConnectivityManager.tunnelOut --> pdcpDcMux.dcManagerIn if dualConnectivityEnabled;
77+
dcX2Forwarder.x2ManagerIn <-- x2Manager.dataPortOut++ if dualConnectivityEnabled;
78+
dcX2Forwarder.x2ManagerOut --> x2Manager.dataPortIn++ if dualConnectivityEnabled;
79+
pdcpDcMux.dcManagerOut --> dcX2Forwarder.dataIn if dualConnectivityEnabled;
80+
dcX2Forwarder.tunnelOut --> pdcpDcMux.dcManagerIn if dualConnectivityEnabled;
8181

8282
if ( sizeof(x2) > 0 ) {
8383
//# connections between X2 Manager and GTP (for handover)

src/simu5g/stack/dualConnectivityManager/DualConnectivityManager.cc renamed to src/simu5g/stack/dcX2Forwarder/DcX2Forwarder.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// and cannot be removed from it.
1010
//
1111

12-
#include "simu5g/stack/dualConnectivityManager/DualConnectivityManager.h"
12+
#include "simu5g/stack/dcX2Forwarder/DcX2Forwarder.h"
1313

1414
#include <inet/common/ProtocolTag_m.h>
1515

@@ -19,9 +19,9 @@ namespace simu5g {
1919

2020
using namespace omnetpp;
2121

22-
Define_Module(DualConnectivityManager);
22+
Define_Module(DcX2Forwarder);
2323

24-
void DualConnectivityManager::initialize(int stage)
24+
void DcX2Forwarder::initialize(int stage)
2525
{
2626
if (stage == inet::INITSTAGE_LOCAL) {
2727
// get the node id
@@ -43,17 +43,17 @@ void DualConnectivityManager::initialize(int stage)
4343
}
4444
}
4545

46-
void DualConnectivityManager::handleMessage(cMessage *msg)
46+
void DcX2Forwarder::handleMessage(cMessage *msg)
4747
{
4848
cGate *incoming = msg->getArrivalGate();
4949
if (incoming == x2ManagerInGate_) {
5050
// incoming data from X2 Manager
51-
EV << "DualConnectivityManager::handleMessage - Received message from X2 manager" << endl;
51+
EV << "DcX2Forwarder::handleMessage - Received message from X2 manager" << endl;
5252
handleX2Message(msg);
5353
}
5454
else if (incoming->isName("dataIn")) {
5555
// incoming data from PDCP to forward via X2
56-
EV << "DualConnectivityManager::handleMessage - Received data packet from PDCP for X2 forwarding" << endl;
56+
EV << "DcX2Forwarder::handleMessage - Received data packet from PDCP for X2 forwarding" << endl;
5757
auto pkt = check_and_cast<inet::Packet*>(msg);
5858
auto tag = pkt->removeTag<X2TargetReq>();
5959
MacNodeId targetNode = tag->getTargetNode();
@@ -63,7 +63,7 @@ void DualConnectivityManager::handleMessage(cMessage *msg)
6363
delete msg;
6464
}
6565

66-
void DualConnectivityManager::handleX2Message(cMessage *msg)
66+
void DcX2Forwarder::handleX2Message(cMessage *msg)
6767
{
6868
inet::Packet *packet = check_and_cast<inet::Packet *>(msg);
6969

@@ -84,12 +84,12 @@ void DualConnectivityManager::handleX2Message(cMessage *msg)
8484
return;
8585
}
8686
else
87-
throw cRuntimeError("DualConnectivityManager::handleX2Message - Message type not valid");
87+
throw cRuntimeError("DcX2Forwarder::handleX2Message - Message type not valid");
8888

8989
delete packet;
9090
}
9191

92-
void DualConnectivityManager::forwardDataToTargetNode(inet::Packet *pkt, MacNodeId targetNode)
92+
void DcX2Forwarder::forwardDataToTargetNode(inet::Packet *pkt, MacNodeId targetNode)
9393
{
9494
Enter_Method("forwardDataToTargetNode");
9595
take(pkt);
@@ -111,15 +111,15 @@ void DualConnectivityManager::forwardDataToTargetNode(inet::Packet *pkt, MacNode
111111

112112
pkt->insertAtFront(dcMsg);
113113

114-
EV << NOW << " DualConnectivityManager::forwardDataToTargetNode - Send packet to node " << targetNode << endl;
114+
EV << NOW << " DcX2Forwarder::forwardDataToTargetNode - Send packet to node " << targetNode << endl;
115115

116116
// send to X2 Manager
117117
send(pkt, x2ManagerOutGate_);
118118
}
119119

120-
void DualConnectivityManager::receiveDataFromSourceNode(inet::Packet *pkt, MacNodeId sourceNode)
120+
void DcX2Forwarder::receiveDataFromSourceNode(inet::Packet *pkt, MacNodeId sourceNode)
121121
{
122-
EV << NOW << " DualConnectivityManager::receiveDataFromSourceNode - Received packet from node " << sourceNode << endl;
122+
EV << NOW << " DcX2Forwarder::receiveDataFromSourceNode - Received packet from node " << sourceNode << endl;
123123

124124
// Add tag with source node information
125125
auto tag = pkt->addTagIfAbsent<X2SourceNodeInd>();

src/simu5g/stack/dualConnectivityManager/DualConnectivityManager.h renamed to src/simu5g/stack/dcX2Forwarder/DcX2Forwarder.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
// and cannot be removed from it.
1010
//
1111

12-
#ifndef DUALCONNECTIVITYMANAGER_H_
13-
#define DUALCONNECTIVITYMANAGER_H_
12+
#ifndef DCX2FORWARDER_H_
13+
#define DCX2FORWARDER_H_
1414

1515
#include <inet/common/ModuleRefByPar.h>
1616

1717
#include "simu5g/common/LteCommon.h"
1818
#include "simu5g/x2/packet/X2ControlInfo_m.h"
19-
#include "simu5g/stack/dualConnectivityManager/X2DualConnectivityDataMsg.h"
19+
#include "simu5g/stack/dcX2Forwarder/X2DualConnectivityDataMsg.h"
2020

2121
namespace simu5g {
2222

2323
using namespace omnetpp;
2424
using namespace inet;
2525

2626
//
27-
// DualConnectivityManager
27+
// DcX2Forwarder
2828
//
29-
class DualConnectivityManager : public cSimpleModule
29+
class DcX2Forwarder : public cSimpleModule
3030
{
3131
protected:
3232

@@ -54,5 +54,5 @@ class DualConnectivityManager : public cSimpleModule
5454

5555
} //namespace
5656

57-
#endif /* DUALCONNECTIVITYMANAGER_H_ */
57+
#endif /* DCX2FORWARDER_H_ */
5858

src/simu5g/stack/dualConnectivityManager/DualConnectivityManager.ned renamed to src/simu5g/stack/dcX2Forwarder/DcX2Forwarder.ned

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
// and cannot be removed from it.
1010
//
1111

12-
package simu5g.stack.dualConnectivityManager;
12+
package simu5g.stack.dcX2Forwarder;
1313

1414
//
1515
// Performs bridging of data-plane packets between PDCP entities of two eNodeBs
1616
// or gNodeBs when Dual Connectivity is employed. The module directly interfaces
1717
// with the ~LteX2Manager to transfer such packets over the X2 interface.
1818
//
19-
simple DualConnectivityManager like IDualConnectivityManager
19+
simple DcX2Forwarder like IDcX2Forwarder
2020
{
2121
parameters:
2222
@display("i=block/cogwheel");
23-
@class("DualConnectivityManager");
23+
@class("DcX2Forwarder");
2424
gates:
2525
//# connections to the X2 Manager
2626
input x2ManagerIn;

src/simu5g/stack/dualConnectivityManager/IDualConnectivityManager.ned renamed to src/simu5g/stack/dcX2Forwarder/IDcX2Forwarder.ned

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
// and cannot be removed from it.
1010
//
1111

12-
package simu5g.stack.dualConnectivityManager;
12+
package simu5g.stack.dcX2Forwarder;
1313

1414
import simu5g.x2.IX2User;
1515

1616
//
17-
// Interface for the Dual Connectivity Manager. This module extends the ~X2User module interface
18-
// to define the basic contract that any Dual Connectivity Manager must adhere to.
17+
// Interface for the DC X2 Forwarder. This module extends the ~X2User module interface
18+
// to define the basic contract that any DC X2 Forwarder must adhere to.
1919
//
20-
moduleinterface IDualConnectivityManager extends IX2User
20+
moduleinterface IDcX2Forwarder extends IX2User
2121
{
2222
parameters:
2323
@display("i=block/cogwheel");

src/simu5g/stack/dualConnectivityManager/X2DualConnectivityDataMsg.cc renamed to src/simu5g/stack/dcX2Forwarder/X2DualConnectivityDataMsg.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// and cannot be removed from it.
1010
//
1111

12-
#include "simu5g/stack/dualConnectivityManager/X2DualConnectivityDataMsg.h"
12+
#include "simu5g/stack/dcX2Forwarder/X2DualConnectivityDataMsg.h"
1313

1414
namespace simu5g {
1515

src/simu5g/stack/dualConnectivityManager/X2DualConnectivityDataMsg.h renamed to src/simu5g/stack/dcX2Forwarder/X2DualConnectivityDataMsg.h

File renamed without changes.

‎src/simu5g/stack/pdcp/DcMux.ned‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package simu5g.stack.pdcp;
1313

1414
//
1515
// Dual Connectivity Mux: handles X2/DC routing between PDCP entities
16-
// and the DualConnectivityManager.
16+
// and the DcX2Forwarder.
1717
//
1818
simple DcMux
1919
{

‎src/simu5g/stack/pdcp/NrRxPdcpEntity.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define _NRRXPDCPENTITY_H_
1414

1515
#include "simu5g/stack/pdcp/LteRxPdcpEntity.h"
16-
#include "simu5g/stack/dualConnectivityManager/DualConnectivityManager.h"
16+
#include "simu5g/stack/dcX2Forwarder/DcX2Forwarder.h"
1717
#include "simu5g/common/timer/TTimer.h"
1818

1919
namespace simu5g {

‎src/simu5g/stack/pdcp/NrTxPdcpEntity.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define _NRTXPDCPENTITY_H_
1414

1515
#include "simu5g/stack/pdcp/LteTxPdcpEntity.h"
16-
#include "simu5g/stack/dualConnectivityManager/DualConnectivityManager.h"
16+
#include "simu5g/stack/dcX2Forwarder/DcX2Forwarder.h"
1717

1818
namespace simu5g {
1919

0 commit comments

Comments
 (0)