Merge pull request #292 from aligungr/dev

Release of v3.1.7

README.md

@@ -2,7 +2,7 @@
   <a href="https://github.com/aligungr/UERANSIM"><img src="/.github/logo.png" width="75" title="UERANSIM"></a>
 </p>
 <p align="center">
-<img src="https://img.shields.io/badge/UERANSIM-v3.1.6-blue" />
+<img src="https://img.shields.io/badge/UERANSIM-v3.1.7-blue" />
 <img src="https://img.shields.io/badge/3GPP-R15-orange" />
 <img src="https://img.shields.io/badge/License-GPL--3.0-green"/>
 </p>

config/open5gs-gnb.yaml

@@ -17,7 +17,6 @@ amfConfigs:
 # List of supported S-NSSAIs by this gNB
 slices:
   - sst: 1
-    sd: 1
 
 # Indicates whether or not SCTP stream number errors should be ignored.
 ignoreStreamIds: true

config/open5gs-ue.yaml

@@ -34,7 +34,6 @@ sessions:
 # Configured NSSAI for this UE by HPLMN
 configured-nssai:
   - sst: 1
-    sd: 1
 
 # Default Configured NSSAI for this UE
 default-nssai:

src/app/cli_cmd.cpp

@@ -150,6 +150,7 @@ static OrderedMap<std::string, CmdEntry> g_gnbCmdEntries = {
     {"amf-info", {"Show some status information about the given AMF", "<amf-id>", DefaultDesc, true}},
     {"ue-list", {"List all UEs associated with the gNB", "", DefaultDesc, false}},
     {"ue-count", {"Print the total number of UEs connected the this gNB", "", DefaultDesc, false}},
+    {"ue-release", {"Request a UE context release for the given UE", "<ue-id>", DefaultDesc, false}},
 };
 
 static OrderedMap<std::string, CmdEntry> g_ueCmdEntries = {
@@ -162,6 +163,7 @@ static OrderedMap<std::string, CmdEntry> g_ueCmdEntries = {
     {"ps-release-all", {"Trigger PDU session release procedures for all active sessions", "", DefaultDesc, false}},
     {"deregister",
      {"Perform a de-registration by the UE", "<normal|disable-5g|switch-off|remove-sim>", DefaultDesc, true}},
+    {"coverage", {"Show gNodeB cell coverage information", "", DefaultDesc, false}},
 };
 
 static std::unique_ptr<GnbCliCommand> GnbCliParseImpl(const std::string &subCmd, const opt::OptionsResult &options,
@@ -199,6 +201,18 @@ static std::unique_ptr<GnbCliCommand> GnbCliParseImpl(const std::string &subCmd,
     {
         return std::make_unique<GnbCliCommand>(GnbCliCommand::UE_COUNT);
     }
+    else if (subCmd == "ue-release")
+    {
+        auto cmd = std::make_unique<GnbCliCommand>(GnbCliCommand::UE_RELEASE_REQ);
+        if (options.positionalCount() == 0)
+            CMD_ERR("UE ID is expected")
+        if (options.positionalCount() > 1)
+            CMD_ERR("Only one UE ID is expected")
+        cmd->ueId = utils::ParseInt(options.getPositional(0));
+        if (cmd->ueId <= 0)
+            CMD_ERR("Invalid UE ID")
+        return cmd;
+    }
 
     return nullptr;
 }
@@ -301,6 +315,10 @@ static std::unique_ptr<UeCliCommand> UeCliParseImpl(const std::string &subCmd, c
         }
         return cmd;
     }
+    else if (subCmd == "coverage")
+    {
+        return std::make_unique<UeCliCommand>(UeCliCommand::COVERAGE);
+    }
 
     return nullptr;
 }

src/app/cli_cmd.hpp

@@ -26,12 +26,16 @@ struct GnbCliCommand
         AMF_LIST,
         AMF_INFO,
         UE_LIST,
