Skip to content
GitLab
Commit 71a9d199 authored by YannGarcia's avatar YannGarcia
Browse files

Finalyse RadioNetworkLocationAPI test cases

parent 835ae35e
Expand all Hide whitespace changes
Inline Side-by-side
etc/AtsMec/AtsMec_AdvantEDGE.cfg
View file @ 71a9d199
...@@ -49,6 +49,7 @@ LogEventTypes:= Yes ...@@ -49,6 +49,7 @@ LogEventTypes:= Yes
[TESTPORT_PARAMETERS] [TESTPORT_PARAMETERS]
# In this section you can specify parameters that are passed to Test Ports. # 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] [DEFINE]
...@@ -82,10 +83,10 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server ...@@ -82,10 +83,10 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
#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
#AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_OK # ETSI GS MEC 013
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
...@@ -106,6 +107,8 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF ...@@ -106,6 +107,8 @@ AtsMec_LocationAPI_TestCases.TC_MEC_SRV_UELOCLOOK_001_NF
#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_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
......
ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
View file @ 71a9d199
...@@ -177,7 +177,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -177,7 +177,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_get(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(NON_EXISTENT_ZONE_ID, "UTF-8")), "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LIST_URI & "?zoneId=" & oct2char(unichar2oct(PX_NON_EXISTENT_ZONE_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -259,11 +259,11 @@ module AtsMec_LocationAPI_TestCases { ...@@ -259,11 +259,11 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created( mw_http_response_201_created(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_user_tracking_subscription( mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response( mw_user_tracking_subscription(
PX_CLIENT_ID, PX_CLIENT_ID,
PX_CALLBACK_REF_URL, PX_CALLBACK_REF_URL,
PX_USER PX_USER
)))))) { )))))) {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***");
...@@ -367,7 +367,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -367,7 +367,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & PX_SUBSCRIPTION_ID, // TODO Shall be extract from Subscription request "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")), // TODO Shall be extract from Subscription request
v_headers v_headers
) )
) )
...@@ -421,7 +421,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -421,7 +421,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & PX_SUBSCRIPTION_ID_UNKNOWN, // TODO Shall be extract from Subscription request "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_LOC_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")), // TODO Shall be extract from Subscription request
v_headers v_headers
) )
) )
...@@ -479,7 +479,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -479,7 +479,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_post( m_http_request_post(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -494,11 +494,11 @@ module AtsMec_LocationAPI_TestCases { ...@@ -494,11 +494,11 @@ module AtsMec_LocationAPI_TestCases {
mw_http_response_201_created( mw_http_response_201_created(
mw_http_message_body_json( mw_http_message_body_json(
mw_body_json_user_tracking_subscription( mw_body_json_user_tracking_subscription(
mw_user_tracking_subscription_response( mw_user_tracking_subscription(
PX_CLIENT_ID, PX_CLIENT_ID,
PX_CALLBACK_REF_URL, PX_CALLBACK_REF_URL,
PX_USER PX_USER
)))))) { )))))) {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with a callbackURL ***");
...@@ -602,7 +602,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -602,7 +602,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
...@@ -656,7 +656,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -656,7 +656,7 @@ module AtsMec_LocationAPI_TestCases {
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_delete( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & PX_SUBSCRIPTION_ID_UNKNOWN, "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_TRACK_SUB_URI & "/" & oct2char(unichar2oct(PX_NON_EXISTENT_SUBSCRIPTION_ID, "UTF-8")),
v_headers v_headers
) )
) )
......
LibIts @ 3c0c0de3
Subproject commit 25c8a9e788ccd0fb17ef38dbf12b1a7e9a6c0085 Subproject commit 3c0c0de3330be31a4a670518770d7ef20dacf245
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn
View file @ 71a9d199
module LocationAPI_Pixits { module LocationAPI_Pixits {
// JSON
import from JSON all;
// LibCommon // LibCommon
import from LibCommon_BasicTypesAndValues all; import from LibCommon_BasicTypesAndValues all;
...@@ -14,15 +17,15 @@ module LocationAPI_Pixits { ...@@ -14,15 +17,15 @@ module LocationAPI_Pixits {
modulepar ClientCorrelator PX_CLIENT_ID_UNKNOWN := "0666"; modulepar ClientCorrelator PX_CLIENT_ID_UNKNOWN := "0666";
modulepar charstring PX_SUBSCRIPTION_ID := "subscription0123"; modulepar ClientCorrelator PX_SUBSCRIPTION_ID := "subscription0123";
modulepar charstring PX_SUBSCRIPTION_ID_UNKNOWN := "subscription0666"; modulepar ClientCorrelator PX_NON_EXISTENT_SUBSCRIPTION_ID := "subscription0666";
modulepar AccessPointId PX_ACCESS_POINT_ID := "zone1-poa1"; modulepar AccessPointId PX_ACCESS_POINT_ID := "zone1-poa1";
modulepar ZoneId PX_ZONE_ID := "zone1"; modulepar ZoneId PX_ZONE_ID := "zone1";
modulepar ZoneId NON_EXISTENT_ZONE_ID := "zone51"; modulepar ZoneId PX_NON_EXISTENT_ZONE_ID := "zone51";
modulepar ResourceURL PX_RESOURCE_URL := "http://meep-loc-serv/etsi-013/location/v1/users/ue1"; modulepar ResourceURL PX_RESOURCE_URL := "http://meep-loc-serv/etsi-013/location/v1/users/ue1";
...@@ -34,4 +37,40 @@ module LocationAPI_Pixits { ...@@ -34,4 +37,40 @@ module LocationAPI_Pixits {
modulepar CallbackReference PX_CALLBACK_REF_URL := { "http://clientApp.example.com/location_notifications/123456" }; modulepar CallbackReference PX_CALLBACK_REF_URL := { "http://clientApp.example.com/location_notifications/123456" };
modulepar JSON.AnyURI PX_UE_AREA_SUB_URI := "";
modulepar CallbackReference PX_UE_PERIODIC_SUB_CALLBACK_URI := { "" };
modulepar Address PX_IP_ADDRESS := "";
modulepar CallbackReference PX_AREA_SUB_CALLBACK_URI := { "" };
modulepar CallbackReference PX_UE_DIST_SUB_CALLBACK_URI := { "" };
modulepar Address PX_UE_MONITORED_IP_ADDRESS := "";
modulepar Address PX_ACR_UNKNOWN_IP := "";
modulepar Address PX_UE_ZONAL_TRAF_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_LOC_QRY_URI := "";
modulepar JSON.Number PX_UE_COORD_LAT := 0.0;
modulepar JSON.Number PX_UE_COORD_LONG := 0.0;
modulepar JSON.AnyURI PX_UE_LOC_USERS_URI := "";
modulepar Address PX_ACR_SOME_IP := "";
modulepar JSON.AnyURI PX_UE_DIST_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_PERIODIC_SUB_URI := "";
modulepar JSON.AnyURI PX_UE_LOC_USERTRACK_SUB_URI := "";
modulepar CallbackReference PX_USERTRACK_SUB_CALLBACK_URI := { "" };
modulepar CallbackReference PX_TRAFFIC_SUB_CALLBACK_URI := { "" };
} // End of module LocationAPI_Pixits } // End of module LocationAPI_Pixits
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Templates.ttcn
View file @ 71a9d199
...@@ -139,13 +139,13 @@ module LocationAPI_Templates { ...@@ -139,13 +139,13 @@ module LocationAPI_Templates {
resourceURL := omit resourceURL := omit
} // End of template m_user_tracking_subscription } // End of template m_user_tracking_subscription
template (present) UserTrackingSubscription mw_user_tracking_subscription_response( template (present) UserTrackingSubscription mw_user_tracking_subscription(
template (present) ClientCorrelator p_clientCorrelator := ?, template (present) ClientCorrelator p_clientCorrelator := ?,
template (present) CallbackReference p_callbackReference := ?, template (present) CallbackReference p_callbackReference := ?,
template (present) Address p_address := PX_USER, template (present) Address p_address := PX_USER,
template (present) UserEventCriteria p_userEventCriteria := { Transferring }, template (present) UserEventCriteria p_userEventCriteria := { Transferring },
template (present) ResourceURL p_resourceURL := ? template (present) ResourceURL p_resourceURL := ?
) := { ) := {
clientCorrelator := p_clientCorrelator, clientCorrelator := p_clientCorrelator,
callbackReference := p_callbackReference, callbackReference := p_callbackReference,
address_ := p_address, address_ := p_address,
...@@ -181,4 +181,83 @@ module LocationAPI_Templates { ...@@ -181,4 +181,83 @@ module LocationAPI_Templates {
resourceURL := * resourceURL := *
} // End of template mw_zonal_traffic_subscription } // End of template mw_zonal_traffic_subscription
template (omit) CircleNotificationSubscription m_circle_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
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference
} // End of template m_circle_notification_subscription
template CircleNotificationSubscription mw_circle_notification_subscription(
template ClientCorrelator p_clientCorrelator := *,
template (present) CallbackReference p_callbackReference := ?,
template ResourceURL p_resourceURL := *,
template Address p_address := *
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
} // End of template m_wcircle_notification_subscription
template (value) TerminalDistance m_terminal_distance(in JSON.Number p_distance) := {
distance := p_distance
} // End of template m_terminal_distance
template (present) TerminalDistance mw_terminal_distance(template (present) JSON.Number p_distance := ?) := {
distance := p_distance
} // 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
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
} // End of template m_distance_notification_subscription
template DistanceNotificationSubscription mw_distance_notification_subscription(
template ClientCorrelator p_clientCorrelator := *,
template (present) CallbackReference p_callbackReference := ?,
template ResourceURL p_resourceURL := *,
template Address p_address := *
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
} // End of template mw_distance_notification_subscription
template (omit) PeriodicNotificationSubscription m_periodic_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
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
} // End of template m_periodic_notification_subscription
template PeriodicNotificationSubscription mw_periodic_notification_subscription(
template ClientCorrelator p_clientCorrelator := *,
template (present) CallbackReference p_callbackReference := ?,
template ResourceURL p_resourceURL := *,
template Address p_address := *
) := {
clientCorrelator := p_clientCorrelator,
resourceURL := p_resourceURL,
callbackReference := p_callbackReference,
address_ := p_address
} // End of template mw_periodic_notification_subscription
} // End of module LocationAPI_Templates } // End of module LocationAPI_Templates
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_TypesAndValues.ttcn
View file @ 71a9d199
...@@ -385,7 +385,38 @@ REST_NetAPI_Common]. ...@@ -385,7 +385,38 @@ REST_NetAPI_Common].
NumberOfUsersAPThreshold numberOfUsersAPThreshold optional, NumberOfUsersAPThreshold numberOfUsersAPThreshold optional,
OperationStatus operationStatus optional OperationStatus operationStatus optional
} }
type record CircleNotificationSubscription { // FIXME Incomplete data structure desciption
ClientCorrelator clientCorrelator optional,
ResourceURL resourceURL optional,
CallbackReference callbackReference,
Address address_ optional
} with {
variant (address_) "name as 'address'";
}
type record TerminalDistance {
JSON.Number distance
}
type record DistanceNotificationSubscription { // FIXME Incomplete data structure desciption
ClientCorrelator clientCorrelator optional,
ResourceURL resourceURL optional,
CallbackReference callbackReference,
Address address_ optional
} with {
variant (address_) "name as 'address'";
}
type record PeriodicNotificationSubscription { // FIXME Incomplete data structure desciption
ClientCorrelator clientCorrelator optional,
ResourceURL resourceURL optional,
CallbackReference callbackReference,
Address address_ optional
} with {
variant (address_) "name as 'address'";
}
} with { } with {
encode "JSON" encode "JSON"
} }
ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn
View file @ 71a9d199
...@@ -39,6 +39,10 @@ module LibItsHttp_JsonMessageBodyTypes { ...@@ -39,6 +39,10 @@ module LibItsHttp_JsonMessageBodyTypes {
AccessPointList accessPointList, AccessPointList accessPointList,
UserTrackingSubscription userTrackingSubscription, UserTrackingSubscription userTrackingSubscription,
ZonalTrafficSubscription zonalTrafficSubscription, ZonalTrafficSubscription zonalTrafficSubscription,
CircleNotificationSubscription circleNotificationSubscription,
TerminalDistance terminalDistance,
DistanceNotificationSubscription distanceNotificationSubscription,
PeriodicNotificationSubscription periodicNotificationSubscription,
UEidentityAPI_TypesAndValues.ProblemDetails problemDetails_ue_identity, UEidentityAPI_TypesAndValues.ProblemDetails problemDetails_ue_identity,
UeIdentityTagInfo ueIdentityTagInfo, UeIdentityTagInfo ueIdentityTagInfo,
RnisAPI_TypesAndValues.SubscriptionLinkList subscriptionLinkList, RnisAPI_TypesAndValues.SubscriptionLinkList subscriptionLinkList,
......
ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn
View file @ 71a9d199
...@@ -467,6 +467,54 @@ group ams_api { ...@@ -467,6 +467,54 @@ group ams_api {
zonalTrafficSubscription := p_zonal_traffic_subscription zonalTrafficSubscription := p_zonal_traffic_subscription
} // End of template mw_body_json_zonal_traffic_subscription } // End of template mw_body_json_zonal_traffic_subscription
template (value) JsonBody m_body_json_circle_notification_subscription(
in template (value) CircleNotificationSubscription p_circle_notification_subscription
) := {
circleNotificationSubscription := p_circle_notification_subscription
} // End of template m_body_json_circle_notification_subscription
template (present) JsonBody mw_body_json_circle_notification_subscription(
template (present) CircleNotificationSubscription p_circle_notification_subscription := ?
) := {
circleNotificationSubscription := p_circle_notification_subscription
} // End of template mw_body_json_circle_notification_subscription
template (value) JsonBody m_body_json_terminal_distance(
in template (value) TerminalDistance p_terminal_distance
) := {
terminalDistance := p_terminal_distance
} // End of template m_body_json_terminal_distance
template (present) JsonBody mw_body_json_terminal_distance(
template (present) TerminalDistance p_terminal_distance := ?
) := {
terminalDistance := p_terminal_distance
} // End of template mw_body_json_terminal_distance
template (value) JsonBody m_body_json_distance_notification_subscription(
in template (value) DistanceNotificationSubscription p_distance_notification_subscription
) := {
distanceNotificationSubscription := p_distance_notification_subscription
} // End of template m_body_json_distance_notification_subscription
template (present) JsonBody mw_body_json_distance_notification_subscription(
template (present) DistanceNotificationSubscription p_distance_notification_subscription := ?
) := {
distanceNotificationSubscription := p_distance_notification_subscription
} // End of template mw_body_json_distance_notification_subscription
template (value) JsonBody m_body_json_periodic_notification_subscription(
in template (value) PeriodicNotificationSubscription p_periodic_notification_subscription
) := {
distanceNotificationSubscription := p_periodic_notification_subscription
} // End of template m_body_json_periodic_notification_subscription
template (present) JsonBody mw_body_json_periodic_notification_subscription(
template (present) PeriodicNotificationSubscription p_periodic_notification_subscription := ?
) := {
distanceNotificationSubscription := p_periodic_notification_subscription
} // End of template mw_body_json_periodic_notification_subscription
} // End of group location_api } // End of group location_api
group ue_identity_api { group ue_identity_api {
......
Supports Markdown
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