Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-SMF
Commits
ec9b1e81
Commit
ec9b1e81
authored
Jan 21, 2020
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update definition for SNssai/SMContextCreateData
parent
7fd421ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
19 deletions
+22
-19
etc/smf.conf
etc/smf.conf
+2
-1
src/api-server/model/SmContextCreateData.cpp
src/api-server/model/SmContextCreateData.cpp
+2
-2
src/api-server/model/SmContextCreateData.h
src/api-server/model/SmContextCreateData.h
+3
-3
src/api-server/model/Snssai.cpp
src/api-server/model/Snssai.cpp
+8
-8
src/api-server/model/Snssai.h
src/api-server/model/Snssai.h
+7
-5
No files found.
etc/smf.conf
View file @
ec9b1e81
...
...
@@ -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
@
};
...
...
src/api-server/model/SmContextCreateData.cpp
View file @
ec9b1e81
...
...
@@ -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
;
...
...
src/api-server/model/SmContextCreateData.h
View file @
ec9b1e81
...
...
@@ -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
;
...
...
src/api-server/model/Snssai.cpp
View file @
ec9b1e81
...
...
@@ -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
;
...
...
src/api-server/model/Snssai.h
View file @
ec9b1e81
...
...
@@ -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
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment