Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
MEC - Multi-access Edge Computing
MEC TTCN-3 Test Suite
Commits
0609ee42
Commit
0609ee42
authored
Nov 21, 2019
by
YannGarcia
Browse files
Move float2str in an external function as it is not defined in ETSI ES 201 873-1 V4.11.1 (2019-04)
parent
3fae238d
Changes
7
Hide whitespace changes
Inline
Side-by-side
ccsrc/externals/LibMec_ExternalFunctions.cc
View file @
0609ee42
...
...
@@ -17,8 +17,7 @@ namespace LibMec__Functions {
* @return Timestamp - current time since 01/01/2004 in milliseconds
* @see fx_getCurrentTime() return TimestampIts
*/
INTEGER
fx__getCurrentTime
(
)
{
INTEGER
fx__getCurrentTime
()
{
INTEGER
i
;
i
.
set_long_long_val
(
base_time
::
get_instance
().
get_its_current_time_ms
());
loggers
::
get_instance
().
log_msg
(
"<<< fx__getCurrentTime: "
,
i
);
...
...
@@ -35,4 +34,12 @@ namespace LibMec__Functions {
return
i
;
}
/**
* @desc Convert a float value into a string
* @return The string formated value
*/
CHARSTRING
fx__float2str
(
const
FLOAT
&
p_value
)
{
return
float2str
(
p_value
);
}
}
// end of Namespace
scripts/update_mec_project.bash
View file @
0609ee42
...
...
@@ -125,7 +125,7 @@ do
done
# Update libraries & CC files
TTCN_3_LIB_LIST
=
'LibMec LibMec/
LocationAPI LibMec/UEidentityAPI
LibMec/
RnisAPI
LibMec/BwManagementAPI LibMec/
Ams LibMec/AppEna
LibMec/
ApplCM
LibMec/
FixedAccessInform
ationAPI LibMec/MeoPkgm LibMec/MepmPkgm LibHttp LibCommon'
TTCN_3_LIB_LIST
=
'LibMec LibMec/
Ams LibMec/AppEna
LibMec/
AppLCM
LibMec/BwManagementAPI LibMec/
FixedAccessInformationAPI
LibMec/
Grant
LibMec/
Loc
ationAPI LibMec/MeoPkgm LibMec/MepmPkgm
LibMec/RnisAPI LibMec/UEidentityAPI
LibHttp LibCommon'
for
i
in
${
TTCN_3_LIB_LIST
}
do
if
[
!
-d
${
TTCN_3_DST_PATH
}
/
$i
]
...
...
@@ -134,11 +134,7 @@ do
fi
cp
${
TTCN_3_ORG_PATH
}
/
$i
/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
# Update files
if
[
"
$i
"
==
"LibMec"
]
then
cp
${
TTCN_3_ORG_PATH
}
/
$i
/ttcn/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
cp
${
TTCN_3_ORG_PATH
}
/
$i
/json/
*
.json
${
TTCN_3_DST_PATH
}
/
$i
/json
elif
[
"
$i
"
==
"LibHttp"
]
if
[
"
$i
"
==
"LibHttp"
]
then
cp
${
TTCN_3_ORG_PATH
}
/LibIts/ttcn/Http/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
cp
${
CC_SRC_PATH
}
/EncDec/
$i
/
*
_Encdec.cc
${
TTCN_3_DST_PATH
}
/
$i
/src
...
...
@@ -153,6 +149,11 @@ do
cp
${
TTCN_3_ORG_PATH
}
/
$i
/ttcn/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
# Patch TITAN due to TTCN-3 compiler issues
cp
${
SRC_MEC_PATH
}
/ttcn/patch_lib_common_titan/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
elif
[
"
$i
"
==
"LibMec/Ams"
]
then
cp
${
TTCN_3_ORG_PATH
}
/
$i
/ttcn/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
cp
${
TTCN_3_ORG_PATH
}
/
$i
/json/
*
.json
${
TTCN_3_DST_PATH
}
/
$i
/json
rm
-f
${
TTCN_3_DST_PATH
}
/
$i
/ttcn/Ams_sEncdecDeclarations.ttcn
else
cp
${
TTCN_3_ORG_PATH
}
/
$i
/ttcn/
*
.ttcn
${
TTCN_3_DST_PATH
}
/
$i
/ttcn
cp
${
TTCN_3_ORG_PATH
}
/
$i
/json/
*
.json
${
TTCN_3_DST_PATH
}
/
$i
/json
...
...
ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn
View file @
0609ee42
...
...
@@ -446,7 +446,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
httpPort
.
send
(
m_http_request
(
m_http_request_get
(
"/"
&
PICS_ROOT_API
&
PX_UE_LOC_QRY_URI
&
"?address="
&
oct2char
(
unichar2oct
(
PX_IP_ADDRESS
,
"UTF-8"
))
&
"&latitude="
&
float2str
(
PX_UE_COORD_LAT
)
&
"&longitude="
&
float2str
(
PX_UE_COORD_LONG
),
"/"
&
PICS_ROOT_API
&
PX_UE_LOC_QRY_URI
&
"?address="
&
oct2char
(
unichar2oct
(
PX_IP_ADDRESS
,
"UTF-8"
))
&
"&latitude="
&
fx_
float2str
(
PX_UE_COORD_LAT
)
&
"&longitude="
&
fx_
float2str
(
PX_UE_COORD_LONG
),
v_headers
)
)
...
...
@@ -503,7 +503,7 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
httpPort
.
send
(
m_http_request
(
m_http_request_get
(
"/"
&
PICS_ROOT_API
&
PX_UE_LOC_QRY_URI
&
"?address="
&
oct2char
(
unichar2oct
(
PX_IP_ADDRESS
,
"UTF-8"
))
&
"&lat="
&
float2str
(
PX_UE_COORD_LAT
)
&
"&longitude="
&
float2str
(
PX_UE_COORD_LONG
),
"/"
&
PICS_ROOT_API
&
PX_UE_LOC_QRY_URI
&
"?address="
&
oct2char
(
unichar2oct
(
PX_IP_ADDRESS
,
"UTF-8"
))
&
"&lat="
&
fx_
float2str
(
PX_UE_COORD_LAT
)
&
"&longitude="
&
fx_
float2str
(
PX_UE_COORD_LONG
),
v_headers
)
)
...
...
ttcn/LibMec/Grant/ttcn/Grant_Pixits.ttcn
View file @
0609ee42
...
...
@@ -16,4 +16,4 @@ module Grant_Pixits {
modulepar
JSON
.
String
PX_NON_EXISTANT_GRANTING_ID
:=
"PX_NON_EXISTANT_GRANTING_ID"
;
}
}
// End of module Grant_Pixits
ttcn/LibMec/MeoPkgm/ttcn/MeoPkgm_Pixits.ttcn
View file @
0609ee42
...
...
@@ -34,4 +34,4 @@ module MeoPkgm_Pixits {
modulepar
NotificationType
PX_NOTIFICATION_TYPE
:=
ON_BOARDING
;
}
// End of module
LocationAPI
_Pixits
}
// End of module
MeoPkgm
_Pixits
ttcn/LibMec/MepmPkgm/ttcn/MepmPkgm_Pixits.ttcn
View file @
0609ee42
...
...
@@ -36,4 +36,4 @@ module MepmPkgm_Pixits {
modulepar
JSON
.
String
PX_APP_D_ID
:=
"5lkj4782-2c70-4e47-9a4e-0ee3a1a0fd1f"
;
}
// End of module
LocationAPI
_Pixits
}
// End of module
MepmPkgm
_Pixits
ttcn/LibMec/ttcn/LibMec_Functions.ttcn
View file @
0609ee42
...
...
@@ -122,6 +122,12 @@ module LibMec_Functions {
*/
external
function
fx_get_current_time_utc
()
return
UInt64
;
/**
* @desc Convert a float value into a string
* @return The string formated value
*/
external
function
fx_float2str
(
in
float
p_value
)
return
charstring
;
}
// End of group external_functions
group
helpers
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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