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

Review TP_MEC_SRV_UELOCSUB_001_OK TP_MEC_SRV_UELOCSUB_001_BR... 

Review TP_MEC_SRV_UELOCSUB_001_OK TP_MEC_SRV_UELOCSUB_001_BR TP_MEC_SRV_UELOCSUB_002_OK TP_MEC_SRV_UELOCSUB_002_NF
parent 97c12f07
Expand all Show whitespace changes
Inline Side-by-side
ttcn/AtsMec/AtsMec_LocationAPI_TestCases.ttcn
View file @ f6dad4d0
...@@ -202,14 +202,13 @@ module AtsMec_LocationAPI_TestCases { ...@@ -202,14 +202,13 @@ module AtsMec_LocationAPI_TestCases {
} // End of group ueLocationLookup } // End of group ueLocationLookup
group subscription { group ueLocSub {
/** /**
* @desc Check that the IUT acknowledges the UE location change subscription request when commanded by a MEC Application and notifies it when the location changes * @desc Check that the IUT acknowledges the UE location change subscription request when commanded by a MEC Application and notifies it when the location changes
* @see https://forge.etsi.org/gitlab/mec/MEC-tests/blob/master/Test%20Purposes/Plat/Mp1/UeLocation/PlatUeLocation.tplan2 * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UELOCSUB/PlatUeLocationSubscription.tplan2
* @see https://forge.etsi.org/gitlab/mec/gs013-location-api/blob/master/LocationAPI.yaml#/definitions/UserTrackingSubscription
*/ */
testcase TC_MEC_PLAT_LOCSUB_001_OK() runs on HttpComponent system HttpTestAdapter { testcase TC_MEC_SRV_UELOCSUB_001_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables // Local variables
var HeaderLines v_headers; var HeaderLines v_headers;
...@@ -270,13 +269,74 @@ module AtsMec_LocationAPI_TestCases { ...@@ -270,13 +269,74 @@ module AtsMec_LocationAPI_TestCases {
// Postamble // Postamble
f_cf_01_http_down(); f_cf_01_http_down();
} // End of testcase TC_MEC_PLAT_LOCSUB_001_OK } // End of testcase TC_MEC_SRV_UELOCSUB_001_OK
/**
* @desc Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
* @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UELOCSUB/PlatUeLocationSubscription.tplan2
*/
testcase TC_MEC_SRV_UELOCSUB_001_BR() runs on HttpComponent system HttpTestAdapter {
// Local variables
var HeaderLines v_headers;
// Test control
if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc);
stop;
}
// Test component configuration
f_cf_01_http_up();
// Test adapter configuration
// Preamble
f_init_default_headers_list(-, -, v_headers);
httpPort.send(
m_http_request(
m_http_request_post(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_SUB_URI,
v_headers,
m_http_message_body_json(
m_body_json_user_tracking_subscription(
m_user_tracking_subscription(
PX_CLIENT_ID_UNKNOWN,
PX_CALLBACK_REF_URL,
PX_USER
)
)
)
)
)
);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_400_bad_request
)) {
log("*** " & testcasename() & ": PASS: IUT successfully responds with 400 Bad Request ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
// Postamble
f_cf_01_http_down();
} // End of testcase TC_MEC_SRV_UELOCSUB_001_BR
/** /**
* @desc Check that the IUT acknowledges the cancellation of UE location change notifications when commanded by a MEC Application * @desc Check that the IUT acknowledges the cancellation of UE location change notifications when commanded by a MEC Application
* @see https://forge.etsi.org/gitlab/mec/MEC-tests/blob/master/Test%20Purposes/Plat/Mp1/UeLocation/PlatUeLocation.tplan2 * @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UELOCSUB/PlatUeLocationSubscription.tplan2
*/ */
testcase TC_MEC_PLAT_LOCSUB_002_OK() runs on HttpComponent system HttpTestAdapter { testcase TC_MEC_SRV_UELOCSUB_002_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables // Local variables
var HeaderLines v_headers; var HeaderLines v_headers;
...@@ -296,7 +356,7 @@ module AtsMec_LocationAPI_TestCases { ...@@ -296,7 +356,7 @@ module AtsMec_LocationAPI_TestCases {
f_init_default_headers_list(-, -, v_headers); f_init_default_headers_list(-, -, v_headers);
httpPort.send( httpPort.send(
m_http_request( m_http_request(
m_http_request_get( m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_SUB_URI & "/" & PX_SUBSCRIPTION_ID, // TODO Shall be extract from Subscription request "/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_SUB_URI & "/" & PX_SUBSCRIPTION_ID, // TODO Shall be extract from Subscription request
v_headers v_headers
) )
...@@ -309,9 +369,61 @@ module AtsMec_LocationAPI_TestCases { ...@@ -309,9 +369,61 @@ module AtsMec_LocationAPI_TestCases {
alt { alt {
[] httpPort.receive( [] httpPort.receive(
mw_http_response( mw_http_response(
mw_http_response_ok mw_http_response_204_no_content
)) {
log("*** " & testcasename() & ": PASS: IUT successfully responds with 204 No Content ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
}
[] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected message not received ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
// Postamble
f_cf_01_http_down();
} // End of testcase TC_MEC_SRV_UELOCSUB_002_OK
/**
* @desc Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application
* @see https://forge.etsi.org/gitlab/mec/gs032p2-test-purposes/blob/remove-401s/Test%20Purposes/SRV/UELOCSUB/PlatUeLocationSubscription.tplan2
*/
testcase TC_MEC_SRV_UELOCSUB_002_NF() runs on HttpComponent system HttpTestAdapter {
// Local variables
var HeaderLines v_headers;
// Test control
if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_LOCATION_API_SUPPORTED)) {
log("*** " & testcasename() & ": PICS_MEC_PLAT and PICS_SERVICES and PICS_LOCATION_API_SUPPORTED required for executing the TC ***");
setverdict(inconc);
stop;
}
// Test component configuration
f_cf_01_http_up();
// Test adapter configuration
// Preamble
f_init_default_headers_list(-, -, v_headers);
httpPort.send(
m_http_request(
m_http_request_delete(
"/" & PICS_ROOT_API & PX_ME_APP_Q_USERS_SUB_URI & "/" & PX_SUBSCRIPTION_ID_UNKNOWN, // TODO Shall be extract from Subscription request
v_headers
)
)
);
f_selfOrClientSyncAndVerdict(c_prDone, e_success);
// Test Body
tc_ac.start;
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_404_not_found
)) { )) {
log("*** " & testcasename() & ": PASS: IUT successfully cancel subscription ***"); log("*** " & testcasename() & ": PASS: IUT successfully responds with 404 Not Found ***");
f_selfOrClientSyncAndVerdict(c_tbDone, e_success); f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
} }
[] tc_ac.timeout { [] tc_ac.timeout {
...@@ -322,8 +434,8 @@ module AtsMec_LocationAPI_TestCases { ...@@ -322,8 +434,8 @@ module AtsMec_LocationAPI_TestCases {
// Postamble // Postamble
f_cf_01_http_down(); f_cf_01_http_down();
} // End of testcase TC_MEC_PLAT_LOCSUB_002_OK } // End of testcase TC_MEC_SRV_UELOCSUB_002_NF
} // End of group subscription } // End of group ueLocSub
} // End of module AtsMec_LocationAPI_TestCases } // End of module AtsMec_LocationAPI_TestCases
ttcn/AtsMec/AtsMec_TestControl.ttcn
View file @ f6dad4d0
...@@ -28,19 +28,18 @@ module AtsMec_TestControl { ...@@ -28,19 +28,18 @@ module AtsMec_TestControl {
execute(TC_MEC_SRV_UELOC_001_BR()); execute(TC_MEC_SRV_UELOC_001_BR());
execute(TC_MEC_SRV_UELOC_001_NF()); execute(TC_MEC_SRV_UELOC_001_NF());
execute(TC_MEC_PLAT_INFLOOK_001_OK()); execute(TC_MEC_PLAT_INFLOOK_001_OK());
execute(TC_MEC_PLAT_LOCSUB_001_OK()); execute(TC_MEC_SRV_UELOCSUB_001_OK());
execute(TC_MEC_PLAT_LOCSUB_002_OK()); execute(TC_MEC_SRV_UELOCSUB_001_BR());
execute(TC_MEC_SRV_UELOCSUB_002_OK());
execute(TC_MEC_SRV_UELOCSUB_002_NF());
execute(TC_MEC_PLAT_RLOC_001_OK()); execute(TC_MEC_PLAT_RLOC_001_OK());
} }
if (PICS_UE_IDENTITY_API_SUPPORTED) { if (PICS_UE_IDENTITY_API_SUPPORTED) {
execute(TC_MEC_PLAT_UETAG_001_OK()); execute(TC_MEC_SRV_UETAG_001_OK());
execute(TC_MEC_PLAT_UETAG_002_OK()); execute(TC_MEC_SRV_UETAG_001_BR());
execute(TC_MEC_PLAT_UETAG_003_OK()); execute(TC_MEC_SRV_UETAG_001_NF());
execute(TC_MEC_PLAT_UETAG_001_BI()); execute(TC_MEC_SRV_UETAG_002_OK());
execute(TC_MEC_PLAT_UETAG_002_BI()); execute(TC_MEC_SRV_UETAG_002_BR());
execute(TC_MEC_PLAT_UETAG_003_BI());
execute(TP_MEC_PLAT_UETAG_004_BI());
execute(TP_MEC_PLAT_UETAG_005_BI());
} }
} }
......
ttcn/LibMec/LocationAPI/ttcn/LocationAPI_Pixits.ttcn
View file @ f6dad4d0
...@@ -10,8 +10,12 @@ module LocationAPI_Pixits { ...@@ -10,8 +10,12 @@ module LocationAPI_Pixits {
modulepar ClientCorrelator PX_CLIENT_ID := "0123"; modulepar ClientCorrelator PX_CLIENT_ID := "0123";
modulepar ClientCorrelator PX_CLIENT_ID_UNKNOWN := "0666";
modulepar charstring PX_SUBSCRIPTION_ID := "subscription0123"; modulepar charstring PX_SUBSCRIPTION_ID := "subscription0123";
modulepar charstring PX_SUBSCRIPTION_ID_UNKNOWN := "subscription0666";
modulepar AccessPointId PX_ACCESS_POINT_ID := "001010000000000000000000000000001"; modulepar AccessPointId PX_ACCESS_POINT_ID := "001010000000000000000000000000001";
modulepar ZoneId PX_ZONE_ID := "zone01"; modulepar ZoneId PX_ZONE_ID := "zone01";
......
ttcn/LibMec/UEidentityAPI/ttcn/UEidentityAPI_Pixits.ttcn
View file @ f6dad4d0
...@@ -10,8 +10,6 @@ module UEidentityAPI_Pixits { ...@@ -10,8 +10,6 @@ module UEidentityAPI_Pixits {
modulepar universal charstring PX_NON_EXISTENT_APP_INSTANCE_ID := "appInst99"; modulepar universal charstring PX_NON_EXISTENT_APP_INSTANCE_ID := "appInst99";
modulepar universal charstring PX_APP_INSTANCE_ID_UNAUTHORIZED := "appInst98";
modulepar universal charstring PX_UE_IDENTITY_TAG := "UeTagA"; modulepar universal charstring PX_UE_IDENTITY_TAG := "UeTagA";
modulepar universal charstring PX_UE_IDENTITY_TAG_UNKNOWN := "UeTagW"; modulepar universal charstring PX_UE_IDENTITY_TAG_UNKNOWN := "UeTagW";
......
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