-        UE_COUNT
+        UE_COUNT,
+        UE_RELEASE_REQ,
     } present;
 
     // AMF_INFO
     int amfId{};
 
+    // UE_RELEASE_REQ
+    int ueId{};
+
     explicit GnbCliCommand(PR present) : present(present)
     {
     }
@@ -48,6 +52,7 @@ struct UeCliCommand
         PS_RELEASE,
         PS_RELEASE_ALL,
         DE_REGISTER,
+        COVERAGE,
     } present;
 
     // DE_REGISTER

src/asn/utils/utils.hpp

@@ -198,4 +198,12 @@ inline Unique<T> WrapUnique(T *ptr, asn_TYPE_descriptor_t &desc)
     return asn::Unique<T>(ptr, asn::Deleter<T>{desc});
 }
 
+template <typename T>
+inline Unique<T> UniqueCopy(const T &value, asn_TYPE_descriptor_t &desc)
+{
+    auto *ptr = New<T>();
+    DeepCopy(desc, value, ptr);
+    return WrapUnique(ptr, desc);
+}
+
 } // namespace asn

src/gnb/app/cmd_handler.cpp

@@ -10,8 +10,8 @@
 
 #include <gnb/app/task.hpp>
 #include <gnb/gtp/task.hpp>
-#include <gnb/mr/task.hpp>
 #include <gnb/ngap/task.hpp>
+#include <gnb/rls/task.hpp>
 #include <gnb/rrc/task.hpp>
 #include <gnb/sctp/task.hpp>
 #include <utils/common.hpp>
@@ -36,7 +36,7 @@ void GnbCmdHandler::sendError(const InetAddress &address, const std::string &out
 void GnbCmdHandler::pauseTasks()
 {
     m_base->gtpTask->requestPause();
-    m_base->mrTask->requestPause();
+    m_base->rlsTask->requestPause();
     m_base->ngapTask->requestPause();
     m_base->rrcTask->requestPause();
     m_base->sctpTask->requestPause();
@@ -45,7 +45,7 @@ void GnbCmdHandler::pauseTasks()
 void GnbCmdHandler::unpauseTasks()
 {
     m_base->gtpTask->requestUnpause();
-    m_base->mrTask->requestUnpause();
+    m_base->rlsTask->requestUnpause();
     m_base->ngapTask->requestUnpause();
     m_base->rrcTask->requestUnpause();
     m_base->sctpTask->requestUnpause();
@@ -55,7 +55,7 @@ bool GnbCmdHandler::isAllPaused()
 {
     if (!m_base->gtpTask->isPauseConfirmed())
         return false;
-    if (!m_base->mrTask->isPauseConfirmed())
+    if (!m_base->rlsTask->isPauseConfirmed())
         return false;
     if (!m_base->ngapTask->isPauseConfirmed())
         return false;
@@ -131,7 +131,7 @@ void GnbCmdHandler::handleCmdImpl(NwGnbCliCommand &msg)
         for (auto &ue : m_base->ngapTask->m_ueCtx)
         {
             json.push(Json::Obj({
-                {"ue-name", m_base->mrTask->m_ueMap[ue.first].name},
+                {"ue-id", ue.first},
                 {"ran-ngap-id", ue.second->ranUeNgapId},
                 {"amf-ngap-id", ue.second->amfUeNgapId},
             }));
@@ -143,6 +143,17 @@ void GnbCmdHandler::handleCmdImpl(NwGnbCliCommand &msg)
         sendResult(msg.address, std::to_string(m_base->ngapTask->m_ueCtx.size()));
         break;
     }
+    case app::GnbCliCommand::UE_RELEASE_REQ: {
+        if (m_base->ngapTask->m_ueCtx.count(msg.cmd->ueId) == 0)
+            sendError(msg.address, "UE not found with given ID");
+        else
+        {
+            auto ue = m_base->ngapTask->m_ueCtx[msg.cmd->ueId];
+            m_base->ngapTask->sendContextRelease(ue->ctxId, NgapCause::RadioNetwork_unspecified);
+            sendResult(msg.address, "Requesting UE context release");
+        }
+        break;
+    }
     }
 }
 

src/gnb/gnb.cpp

@@ -9,13 +9,12 @@
 #include "gnb.hpp"
 #include "app/task.hpp"
 #include "gtp/task.hpp"
-#include "mr/task.hpp"
+#include "rls/task.hpp"
 #include "ngap/task.hpp"
 #include "rrc/task.hpp"
 #include "sctp/task.hpp"
 
 #include <app/cli_base.hpp>
-#include <utils/common.hpp>
 
 namespace nr::gnb
 {
@@ -33,7 +32,7 @@ GNodeB::GNodeB(GnbConfig *config, app::INodeListener *nodeListener, NtsTask *cli
     base->ngapTask = new NgapTask(base);
     base->rrcTask = new GnbRrcTask(base);
     base->gtpTask = new GtpTask(base);
-    base->mrTask = new GnbMrTask(base);
+    base->rlsTask = new GnbRlsTask(base);
 
     taskBase = base;
 }
@@ -45,14 +44,14 @@ GNodeB::~GNodeB()
     taskBase->ngapTask->quit();
     taskBase->rrcTask->quit();
     taskBase->gtpTask->quit();
-    taskBase->mrTask->quit();
+    taskBase->rlsTask->quit();
 
     delete taskBase->appTask;
     delete taskBase->sctpTask;
     delete taskBase->ngapTask;
     delete taskBase->rrcTask;
     delete taskBase->gtpTask;
-    delete taskBase->mrTask;
+    delete taskBase->rlsTask;
 
     delete taskBase->logBase;
 
@@ -65,7 +64,7 @@ void GNodeB::start()
     taskBase->sctpTask->start();
     taskBase->ngapTask->start();
     taskBase->rrcTask->start();
-    taskBase->mrTask->start();
+    taskBase->rlsTask->start();
     taskBase->gtpTask->start();
 }
 

src/gnb/gtp/task.cpp

@@ -10,7 +10,7 @@
 
 #include <asn/ngap/ASN_NGAP_QosFlowSetupRequestItem.h>
 #include <gnb/gtp/proto.hpp>
-#include <gnb/mr/task.hpp>
+#include <gnb/rls/task.hpp>
 #include <utils/constants.hpp>
 #include <utils/libc_error.hpp>
 
@@ -76,12 +76,12 @@ void GtpTask::onLoop()
         }
         break;
     }
