Skip to content
GitLab
Commit 30ac6997 authored by YannGarcia's avatar YannGarcia
Browse files

Review LocationAPI typing and Testing with try-mec.etsi.org

parent 85c5cdf8
Expand all Hide whitespace changes
Inline Side-by-side
etc/AtsMec/AtsMec.cfg deleted 100644 → 0
View file @ 85c5cdf8
[MODULE_PARAMETERS]
# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.
# IUT roles
LibCommon_Time.PX_TAC := 30.0
#LibCommon_Time.PX_TWAIT := 30.0
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;
LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;
LibItsHttp_Pics.PICS_HEADER_HOST := "172.22.1.6"
LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibItsHttp_Pics.PICS_USE_TOKEN_HEADER := true
#LibItsHttp_Pics.PICS_TOKEN_HEADER := "Basic WrongToken"
LibMec_Pics.PICS_ROOT_API := "etsi-013"
LibMec_Pics.PICS_ROOT_API := "etsi-013"
# LibMex_Pixits
LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI := "/location/v1/zones"
LibMec_Pixits.PX_ME_APP_Q_USERS_LIST_URI := "/location/v1/users"
LibMec_Pixits.PX_RNIS_SUBSCRITIONS_URI := "/rni/v1/subscriptions"
LibMec_Pixits.PX_RNIS_QUERIES_URI := "/rni/v1/queries"
LibMec_Pixits.PX_MEC_SVC_MGMT_APPS_URI := "/mec_service_mgmt/v1/applications"
# Mec-011 AppEnblementAPI
AppEnablementAPI_Pixits.PX_APP_INSTANCE_ID := "appInst01"
AppEnablementAPI_Pixits.PX_SERVICE_NAME := "serName"
AppEnablementAPI_Pixits.PX_SERVICE_ID := "serInst01"
AppEnablementAPI_Pixits.PX_SERVICE_INFO_VERSION := "1.0.0"
AppEnablementAPI_Pixits.PX_NEW_SERVICE_INFO_VERSION := "1.0.0"
AppEnablementAPI_Pixits.PX_SERVICE_INFO_STATE := ACTIVE
AppEnablementAPI_Pixits.PX_SUBSCRIPTION_ID := "7777"
AppEnablementAPI_Pixits.PX_DNS_RULE_ID := "route2home"
AppEnablementAPI_Pixits.PX_DOMAIN_NAME := "etsi.org"
AppEnablementAPI_Pixits.PX_IP_ADDRESS := "10.10.0.2"
AppEnablementAPI_Pixits.PX_TTL := 0
AppEnablementAPI_Pixits.PX_TRAFFIC_RULE_ID := "trafficRuleId01"
# Mec-012 RnisAPI
RnisAPI_Pixits.PX_SUBSCRIPTION_HREF_VALUE := "cell_change"
RnisAPI_Pixits.PX_SUBSCRIPTION_TYPE := CELL_CHANGE
RnisAPI_Pixits.PX_SUBSCRIPTION_ID := "7777"
RnisAPI_Pixits.PX_ASSOCIATE_ID_VALUE := "192.0.0.2"
RnisAPI_Pixits.PX_CELL_ID := "0x0800000A"
RnisAPI_Pixits.PX_C_ID := "0xFFFFFFFF"
RnisAPI_Pixits.PX_APP_INS_ID := "01"
RnisAPI_Pixits.PX_APP_ID := "19"
RnisAPI_Pixits.PX_E_RAB_ID := 0
RnisAPI_Pixits.PX_QCI := 0
# Mec-013 LocationAPI
LocationAPI_Pics.PICS_LOCATION_API_SUPPORTED := true
LocationAPI_Pixits.PX_ZONE_ID := "zone1"
LocationAPI_Pixits.PX_USER := "ue1"
LocationAPI_Pixits.PX_CLIENT_ID := "0123"
LocationAPI_Pixits.PX_SUBSCRIPTION_ID := "subscription0123"
UEidentityAPI_Pics.PICS_UE_IDENTITY_API_SUPPORTED := false
BwManagementAPI_Pics.PICS_BWMANAGEMENT_API_SUPPORTED := false
[LOGGING]
# In this section you can specify the name of the log file and the classes of events
# you want to log into the file or display on console (standard error).
LogFile := "../logs/%e.%h-%r.%s"
#FileMask := LOG_ALL | USER | DEBUG | MATCHING
#ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING
FileMask := LOG_ALL | USER | DEBUG | MATCHING
FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING
ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
LogSourceInfo := Stack
LogEntityName:= Yes
LogEventTypes:= Yes
#TimeStampFormat := DateTime
[TESTPORT_PARAMETERS]
# In this section you can specify parameters that are passed to Test Ports.
system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)"
system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.22.1.6,port=31007,use_ssl=0)"
#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=172.28.4.253,port=30007,use_ssl=0)"
system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"
system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=8081,use_ssl=0)"
[DEFINE]
# In this section you can create macro definitions,
# that can be used in other configuration file sections except [INCLUDE] and [ORDERED_INCLUDE].
[INCLUDE]
# To use configuration settings given in other configuration files,
# the configuration files just need to be listed in this section, with their full or relative pathnames.
[ORDERED_INCLUDE]
# To use configuration settings given in other configuration files,
# the configuration files just need to be listed in this section, with their full or relative pathnames.
[EXTERNAL_COMMANDS]
# This section can define external commands (shell scripts) to be executed by the ETS
# whenever a control part or test case is started or terminated.
#BeginTestCase := ""
#EndTestCase := ""
#BeginControlPart := ""
#EndControlPart := ""
[EXECUTE]
# In this section you can specify what parts of your test suite you want to execute.
#AtsMec_TestControl.control
#AtsMec_TestControl.control
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_OK
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_OK
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_BR
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_BR
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_NF
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_001_NF
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_OK
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_OK
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_BR
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF
# ETSI GS MEC 013
AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_002_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_002_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_002_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UETRACKSUB_002_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UEINFSUB_002_NF
#AtsMec_RadioNodeLocationAPI_TestCases.TP_MEC_SRV_RLOCLOOK_001_OK
#AtsMec_RadioNodeLocationAPI_TestCases.TP_MEC_SRV_RLOCLOOK_001_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_016_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_017_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_018_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_019_NF
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_001_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_001_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_002_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_002_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_003_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_003_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_004_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_004_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_005_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_005_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_006_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_006_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_007_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_007_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_008_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_008_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRANS_001_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRANS_001_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_001_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_001_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_002_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_002_OK
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_001_NF
#AtsMec_AppEnablementAPI_TestCases.TC_MEC_SRV_TRAF_001_NF
[GROUPS]
# In this section you can specify groups of hosts. These groups can be used inside the
# [COMPONENTS] section to restrict the creation of certain PTCs to a given set of hosts.
[COMPONENTS]
# This section consists of rules restricting the location of created PTCs.
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
KillTimer := 10.0
LocalAddress := 127.0.0.1
TCPPort := 12000
NumHCs := 1
etc/AtsMec/AtsMec_Sandbox.cf_
View file @ 30ac6997
......@@ -14,11 +14,11 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibItsHttp_Pics.PICS_USE_TOKEN_HEADER := true
#LibItsHttp_Pics.PICS_TOKEN_HEADER := "Basic WrongToken"
LibMec_Pics.PICS_ROOT_API := "sbxkklnnyi"
LibMec_Pics.PICS_ROOT_API := "sbxog70p4h" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'
# LibMex_Pixits
LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI := "/location/v2/zones"
LibMec_Pixits.PX_ME_APP_Q_USERS_LIST_URI := "/location/v2/users"
# LibMec_Pixits
LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI := "/location/v2/queries/zones"
LibMec_Pixits.PX_ME_APP_Q_USERS_LIST_URI := "/location/v2/queries/users"
LibMec_Pixits.PX_RNIS_SUBSCRITIONS_URI := "/rni/v2/subscriptions"
LibMec_Pixits.PX_RNIS_QUERIES_URI := "/rni/v2/queries"
LibMec_Pixits.PX_MEC_SVC_MGMT_APPS_URI := "/mec_service_mgmt/v2/applications"
......@@ -46,7 +46,7 @@ RnisAPI_Pixits.PX_SUBSCRIPTION_HREF_VALUE := "cell_change"
RnisAPI_Pixits.PX_SUBSCRIPTION_TYPE := CELL_CHANGE
RnisAPI_Pixits.PX_SUBSCRIPTION_ID := "7777"
RnisAPI_Pixits.PX_ASSOCIATE_ID_VALUE := "192.0.0.2"
RnisAPI_Pixits.PX_CELL_ID := "0x8080808"
RnisAPI_Pixits.PX_CELL_ID := "0x4040404"
RnisAPI_Pixits.PX_C_ID := "0xFFFFFFFF"
RnisAPI_Pixits.PX_APP_INS_ID := "01"
RnisAPI_Pixits.PX_APP_ID := "19"
......@@ -55,8 +55,9 @@ RnisAPI_Pixits.PX_QCI := 0
# Mec-013 LocationAPI
LocationAPI_Pics.PICS_LOCATION_API_SUPPORTED := true
LocationAPI_Pixits.PX_ZONE_ID := "zone01"
LocationAPI_Pixits.PX_USER := "10.100.0.1"
LocationAPI_Pixits.PX_ZONE_ID := "zone02"
LocationAPI_Pixits.PX_ACCESS_POINT_ID := "4g-macro-cell-4"
LocationAPI_Pixits.PX_USER := "10.10.0.1"
LocationAPI_Pixits.PX_CLIENT_ID := "0123"
LocationAPI_Pixits.PX_SUBSCRIPTION_ID := "subscription0123"
......@@ -68,11 +69,11 @@ BwManagementAPI_Pics.PICS_BWMANAGEMENT_API_SUPPORTED := false
# In this section you can specify the name of the log file and the classes of events
# you want to log into the file or display on console (standard error).
LogFile := "../logs/AtsNg112/%e.%h-%r.%s"
#FileMask := LOG_ALL | USER | DEBUG | MATCHING
#ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING
FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
LogFile := "../logs/AtsMec/%e.%h-%r.%s"
FileMask := LOG_ALL | USER | DEBUG | MATCHING
ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING
#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT
LogSourceInfo := Stack
LogEntityName:= Yes
LogEventTypes:= Yes
......@@ -116,7 +117,7 @@ system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-m
#AtsMec_UEidentityAPI_TestCases.TC_MEC_SRV_UETAG_002_PF
# ETSI GS MEC 013
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_BR
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCSUB_001_OK
......@@ -148,7 +149,7 @@ system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-m
#AtsMec_RadioNodeLocationAPI_TestCases.TC_MEC_SRV_UEDISTSUB_002_NF
# ETSI GS MEC 012
AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_OK
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_011_BR
#AtsMec_RnisAPI_TestCases.TC_MEC_SRV_RNIS_012_BR
......
scripts/run_all.bash
View file @ 30ac6997
......@@ -17,6 +17,12 @@ else
COUNTER=1
fi
if [ $COUNTER == 0 ]
then
COUNTER=1
cd .. && make && cd -
fi
CURPWD=`pwd`
if [ ! "${PWD##*/}" == "scripts" ]
then
......@@ -28,7 +34,7 @@ then
fi
fi
rm ../bin/S1/logs/merged.*.log
rm ../logs/$ATS/*.log
for i in $(seq 1 1 $COUNTER)
do
......
ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
View file @ 30ac6997
......@@ -73,12 +73,16 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response(
mw_http_response_ok(
mw_http_message_body_json(
mw_body_json_user_info(
mw_user_info(
PX_USER,
PX_ACCESS_POINT_ID,
PX_ZONE_ID,
PX_RESOURCE_URL
mw_body_json_user_list(
mw_user_list(
?/*{mw_user_info(
PX_USER,
PX_ACCESS_POINT_ID,
PX_ZONE_ID,
-,
PX_RESOURCE_URL
)}*/,
?
)))))) {
tc_ac.stop;
......
ttcn/AtsMec/AtsMec_RadioNodeLocationAPI_TestCases.ttcn
View file @ 30ac6997
......@@ -567,16 +567,14 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
m_http_message_body_json(
m_body_json_distance_notification_subscription(
m_distance_notification_subscription(
PX_CLIENT_ID, //clientCorrelator
PX_UE_DIST_SUB_CALLBACK_URI, // callbackReference
PX_UE_MONITORED_IP_ADDRESS, // monitoredAddress
PX_IP_ADDRESS // address
)
)
)
)
)
);
-, // checkImmediate
PX_CLIENT_ID, //clientCorrelator
-, // criteria
10.0, // distance
-,
PX_UE_MONITORED_IP_ADDRESS // monitoredAddress
))))));
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
......@@ -588,10 +586,11 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
mw_http_message_body_json(
mw_body_json_distance_notification_subscription(
mw_distance_notification_subscription(
PX_CLIENT_ID, //clientCorrelator
PX_UE_DIST_SUB_CALLBACK_URI, // callbackReference
PX_UE_MONITORED_IP_ADDRESS, // monitoredAddress
PX_IP_ADDRESS // address
-,
PX_CLIENT_ID, //clientCorrelator
-, -, -,
PX_UE_MONITORED_IP_ADDRESS // monitoredAddress
)))))) -> value v_response {
// TODO how to send this when the UE enters the area? The TP has the IUT doing this immediately. Do we want this or will it be discarded as part of the test?
//
......@@ -653,10 +652,14 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
// TODO the TP uses a wrong field name to trigger an error response. Do we create a new data structure just for this or
// change the test to use another trigger (e.g.: invalid IP address)?
m_distance_notification_subscription(
PX_CLIENT_ID, //clientCorrelator
PX_UE_DIST_SUB_CALLBACK_URI, // callbackReference
-, // checkImmediate
PX_CLIENT_ID, //clientCorrelator
-, // criteria
10.0, // distance
-, // frequency
PX_UE_MONITORED_IP_ADDRESS, // monitoredAddress
PX_IP_ADDRESS // address
{ PX_IP_ADDRESS } // referenceAddress
)
)
)
......@@ -1700,9 +1703,10 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
m_http_message_body_json(
m_body_json_periodic_notification_subscription(
m_periodic_notification_subscription(
PX_CLIENT_ID, //clientCorrelator
PX_IP_ADDRESS, // address
PX_USERTRACK_SUB_CALLBACK_URI, // callbackReference
PX_IP_ADDRESS // address
-, -,
PX_CLIENT_ID //clientCorrelator
)
)
)
......@@ -1720,9 +1724,10 @@ module AtsMec_RadioNodeLocationAPI_TestCases {
mw_http_message_body_json(
mw_body_json_periodic_notification_subscription(
mw_periodic_notification_subscription(
PX_CLIENT_ID, //clientCorrelator
PX_IP_ADDRESS, // address
PX_USERTRACK_SUB_CALLBACK_URI, // callbackReference
PX_IP_ADDRESS // address
-, -,
PX_CLIENT_ID //clientCorrelator
)))))) -> value v_response {
// TODO how to send this when the UE enters the area? The TP has the IUT doing this immediately. Do we want this or will it be discarded as part of the test?
// // MEC 013, clause 7.3.8.3
......
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Templates.ttcn
View file @ 30ac6997
......@@ -14,11 +14,13 @@ module LocationAPI_Templates {
in Address p_address := PX_USER,
in AccessPointId p_access_point_id := PX_ACCESS_POINT_ID,
in ZoneId p_zone_id := PX_ZONE_ID,
in TimeStamp p_timestamp,
in ResourceURL p_resource_url := PX_RESOURCE_URL
) := {
address_ := p_address,
accessPointId := p_access_point_id,
zoneId := p_zone_id,
timestamp_ := p_timestamp,
resourceURL := p_resource_url,
locationInfo := omit,
contextLocationInfo := omit,
......@@ -29,11 +31,13 @@ module LocationAPI_Templates {
template (present) Address p_address := ?,
template (present) AccessPointId p_access_point_id := ?,
template (present) ZoneId p_zone_id := ?,
template (present) TimeStamp p_timestamp := ?,
template (present) ResourceURL p_resource_url := ?
) := {
address_ := p_address,
accessPointId := p_access_point_id,
zoneId := p_zone_id,
timestamp_ := p_timestamp,
resourceURL := p_resource_url,
locationInfo := *,
contextLocationInfo := *,
......@@ -57,8 +61,8 @@ module LocationAPI_Templates {
} // End of template mw_user_list
template (value) LocationInfo m_location_info(
in JSON.Number p_latitude,
in JSON.Number p_longitude,
in Latitude p_latitude,
in Longitude p_longitude,
in Shape p_shape := POLYGON,
in VelocityType p_velocityType := HORIZONTAL_VERTICAL_UNCERT
) := {
......@@ -75,12 +79,13 @@ module LocationAPI_Templates {
offsetAngle := omit,
includedAngle := omit,
shape := p_shape,
timestamp_ := omit,
velocity := omit
} // End of template m_location_info
template (present) LocationInfo mw_location_info(
template (present) JSON.Number p_latitude := ?,
template (present) JSON.Number p_longitude := ?,
template (present) Latitude p_latitude := ?,
template (present) Longitude p_longitude := ?,
template (present) Shape p_shape := ?
) := {
latitude := p_latitude,
......@@ -96,6 +101,7 @@ module LocationAPI_Templates {
offsetAngle := *,
includedAngle := *,
shape := p_shape,
timestamp_ := *,
velocity := *
} // End of template mw_location_info
......@@ -245,24 +251,23 @@ module LocationAPI_Templates {
in template (value) JSON.Number p_frequency := 10.0,
in template (omit) ResourceURL p_resourceURL := omit
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
link := omit,
callbackReference := p_callbackReference,
requester := omit,
address_ := p_address,
latitude := p_latitude,
longitude := p_longitude,
radius := p_radius,
trackingAccuracy := p_trackingAccuracy,
address_ := p_address,
callbackReference := p_callbackReference,
checkImmediate := p_checkImmediate,
clientCorrelator := p_clientCorrelator,
count := omit,
duration := omit,
enteringLeavingCriteria := p_enteringLeavingCriteria,
checkImmediate := p_checkImmediate,
frequency := p_frequency,
duration := omit,
count := omit
frequency := p_frequency,
latitude := p_latitude,
link := omit,
longitude := p_longitude,
radius := p_radius,
requester := omit,
resourceURL := p_resourceURL,
trackingAccuracy := p_trackingAccuracy
} // End of template m_circle_notification_subscription
template CircleNotificationSubscription mw_circle_notification_subscription(
template ClientCorrelator p_clientCorrelator := *,
template (present) CallbackReference p_callbackReference := ?,
......@@ -276,81 +281,127 @@ module LocationAPI_Templates {
template (present) JSON.Number p_frequency := ?,
template ResourceURL p_resourceURL := *
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
link := *,
callbackReference := p_callbackReference,
requester := *,
address_ := p_address,
latitude := p_latitude,
longitude := p_longitude,
radius := p_radius,
trackingAccuracy := p_trackingAccuracy,
address_ := p_address,
callbackReference := p_callbackReference,
checkImmediate := p_checkImmediate,
clientCorrelator := p_clientCorrelator,
count := *,
duration := *,
enteringLeavingCriteria := p_enteringLeavingCriteria,
checkImmediate := p_checkImmediate,
frequency := p_frequency,
duration := *,
count := *
frequency := p_frequency,
latitude := p_latitude,
link := *,
longitude := p_longitude,
radius := p_radius,
requester := *,
resourceURL := p_resourceURL,
trackingAccuracy := p_trackingAccuracy
} // End of template m_wcircle_notification_subscription
template (value) TerminalDistance m_terminal_distance(in JSON.Number p_distance) := {
distance := p_distance,
accuracy := omit,
timestamp := omit
distance := p_distance,
accuracy := omit,
timestamp_ := omit
} // End of template m_terminal_distance
template (present) TerminalDistance mw_terminal_distance(template (present) JSON.Number p_distance := ?) := {
distance := p_distance,
accuracy := *,
timestamp := *
distance := p_distance,
accuracy := *,
timestamp_ := *
} // End of template mw_terminal_distance
template (omit) DistanceNotificationSubscription m_distance_notification_subscription(
in template (omit) ClientCorrelator p_clientCorrelator := omit,
in template (value) CallbackReference p_callbackReference,
in template (omit) ResourceURL p_resourceURL := omit,
in template (omit) Address p_address := omit
in template (value) JSON.Bool p_checkImmediate := true,
in template (omit) ClientCorrelator p_clientCorrelator := omit,
in template (value) DistanceCriteria p_criteria := AllWithinDistance,
in template (value) JSON.Number p_distance,
in template (value) JSON.Number p_frequency := 10.0,
in template (value) JSON.AnyURI p_monitoredAddress,
in template (omit) Addresses p_referenceAddress := omit,
in template (value) JSON.Number p_trackingAccuracy := 10.0,
in template (omit) ResourceURL p_resourceURL := omit
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
checkImmediate := p_checkImmediate,
clientCorrelator := p_clientCorrelator,