Skip to content

Commit 9b9fa57

Browse files
avargaavarga
committed
LteHandoverManager: renamed to HandoverX2Forwarder
1 parent 6051d74 commit 9b9fa57

16 files changed

Lines changed: 60 additions & 60 deletions

‎src/simu5g/stack/LteNicEnb.ned‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import simu5g.background.trafficGenerator.BackgroundTrafficGenerator;
1616
import simu5g.stack.compManager.ILteCompManager;
1717
import simu5g.stack.dcX2Forwarder.DcX2Forwarder;
1818
import simu5g.stack.pdcp.DcMux;
19-
import simu5g.stack.handoverManager.LteHandoverManager;
19+
import simu5g.stack.handoverX2Forwarder.HandoverX2Forwarder;
2020
import simu5g.x2.LteX2Manager;
2121

2222

@@ -36,7 +36,7 @@ module LteNicEnb extends LteNicBase
3636
packetFlowObserver.typename = default("PacketFlowObserverEnb");
3737
d2dCapable = default(false); // DO NOT CHANGE
3838
bool compEnabled = default(false);
39-
*.handoverManagerModule = "^.handoverManager";
39+
*.handoverX2ForwarderModule = "^.handoverX2Forwarder";
4040

4141
submodules:
4242
pdcpDcMux: DcMux {
@@ -56,7 +56,7 @@ module LteNicEnb extends LteNicBase
5656
compManager: <default("LteCompManagerProportional")> like ILteCompManager if compEnabled {
5757
@display("p=717,286;is=s");
5858
}
59-
handoverManager: LteHandoverManager {
59+
handoverX2Forwarder: HandoverX2Forwarder {
6060
@display("p=717,50;is=s");
6161
}
6262
dcX2Forwarder: DcX2Forwarder if dualConnectivityEnabled {
@@ -70,10 +70,10 @@ module LteNicEnb extends LteNicBase
7070
//# connections between X2 Manager and its users
7171
compManager.x2ManagerIn <-- x2Manager.dataPortOut++ if compEnabled;
7272
compManager.x2ManagerOut --> x2Manager.dataPortIn++ if compEnabled;
73-
handoverManager.x2ManagerIn <-- x2Manager.dataPortOut++;
74-
handoverManager.x2ManagerOut --> x2Manager.dataPortIn++;
75-
handoverManager.tunnelOut --> handoverPacketHolder.x2In;
76-
handoverPacketHolder.hoManagerOut --> handoverManager.dataIn;
73+
handoverX2Forwarder.x2ManagerIn <-- x2Manager.dataPortOut++;
74+
handoverX2Forwarder.x2ManagerOut --> x2Manager.dataPortIn++;
75+
handoverX2Forwarder.tunnelOut --> handoverPacketHolder.x2In;
76+
handoverPacketHolder.hoManagerOut --> handoverX2Forwarder.dataIn;
7777
dcX2Forwarder.x2ManagerIn <-- x2Manager.dataPortOut++ if dualConnectivityEnabled;
7878
dcX2Forwarder.x2ManagerOut --> x2Manager.dataPortIn++ if dualConnectivityEnabled;
7979
pdcpDcMux.dcManagerOut --> dcX2Forwarder.dataIn if dualConnectivityEnabled;

src/simu5g/stack/handoverManager/LteHandoverManager.cc renamed to src/simu5g/stack/handoverX2Forwarder/HandoverX2Forwarder.cc

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

12-
#include "simu5g/stack/handoverManager/LteHandoverManager.h"
12+
#include "simu5g/stack/handoverX2Forwarder/HandoverX2Forwarder.h"
1313

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

1616
#include "simu5g/common/LteControlInfoTags_m.h"
17-
#include "simu5g/stack/handoverManager/X2HandoverCommandIE.h"
17+
#include "simu5g/stack/handoverX2Forwarder/X2HandoverCommandIE.h"
1818
#include "simu5g/stack/ip2nic/HandoverPacketHolderEnb.h"
1919

2020
namespace simu5g {
2121

22-
Define_Module(LteHandoverManager);
22+
Define_Module(HandoverX2Forwarder);
2323

2424
using namespace inet;
2525
using namespace omnetpp;
2626

27-
void LteHandoverManager::initialize(int stage)
27+
void HandoverX2Forwarder::initialize(int stage)
2828
{
2929
if (stage == inet::INITSTAGE_LOCAL) {
3030
// get the node id
@@ -51,18 +51,18 @@ void LteHandoverManager::initialize(int stage)
5151
}
5252
}
5353

54-
void LteHandoverManager::handleMessage(cMessage *msg)
54+
void HandoverX2Forwarder::handleMessage(cMessage *msg)
5555
{
5656
cPacket *pkt = check_and_cast<cPacket *>(msg);
5757
cGate *incoming = pkt->getArrivalGate();
5858
if (incoming == x2ManagerInGate_) {
5959
// incoming data from X2 Manager
60-
EV << "LteHandoverManager::handleMessage - Received message from X2 Manager" << endl;
60+
EV << "HandoverX2Forwarder::handleMessage - Received message from X2 Manager" << endl;
6161
handleX2Message(pkt);
6262
}
6363
else if (incoming->isName("dataIn")) {
6464
// incoming data from HandoverPacketHolder to forward via X2
65-
EV << "LteHandoverManager::handleMessage - Received data packet from HandoverPacketHolder for X2 forwarding" << endl;
65+
EV << "HandoverX2Forwarder::handleMessage - Received data packet from HandoverPacketHolder for X2 forwarding" << endl;
6666
auto datagram = check_and_cast<Packet*>(pkt);
6767
auto tag = datagram->removeTag<X2TargetReq>();
6868
MacNodeId targetEnb = tag->getTargetNode();
@@ -72,7 +72,7 @@ void LteHandoverManager::handleMessage(cMessage *msg)
7272
delete msg;
7373
}
7474

75-
void LteHandoverManager::handleX2Message(cPacket *pkt)
75+
void HandoverX2Forwarder::handleX2Message(cPacket *pkt)
7676
{
7777
inet::Packet *datagram = check_and_cast<inet::Packet *>(pkt);
7878

@@ -93,11 +93,11 @@ void LteHandoverManager::handleX2Message(cPacket *pkt)
9393
}
9494
}
9595

96-
void LteHandoverManager::sendHandoverCommand(MacNodeId ueId, MacNodeId enb, bool startHo)
96+
void HandoverX2Forwarder::sendHandoverCommand(MacNodeId ueId, MacNodeId enb, bool startHo)
9797
{
9898
Enter_Method("sendHandoverCommand");
9999

100-
EV << NOW << " LteHandoverManager::sendHandoverCommand - Send handover command over X2 to eNB " << enb << " for UE " << ueId << endl;
100+
EV << NOW << " HandoverX2Forwarder::sendHandoverCommand - Send handover command over X2 to eNB " << enb << " for UE " << ueId << endl;
101101

102102
auto pkt = new Packet("X2HandoverControlMsg");
103103

@@ -123,9 +123,9 @@ void LteHandoverManager::sendHandoverCommand(MacNodeId ueId, MacNodeId enb, bool
123123
send(pkt, x2ManagerOutGate_);
124124
}
125125

126-
void LteHandoverManager::receiveHandoverCommand(MacNodeId ueId, MacNodeId enb, bool startHo)
126+
void HandoverX2Forwarder::receiveHandoverCommand(MacNodeId ueId, MacNodeId enb, bool startHo)
127127
{
128-
EV << NOW << " LteHandoverManager::receiveHandoverCommand - Received handover command over X2 from eNB " << enb << " for UE " << ueId << endl;
128+
EV << NOW << " HandoverX2Forwarder::receiveHandoverCommand - Received handover command over X2 from eNB " << enb << " for UE " << ueId << endl;
129129

130130
// send command to HandoverPacketHolder
131131
if (startHo)
@@ -134,7 +134,7 @@ void LteHandoverManager::receiveHandoverCommand(MacNodeId ueId, MacNodeId enb, b
134134
handoverPacketHolder_->signalHandoverCompleteSource(ueId, enb);
135135
}
136136

137-
void LteHandoverManager::forwardDataToTargetEnb(Packet *datagram, MacNodeId targetEnb)
137+
void HandoverX2Forwarder::forwardDataToTargetEnb(Packet *datagram, MacNodeId targetEnb)
138138
{
139139
Enter_Method("forwardDataToTargetEnb");
140140
take(datagram);
@@ -151,15 +151,15 @@ void LteHandoverManager::forwardDataToTargetEnb(Packet *datagram, MacNodeId targ
151151
datagram->insertAtFront(hoMsg);
152152
datagram->addTagIfAbsent<PacketProtocolTag>()->setProtocol(&LteProtocol::x2ap);
153153

154-
EV << NOW << " LteHandoverManager::forwardDataToTargetEnb - Send IP datagram to eNB " << targetEnb << endl;
154+
EV << NOW << " HandoverX2Forwarder::forwardDataToTargetEnb - Send IP datagram to eNB " << targetEnb << endl;
155155

156156
// send to X2 Manager
157157
send(datagram, x2ManagerOutGate_);
158158
}
159159

160-
void LteHandoverManager::receiveDataFromSourceEnb(Packet *datagram, MacNodeId sourceEnb)
160+
void HandoverX2Forwarder::receiveDataFromSourceEnb(Packet *datagram, MacNodeId sourceEnb)
161161
{
162-
EV << NOW << " LteHandoverManager::receiveDataFromSourceEnb - Received IP datagram from eNB " << sourceEnb << endl;
162+
EV << NOW << " HandoverX2Forwarder::receiveDataFromSourceEnb - Received IP datagram from eNB " << sourceEnb << endl;
163163

164164
// send data to HandoverPacketHolder for transmission
165165
send(datagram, "tunnelOut");

src/simu5g/stack/handoverManager/LteHandoverManager.h renamed to src/simu5g/stack/handoverX2Forwarder/HandoverX2Forwarder.h

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

12-
#ifndef __LTEHANDOVERMANAGER_H_
13-
#define __LTEHANDOVERMANAGER_H_
12+
#ifndef __HANDOVERX2FORWARDER_H_
13+
#define __HANDOVERX2FORWARDER_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/handoverManager/X2HandoverControlMsg.h"
20-
#include "simu5g/stack/handoverManager/X2HandoverDataMsg.h"
19+
#include "simu5g/stack/handoverX2Forwarder/X2HandoverControlMsg.h"
20+
#include "simu5g/stack/handoverX2Forwarder/X2HandoverDataMsg.h"
2121

2222
namespace simu5g {
2323

@@ -26,9 +26,9 @@ using namespace omnetpp;
2626
class HandoverPacketHolderEnb;
2727

2828
//
29-
// LteHandoverManager
29+
// HandoverX2Forwarder
3030
//
31-
class LteHandoverManager : public cSimpleModule
31+
class HandoverX2Forwarder : public cSimpleModule
3232
{
3333

3434
protected:
@@ -70,5 +70,5 @@ class LteHandoverManager : public cSimpleModule
7070

7171
} //namespace
7272

73-
#endif /* __LTEHANDOVERMANAGER_H_ */
73+
#endif /* __HANDOVERX2FORWARDER_H_ */
7474

src/simu5g/stack/handoverManager/LteHandoverManager.ned renamed to src/simu5g/stack/handoverX2Forwarder/HandoverX2Forwarder.ned

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

12-
package simu5g.stack.handoverManager;
12+
package simu5g.stack.handoverX2Forwarder;
1313

1414
//
1515
// Manages the exchange of messages during the handover process.
@@ -18,11 +18,11 @@ package simu5g.stack.handoverManager;
1818
// target eNodeB. The module directly interfaces with the ~LteX2Manager to
1919
// facilitate this inter-eNodeB communication.
2020
//
21-
simple LteHandoverManager like ILteHandoverManager
21+
simple HandoverX2Forwarder like IHandoverX2Forwarder
2222
{
2323
parameters:
2424
@display("i=block/cogwheel");
25-
@class("LteHandoverManager");
25+
@class("HandoverX2Forwarder");
2626

2727
bool losslessHandover = default(false);
2828
string handoverPacketHolderModule = default("^.handoverPacketHolder");

src/simu5g/stack/handoverManager/ILteHandoverManager.ned renamed to src/simu5g/stack/handoverX2Forwarder/IHandoverX2Forwarder.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.handoverManager;
12+
package simu5g.stack.handoverX2Forwarder;
1313

1414
import simu5g.x2.IX2User;
1515

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

src/simu5g/stack/handoverManager/X2HandoverCommandIE.h renamed to src/simu5g/stack/handoverX2Forwarder/X2HandoverCommandIE.h

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

12-
#include "simu5g/stack/handoverManager/X2HandoverCommandIE_m.h"
12+
#include "simu5g/stack/handoverX2Forwarder/X2HandoverCommandIE_m.h"

src/simu5g/stack/handoverManager/X2HandoverCommandIE.msg renamed to src/simu5g/stack/handoverX2Forwarder/X2HandoverCommandIE.msg

File renamed without changes.

src/simu5g/stack/handoverManager/X2HandoverControlMsg.cc renamed to src/simu5g/stack/handoverX2Forwarder/X2HandoverControlMsg.cc

File renamed without changes.

src/simu5g/stack/handoverManager/X2HandoverControlMsg.h renamed to src/simu5g/stack/handoverX2Forwarder/X2HandoverControlMsg.h

File renamed without changes.

src/simu5g/stack/handoverManager/X2HandoverDataMsg.h renamed to src/simu5g/stack/handoverX2Forwarder/X2HandoverDataMsg.h

File renamed without changes.

0 commit comments

Comments
 (0)