Commit ec9b1e81 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen

update definition for SNssai/SMContextCreateData

parent 7fd421ee
......@@ -76,7 +76,8 @@ SMF =
{
# SMF binded interface for N11 communication (AMF)
INTERFACE_NAME = "@SMF_INTERFACE_NAME_FOR_N11@"; # STRING, interface name
IPV4_ADDRESS = "@SMF_INTERFACE_IPV4_ADDRESS_FOR_N11@"; # STRING, CIDR or "read" to let app read interface configured IP address
#IPV4_ADDRESS = "@SMF_INTERFACE_IPV4_ADDRESS_FOR_N11@"; # STRING, CIDR or "read" to let app read interface configured IP address
IPV4_ADDRESS = "read";
PORT = @SMF_INTERFACE_PORT_FOR_N11@
};
......
......@@ -589,11 +589,11 @@ void SmContextCreateData::setServingNetwork(PlmnId const& value)
m_ServingNetwork = value;
}
uint8_t SmContextCreateData::getRequestType() const
std::string SmContextCreateData::getRequestType() const
{
return m_RequestType;
}
void SmContextCreateData::setRequestType(uint8_t const& value)
void SmContextCreateData::setRequestType(std::string const& value)
{
m_RequestType = value;
m_RequestTypeIsSet = true;
......
......@@ -140,8 +140,8 @@ public:
/// <summary>
///
/// </summary>
uint8_t getRequestType() const;
void setRequestType(uint8_t const& value);
std::string getRequestType() const;
void setRequestType(std::string const& value);
bool requestTypeIsSet() const;
void unsetRequestType();
/// <summary>
......@@ -389,7 +389,7 @@ protected:
bool m_ServiceNameIsSet;
PlmnId m_ServingNetwork;
uint8_t m_RequestType;
std::string m_RequestType;
bool m_RequestTypeIsSet;
RefToBinaryData m_N1SmMsg;
bool m_N1SmMsgIsSet;
......
......@@ -20,7 +20,7 @@ namespace model {
Snssai::Snssai()
{
m_Sst = 0;
m_Sd = 0;
m_Sd = "";
m_SdIsSet = false;
}
......@@ -47,11 +47,11 @@ void from_json(const nlohmann::json& j, Snssai& o)
j.at("sst").get_to(o.m_Sst);
if(j.find("sd") != j.end())
{
uint32_t sd;
// j.at("sd").get_to(o.m_Sd);
j.at("sd").get_to(sd);
o.m_Sd = sd;
o.m_SdIsSet = true;
// uint32_t sd;
j.at("sd").get_to(o.m_Sd);
// j.at("sd").get_to(sd);
// o.m_Sd = sd;
o.m_SdIsSet = true;
}
}
......@@ -64,11 +64,11 @@ void Snssai::setSst(uint8_t const value)
m_Sst = value;
}
uint32_t Snssai::getSd() const
std::string Snssai::getSd() const
{
return m_Sd;
}
void Snssai::setSd(uint32_t const& value)
void Snssai::setSd(std::string const& value)
{
m_Sd = value;
m_SdIsSet = true;
......
......@@ -33,7 +33,7 @@ class Snssai
{
public:
Snssai();
Snssai(uint8_t sst, uint32_t sd): m_Sst(sst), m_Sd(sd) {
Snssai(uint8_t sst, std::string sd): m_Sst(sst), m_Sd(sd) {
m_SdIsSet = true;
};
virtual ~Snssai();
......@@ -51,8 +51,10 @@ public:
/// <summary>
///
/// </summary>
uint32_t getSd() const;
void setSd(uint32_t const& value);
//uint32_t getSd() const;
//void setSd(uint32_t const& value);
std::string getSd() const;
void setSd(std::string const& value);
bool sdIsSet() const;
void unsetSd();
......@@ -61,8 +63,8 @@ public:
protected:
uint8_t m_Sst;
//std::string m_Sd;
uint32_t m_Sd:24;
std::string m_Sd;
//uint32_t m_Sd:24;
bool m_SdIsSet;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment