Skip to content
GitLab
Commit c56308e2 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'v2.1.1-dev'

parents 3ef2a297 6aad2ffd
Expand all Hide whitespace changes
Inline Side-by-side
ttcn/AtsMec/AtsMec_Grant_TestCases.ttcn
View file @ c56308e2
......@@ -7,7 +7,7 @@
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
* @see ETSI GS MEC 003, Draft ETSI GS MEC 013 V2.0.3 (2018-10)
* @see ETSI GS MEC 003, Draft ETSI GS MEC 010-2 V2.1.1
*/
module AtsMec_Grant_TestCases {
......@@ -39,7 +39,7 @@ group grant {
* ETSI GS MEC 010-2 2.0.10, Table 6.2.4.2.2-1, //GrantRequest
* ETSI GS MEC 010-2 2.0.10, Table 6.2.4.4.2-1 //Grant
*/
testcase TC_MEC_MEO_GRANT_001_OK() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_001_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -95,7 +95,7 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_001_OK
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_001_OK
......@@ -104,7 +104,7 @@ group grant {
* ETSI GS MEC 010-2 2.0.10, clause 7.6.1.3.1,
* ETSI GS MEC 010-2 2.0.10, Table 6.2.4.2.2-1, //GrantRequest
*/
testcase TC_MEC_MEO_GRANT_001_BR() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_001_BR() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -157,7 +157,7 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_001_BR
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_001_BR
/**
......@@ -165,7 +165,7 @@ group grant {
* ETSI GS MEC 010-2 2.0.10, clause 7.6.1.3.1,
* ETSI GS MEC 010-2 2.0.10, Table 6.2.4.2.2-1, //GrantRequest
*/
testcase TC_MEC_MEO_GRANT_002_OK() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_002_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -219,14 +219,14 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_002_OK
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_002_OK
/**
* @desc: Check that MEO sends the status of a grant request when a query on a granting ID is performed
* ETSI GS MEC 010-2 2.0.10, clause 7.6.1.3.2,
*/
testcase TC_MEC_MEO_GRANT_003_OK() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_003_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -271,14 +271,14 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_003_OK
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_003_OK
/**
* @desc: Check that MEO responds with an error when it receives a request for returning a grant referred with a wrong ID
* ETSI GS MEC 010-2 2.0.10, clause 7.6.1.3.2
*/
testcase TC_MEC_MEO_GRANT_003_NF() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_003_NF() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -331,7 +331,7 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_003_NF
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_003_NF
/**
......@@ -339,7 +339,7 @@ group grant {
* ETSI GS MEC 010-2 2.0.10, clause 7.6.1.3.2
* ETSI GS MEC 010-2 2.0.10, Table 6.2.4.4.2-1 //Grant
*/
testcase TC_MEC_MEO_GRANT_004_OK() runs on HttpComponent system HttpTestAdapter {
testcase TC_MEC_MEC010p2_MEO_GRANT_004_OK() runs on HttpComponent system HttpTestAdapter {
// Local variables
var Headers v_headers;
var HttpMessage v_response;
......@@ -388,7 +388,7 @@ group grant {
f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);
}
} // End of 'alt' statement
} // End of testcase TC_MEC_MEO_GRANT_004_OK
} // End of testcase TC_MEC_MEC010p2_MEO_GRANT_004_OK
}
......
ttcn/AtsMec/AtsMec_MeoPkgm_TestCases.ttcn
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/AtsMec_MepmPkgm_TestCases.ttcn
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/AtsMec_RnisAPI_TestCases.ttcn
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/AtsMec_TestControl.ttcn
View file @ c56308e2
......@@ -6,8 +6,8 @@ module AtsMec_TestControl {
import from UEidentityAPI_Pics all;
// LibMec/RnisAPI
import from RnisAPI_Pics all;
// LibMec/BwManagementAPI
import from BwManagementAPI_Pics all;
// LibMec/TrafficManagementAPI
import from TrafficManagementAPI_Pics all;
// LibMec/AppEnablementAPI
import from AppEnablementAPI_Pics all;
// LibMec/UEAppInterfaceAPI
......@@ -21,7 +21,7 @@ module AtsMec_TestControl {
import from AtsMec_UEidentityAPI_TestCases all;
// import from AtsMec_RadioNodeLocationAPI_TestCases all;
import from AtsMec_RnisAPI_TestCases all;
import from AtsMec_BwManagementAPI_TestCases all;
import from AtsMec_TrafficManagementAPI_TestCases all;
import from AtsMec_AppEnablementAPI_TestCases all;
import from AtsMec_UEAppInterfaceAPI_TestCases all;
......@@ -29,36 +29,36 @@ module AtsMec_TestControl {
if (PICS_MEC_PLAT and PICS_SERVICES) {
if (PICS_UE_IDENTITY_API_SUPPORTED) {
execute(TC_MEC_SRV_UETAG_001_OK());
execute(TC_MEC_SRV_UETAG_001_BR());
execute(TC_MEC_SRV_UETAG_001_NF());
execute(TC_MEC_SRV_UETAG_002_OK());
execute(TC_MEC_SRV_UETAG_002_BR());
execute(TC_MEC_SRV_UETAG_002_PF());
execute(TC_MEC_MEC014_SRV_UETAG_001_OK());
execute(TC_MEC_MEC014_SRV_UETAG_001_BR());
execute(TC_MEC_MEC014_SRV_UETAG_001_NF());
execute(TC_MEC_MEC014_SRV_UETAG_002_OK());
execute(TC_MEC_MEC014_SRV_UETAG_002_BR());
execute(TC_MEC_MEC014_SRV_UETAG_002_PF());
}
if (PICS_LOCATION_API_SUPPORTED) {
execute(TC_MEC_SRV_UELOCLOOK_001_OK());
execute(TC_MEC_SRV_UELOCLOOK_001_BR());
execute(TC_MEC_SRV_UELOCLOOK_001_NF());
execute(TC_MEC_MEC013_SRV_UELOCLOOK_001_OK());
execute(TC_MEC_MEC013_SRV_UELOCLOOK_001_BR());
execute(TC_MEC_MEC013_SRV_UELOCLOOK_001_NF());
execute(TC_MEC_SRV_UELOCSUB_001_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_MEC013_SRV_UELOCSUB_001_OK());
execute(TC_MEC_MEC013_SRV_UELOCSUB_001_BR());
execute(TC_MEC_MEC013_SRV_UELOCSUB_002_OK());
execute(TC_MEC_MEC013_SRV_UELOCSUB_002_NF());
execute(TC_MEC_SRV_UETRACKSUB_001_OK());
execute(TC_MEC_SRV_UETRACKSUB_001_BR());
execute(TC_MEC_SRV_UETRACKSUB_002_OK());
execute(TC_MEC_SRV_UETRACKSUB_002_NF());
execute(TC_MEC_MEC013_SRV_UETRACKSUB_001_OK());
execute(TC_MEC_MEC013_SRV_UETRACKSUB_001_BR());
execute(TC_MEC_MEC013_SRV_UETRACKSUB_002_OK());
execute(TC_MEC_MEC013_SRV_UETRACKSUB_002_NF());
execute(TC_MEC_SRV_UEINFLOOK_001_OK());
execute(TC_MEC_SRV_UEINFLOOK_001_BR());
execute(TC_MEC_SRV_UEINFLOOK_001_NF());
execute(TC_MEC_MEC013_SRV_UEINFLOOK_001_OK());
execute(TC_MEC_MEC013_SRV_UEINFLOOK_001_BR());
execute(TC_MEC_MEC013_SRV_UEINFLOOK_001_NF());
execute(TC_MEC_SRV_UEINFSUB_001_OK());
execute(TC_MEC_SRV_UEINFSUB_001_BR());
execute(TC_MEC_SRV_UEINFSUB_002_OK());
execute(TC_MEC_SRV_UEINFSUB_002_NF());
execute(TC_MEC_MEC013_SRV_UEINFSUB_001_OK());
execute(TC_MEC_MEC013_SRV_UEINFSUB_001_BR());
execute(TC_MEC_MEC013_SRV_UEINFSUB_002_OK());
execute(TC_MEC_MEC013_SRV_UEINFSUB_002_NF());
// execute(TC_MEC_PLAT_RLOC_001_OK());
// execute(TC_MEC_PLAT_RLOC_001_NF());
......@@ -73,64 +73,53 @@ module AtsMec_TestControl {
}
if (PICS_ENABLE_UE_APP_CTX) {
execute(TC_MEC_MEO_UEAPPCTX_001_OK());
execute(TC_MEC_MEO_UEAPPCTX_001_BR());
execute(TC_MEC_MEO_UEAPPCTX_002_OK());
execute(TC_MEC_MEO_UEAPPCTX_002_BR());
execute(TC_MEC_MEO_UEAPPCTX_002_NF());
execute(TC_MEC_MEO_UEAPPCTX_003_OK());
execute(TC_MEC_MEO_UEAPPCTX_003_NF());
execute(TC_MEC_MEO_UEAPPS_001_OK());
execute(TC_MEC_MEO_UEAPPS_001_BR());
execute(TC_MEC_MEO_UEAPPS_001_NF());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_001_OK());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_001_BR());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_002_OK());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_002_BR());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_002_NF());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_003_OK());
execute(TC_MEC_MEC016_MEO_UEAPPCTX_003_NF());
execute(TC_MEC_MEC016_MEO_UEAPPS_001_OK());
execute(TC_MEC_MEC016_MEO_UEAPPS_001_BR());
execute(TC_MEC_MEC016_MEO_UEAPPS_001_NF());
}
}
if (PICS_RNIS) {
if (PICS_RNIS_ALL_SUBSCRIPTIONS) {
execute(TC_MEC_SRV_RNIS_011_OK());
execute(TC_MEC_SRV_RNIS_012_OK());
execute(TC_MEC_SRV_RNIS_011_BR());
execute(TC_MEC_SRV_RNIS_012_BR());
execute(TC_MEC_MEC012_SRV_RNIS_011_OK());
execute(TC_MEC_MEC012_SRV_RNIS_012_OK());
execute(TC_MEC_MEC012_SRV_RNIS_011_BR());
execute(TC_MEC_MEC012_SRV_RNIS_012_BR());
}
if (PICS_RNIS_QUERY) {
execute(TC_MEC_SRV_RNIS_016_OK());
execute(TC_MEC_SRV_RNIS_016_BR());
execute(TC_MEC_SRV_RNIS_016_NF());
execute(TC_MEC_SRV_RNIS_017_OK());
execute(TC_MEC_SRV_RNIS_017_BR());
execute(TC_MEC_SRV_RNIS_017_NF());
execute(TC_MEC_SRV_RNIS_018_OK());
execute(TC_MEC_SRV_RNIS_018_BR());
execute(TC_MEC_SRV_RNIS_018_NF());
execute(TC_MEC_SRV_RNIS_019_OK());
execute(TC_MEC_SRV_RNIS_019_BR());
execute(TC_MEC_SRV_RNIS_019_NF());
execute(TC_MEC_MEC012_SRV_RNIS_016_OK());
execute(TC_MEC_MEC012_SRV_RNIS_016_BR());
execute(TC_MEC_MEC012_SRV_RNIS_016_NF());
execute(TC_MEC_MEC012_SRV_RNIS_017_OK());
execute(TC_MEC_MEC012_SRV_RNIS_017_BR());
execute(TC_MEC_MEC012_SRV_RNIS_017_NF());
execute(TC_MEC_MEC012_SRV_RNIS_018_OK());
execute(TC_MEC_MEC012_SRV_RNIS_018_BR());
execute(TC_MEC_MEC012_SRV_RNIS_018_NF());
execute(TC_MEC_MEC012_SRV_RNIS_019_OK());
execute(TC_MEC_MEC012_SRV_RNIS_019_BR());
execute(TC_MEC_MEC012_SRV_RNIS_019_NF());
}
if (PICS_RNIS_NOTIFICATIONS) {
execute(TC_MEC_SRV_RNIS_001_OK());
execute(TC_MEC_SRV_RNIS_002_OK());
execute(TC_MEC_SRV_RNIS_003_OK());
execute(TC_MEC_SRV_RNIS_004_OK());
execute(TC_MEC_MEC012_SRV_RNIS_001_OK());
execute(TC_MEC_MEC012_SRV_RNIS_002_OK());
execute(TC_MEC_MEC012_SRV_RNIS_003_OK());
execute(TC_MEC_MEC012_SRV_RNIS_004_OK());
}
}
if (PICS_BWMANAGEMENT_API_SUPPORTED) {
execute(TC_MEC_SRV_BWA_001_OK());
execute(TC_MEC_SRV_BWA_001_BR());
execute(TC_MEC_SRV_BWA_002_OK());
execute(TC_MEC_SRV_BWA_002_BR());
execute(TC_MEC_SRV_BWA_003_OK());
execute(TC_MEC_SRV_BWA_003_NF());
execute(TC_MEC_SRV_BWA_004_OK());
execute(TC_MEC_SRV_BWA_004_BR());
execute(TC_MEC_SRV_BWA_004_NF());
execute(TC_MEC_SRV_BWA_005_OK());
execute(TC_MEC_SRV_BWA_005_BR());
execute(TC_MEC_SRV_BWA_005_NF());
execute(TC_MEC_SRV_BWA_005_PF());
execute(TC_MEC_SRV_BWA_006_OK());
execute(TC_MEC_SRV_BWA_006_NF());
if (PICS_MEC_PLAT and PICS_BWMANAGEMENT_API_SUPPORTED) {
execute(TC_MEC_MEC015_SRV_TM_001_OK());
execute(TC_MEC_MEC015_SRV_TM_002_OK());
execute(TC_MEC_MEC015_SRV_TM_002_BR());
execute(TC_MEC_MEC015_SRV_TM_002_NF());
}
} // End of 'control' statement
......
ttcn/AtsMec/AtsMec_TrafficManagementAPI_TestCases.ttcn 0 → 100644
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/AtsMec_V2XInformationServiceAPI_TestCases.ttcn 0 → 100644
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/AtsMec_WlanInformationAPI_TestCases.ttcn 0 → 100644
View file @ c56308e2
This diff is collapsed.
ttcn/AtsMec/module.mk 0 → 100644
View file @ c56308e2
This diff is collapsed.
LibIts @ 913d1303
Subproject commit a305e3b07ed8b0955a28f25bd3fd0346f97562a8
Subproject commit 913d130353cf716ab620edbafcb56d2213dc344d
ttcn/LibMec/Ams/module.mk 0 → 100644
View file @ c56308e2
This diff is collapsed.
ttcn/LibMec/Ams/ttcn/Ams_sEncdecDeclarations.ttcn → ttcn/LibMec/Ams/ttcn/Ams_EncdecDeclarations.ttcn
View file @ c56308e2
......@@ -19,4 +19,4 @@ module Ams_EncdecDeclarations {
with { extension "prototype (convert) decode(JSON)" };
} // End of module LocationAPI_EncdecDeclarations
} // End of module Ams_EncdecDeclarations
ttcn/LibMec/AppEna/module.mk 0 → 100644
View file @ c56308e2
This diff is collapsed.
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