UE CLI improvements

aligungr · May 28, 2021 · 2d2a23e · 2d2a23e
1 parent 021891c
commit 2d2a23e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/ue/app/task.cpp b/src/ue/app/task.cpp
@@ -130,10 +130,8 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
         UePduSessionInfo sessionInfo{};
         sessionInfo.psi = session->psi;
 
-        if (session->apn.has_value())
-            sessionInfo.apn = session->apn.value();
-        if(session->sNssai.has_value())
-            sessionInfo.sNssai = session->sNssai.value();
+        sessionInfo.apn = session->apn;
+        sessionInfo.sNssai = session->sNssai;
         sessionInfo.type = nas::utils::EnumToString(session->sessionType);
         if (session->pduAddress.has_value())
             sessionInfo.address = utils::OctetStringToIp(session->pduAddress->pduAddressInformation);

diff --git a/src/ue/types.cpp b/src/ue/types.cpp
@@ -237,14 +237,12 @@ Json ToJson(const EPsState &state)
 
 Json ToJson(const UePduSessionInfo &v)
 {
-    return Json::Obj({
-        {"id", v.psi},
-        {"type", v.type},
-        {"address", v.address},
-        {"emergency", v.isEmergency},
-        {"apn", v.apn},
-        {"sNssai", ToJson(v.sNssai)}
-    });
+    return Json::Obj({{"id", v.psi},
+                      {"type", v.type},
+                      {"address", v.address},
+                      {"emergency", v.isEmergency},
+                      {"apn", ::ToJson(v.apn)},
+                      {"s-nssai", ToJson(v.sNssai)}});
 }
 
 Json ToJson(const EServiceReqCause &v)

diff --git a/src/ue/types.hpp b/src/ue/types.hpp
@@ -390,8 +390,8 @@ struct UePduSessionInfo
     std::string address{};
     bool isEmergency{};
     bool uplinkPending{};
-    std::string apn{};
-    SingleSlice sNssai{};
+    std::optional<std::string> apn{};
+    std::optional<SingleSlice> sNssai{};
 };
 
 enum class ERegUpdateCause