From 3bba162d2829c2cd22f46d48eee989004cf5e94d Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 1 Mar 2018 10:03:01 +0100
Subject: [PATCH] From parameter set (instead of omit) for every AE
registration using PX_AE1_STEM + Use of PX_IN_CSE and PX_MN_CSE instead of
PICS_IN_CSE and PICS_MN_CSE + TC_CSE_REG_DEL_002 - removal of remoteCSE from
vc_resourcesIndexToBeDeleted list when it has been deleted
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Testcases_CSE_Release_1.ttcn | 40 +++++++++++++++--------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 5453229..211a9ed 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -435,7 +435,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
/**
- * @desc Check that the IUT sends a registration CREATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource
+ * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned AE_ID of AE-ID-Stem format.
*
*/
testcase TC_CSE_REG_CRE_002() runs on AeSimu system CseSystem {
@@ -453,7 +453,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
+ v_request := valueof(m_createAe(PX_APP_ID, omit, PX_ALLOWED_C_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -880,7 +880,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
vc_cse1.done;
- v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, PX_ALLOWED_S_AE_IDS[0]));
vc_cse1.start(f_cse_announcementProcedure_createHandler());
vc_cse1.done;
@@ -995,7 +995,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
v_create.primitiveContent.aE.labels := {"labels"};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1004,7 +1004,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
v_create.primitiveContent.aE.appName := "AeAppName";
v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1013,7 +1013,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, PX_AE1_ID_STEM);
v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
v_ae1.start(f_CSE_REG_CRE_012(v_create));
@@ -1103,7 +1103,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
// Test Body
- v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, omit, omit));
+ v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, -, PX_AE1_ID_STEM, -, -));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
@@ -1146,7 +1146,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
v_createRequest.primitiveContent.aE.app_ID := omit; //Mandatory app_ID field is being set empty
@@ -1158,7 +1158,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
v_createRequest.primitiveContent.aE.requestReachability := omit; //Mandatory requestReachability field is being set empty
@@ -1298,7 +1298,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
vc_cse1.done;
- v_request := valueof(m_createAe(PX_APP_ID, omit, omit));
+ v_request := valueof(m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -1952,7 +1952,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_RET_004_LBL() runs on Tester system CseSystem {
// Local variables
var Labels v_labels_1 := {"VALUE_1"};
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
@@ -1968,7 +1968,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_RET_004_APN() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.appName := "AeAppName";
@@ -1983,7 +1983,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_RET_004_POA() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID);
+ var template RequestPrimitive v_createRequest := m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM);
var template PrimitiveContent v_contentResponse;
v_createRequest.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
@@ -2079,7 +2079,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- if(PICS_IN_CSE){
+ if(PX_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2108,7 +2108,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- } else if (PICS_MN_CSE) {
+ } else if (PX_MN_CSE) {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
@@ -2359,11 +2359,11 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- if (PICS_IN_CSE){
+ if (PX_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
}
- if (PICS_MN_CSE){
+ if (PX_MN_CSE){
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
}
@@ -2642,11 +2642,11 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- if (PICS_MN_CSE){
+ if (PX_MN_CSE){
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
}
- if (PICS_IN_CSE){
+ if (PX_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
}
@@ -2659,10 +2659,12 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2002))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Deletion of <remoteCSE> resource has been accepted");
+ f_removeElementFromList(vc_resourcesIndexToBeDeleted, vc_remoteCseIndex);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+ f_removeElementFromList(vc_resourcesIndexToBeDeleted, vc_remoteCseIndex);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
--
GitLab