-    case NtsMessageType::GNB_MR_TO_GTP: {
-        auto *w = dynamic_cast<NwGnbMrToGtp *>(msg);
+    case NtsMessageType::GNB_RLS_TO_GTP: {
+        auto *w = dynamic_cast<NwGnbRlsToGtp *>(msg);
         switch (w->present)
         {
-        case NwGnbMrToGtp::UPLINK_DELIVERY: {
-            handleUplinkData(w->ueId, w->pduSessionId, std::move(w->data));
+        case NwGnbRlsToGtp::DATA_PDU_DELIVERY: {
+            handleUplinkData(w->ueId, w->psi, std::move(w->pdu));
             break;
         }
         }
@@ -239,11 +239,11 @@ void GtpTask::handleUdpReceive(const udp::NwUdpServerReceive &msg)
 
     if (m_rateLimiter->allowDownlinkPacket(sessionInd, gtp->payload.length()))
     {
-        auto *w = new NwGnbGtpToMr(NwGnbGtpToMr::DATA_PDU_DELIVERY);
+        auto *w = new NwGnbGtpToRls(NwGnbGtpToRls::DATA_PDU_DELIVERY);
         w->ueId = GetUeId(sessionInd);
-        w->pduSessionId = GetPsi(sessionInd);
-        w->data = std::move(gtp->payload);
-        m_base->mrTask->push(w);
+        w->psi = GetPsi(sessionInd);
+        w->pdu = std::move(gtp->payload);
+        m_base->rlsTask->push(w);
     }
 
     delete gtp;