From cb6a4da3726a7b01172d4d6cc6f74e08ae33a739 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 31 Mar 2020 13:54:12 +0200
Subject: [PATCH] Removal of aeAux usage: - Removal of m_createAeAux template
to use instead m_createAe - Renaming of vc_aeAuxIndex to vc_aeIndex
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 29 ++++++++++++++--------------
LibOneM2M/OneM2M_Templates.ttcn | 13 +++----------
LibOneM2M/OneM2M_TestSystem.ttcn | 2 +-
LibOneM2M/OneM2M_TypesAndValues.ttcn | 5 ++---
OneM2M_PermutationFunctions.ttcn | 28 +++++++++++++--------------
OneM2M_Testcases_AE_Release_1.ttcn | 2 +-
OneM2M_Testcases_CSE_Release_1.ttcn | 22 ++++++++++-----------
OneM2M_Testcases_CSE_Release_2.ttcn | 6 +++---
8 files changed, 49 insertions(+), 58 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 58d85bd..3eb7d0c 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -901,7 +901,7 @@ module OneM2M_Functions {
*/
function f_sendAeResource() runs on AeSimu {
- infoPort.send(vc_resourcesList[vc_aeAuxIndex]);
+ infoPort.send(vc_resourcesList[vc_aeIndex]);
}
@@ -912,7 +912,7 @@ module OneM2M_Functions {
function f_sendResourceAeSimu(in integer p_resourceIndex) runs on AeSimu {
if(p_resourceIndex == -1) {
- infoPort.send(vc_resourcesList[vc_aeAuxIndex]);
+ infoPort.send(vc_resourcesList[vc_aeIndex]);
} else {
infoPort.send(vc_resourcesList[p_resourceIndex]);
}
@@ -1015,7 +1015,7 @@ module OneM2M_Functions {
//Activate defaults when running on a PTC
f_cse_activateDefaults_ae();
- v_request := valueof(m_createAeAux(p_accessControlPolicyIDs, p_poaList));
+ v_request := valueof(m_createAe(PX_TS_AE1.appId, p_accessControlPolicyIDs, PX_TS_AE1.aeIdStem, c_defaultAe1ResourceName, p_poaList));
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
@@ -1030,10 +1030,10 @@ module OneM2M_Functions {
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", vc_aeAuxIndex);
+ f_sendAcPrimitive("AE-ID_changed", vc_aeIndex);
}
}
}
@@ -1054,7 +1054,7 @@ module OneM2M_Functions {
}
f_checkAeSimuStatus();
- return vc_aeAuxIndex;
+ return vc_aeIndex;
}
/**
@@ -1079,11 +1079,10 @@ module OneM2M_Functions {
vc_resourcesIndexToBeDeleted := {vc_acpAuxIndex};//TODO Not needed
v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -));
- //TODO Test, to be removed
+ //Set CSEBase IUT as target
v_request.to_ := f_getResourceAddress();
f_send(e_mca_port, m_request(v_request));
- //f_send(e_mca_port, m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
} else {
f_send(e_mca_port, m_request(m_createAe(p_appId)));
}
@@ -1094,10 +1093,10 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__&": INFO: Application registered successfuly");
if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.aE)) {
- vc_aeAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int2);
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", vc_aeAuxIndex);
+ f_sendAcPrimitive("AE-ID_changed", vc_aeIndex);
}
}
}
@@ -1119,7 +1118,7 @@ module OneM2M_Functions {
}
f_checkAeSimuStatus();
- return vc_aeAuxIndex;
+ return vc_aeIndex;
}
@@ -1174,7 +1173,7 @@ module OneM2M_Functions {
vc_ae2.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
p_ae2Index := f_getResourceFromAeSimu(vc_ae2);
@@ -1418,9 +1417,9 @@ module OneM2M_Functions {
f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, p_parentIndex);
if(p_resourceType == int2) {
- vc_aeAuxIndex := v_resourceIndex;
+ vc_aeIndex := v_resourceIndex;
if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", vc_aeAuxIndex);
+ f_sendAcPrimitive("AE-ID_changed", vc_aeIndex);
}
} else if (p_resourceType == int9) {
//Check that group members are correctly in the group
@@ -3646,7 +3645,7 @@ module OneM2M_Functions {
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-,-,-);
if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
- p_utRequest.requestPrimitive.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
+ p_utRequest := m_utCreateAe;
}
f_sendUtPrimitive(p_utRequest, v_action);
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 626dd3f..e11599f 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -820,7 +820,7 @@ module OneM2M_Templates {
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc(-, p_accessControlPolicyIds)}
};
- template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
+ template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_defaultAe1ResourceName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
@@ -834,14 +834,7 @@ module OneM2M_Templates {
resourceType := int2,
primitiveContent := {aE := p_ae}
};
-
- template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
- from_ := PX_TS_AE1.aeIdStem,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAe",
- resourceType := int2,
- primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
- };
-
+
/**
* @desc Base CREATE request primitive for AccessControlPolicy resource
*/
@@ -1759,7 +1752,7 @@ module OneM2M_Templates {
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
*/
- template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAeResourceName, in template XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
+ template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAe1ResourceName, in XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) PoaList p_poaList) := {
resourceName := p_name,//O
resourceType := omit,//NP
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 2a701eb..b481fc4 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -68,7 +68,7 @@ module OneM2M_TestSystem {
var CseSimu vc_cse1;//For CF02 when AeSimu is master
var boolean vc_auxiliaryAe2Up := false;
- var integer vc_aeAuxIndex := -1;//Specific to AeSimu
+ var integer vc_aeIndex := -1;//Specific to AeSimu
};
type component CseSimu extends Tester {
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 016fd44..7fde556 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -29,7 +29,6 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultRemoteCSEResourceName := "MyRemoteCSEResource";
const XSD.String c_defaultMgmtObjResourceName := "MyMgmtObjResource";
const XSD.String c_defaultMgmtCmdResourceName := "MyMgmtCmdResource";
- const XSD.String c_defaultAeResourceName := "MyAeResource";
const XSD.String c_defaultLocationPolicyResourceName := "MyLocationPolicyResource";
const XSD.String c_defaultNodeResourceName := "MyNodeResource";
const XSD.String c_defaultNodeID := "MyNodeId";
@@ -42,8 +41,8 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultTimeSeriesAnncResourceName := "MyTimeSeriesAnncResource";
const XSD.String c_defaultTimeSeriesInstanceResourceName := "MyTimeSeriesInstanceResource";
const XSD.String c_defaultGenericInterworkingServiceResourceName := "MyGenericInterworkingServiceResource"; //<genericInterworkingService>
- const XSD.ID c_aeAuxName := "MyAe";
- const XSD.String c_defaultAE2Name := "MyAe2";
+ const XSD.String c_defaultAe1ResourceName := "MyAe1";
+ const XSD.String c_defaultAe2ResourceName := "MyAe2";
const XSD.String c_acpAuxName := "MyAcp";
const charstring c_invalid_location_update_period := "-PT30M10S" ;//duration set to invalid value (minus value)
const XSD.ID c_resourceShortNameLatest := "la"; //<latest>
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 25a034c..48c69a2 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -925,7 +925,7 @@ module OneM2M_PermutationFunctions {
// Local variables
var RequestPrimitive v_request;
- var RequestPrimitive v_groupRequest := m_createGroupBase;
+ var template RequestPrimitive v_groupRequest := m_createGroupBase;
var integer v_aeIndex := -1;
var integer v_groupIndex := -1;
var integer v_resourceIndex := -1;
@@ -1170,7 +1170,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var AddressingMethod v_addressingMethod;
var RequestPrimitive v_request;
- var RequestPrimitive v_groupRequest := m_createGroupBase;
+ var template RequestPrimitive v_groupRequest := m_createGroupBase;
// Test control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -1195,7 +1195,7 @@ module OneM2M_PermutationFunctions {
// Test Body
//Force usage of Hybrid Hierarchical addressing method
v_addressingMethod := e_nonHierarchical;
- v_request := m_retrieve(f_getResourceAddress(v_groupIndex, v_addressingMethod, p_primitiveScope), f_getOriginator(v_groupIndex));
+ v_request := valueof(m_retrieve(f_getResourceAddress(v_groupIndex, v_addressingMethod, p_primitiveScope), f_getOriginator(v_groupIndex)));
v_request.to_ := v_request.to_ & "/fopt";
f_send(e_mca_port, m_request(v_request));
@@ -1422,7 +1422,7 @@ module OneM2M_PermutationFunctions {
function f_CSE_GEN_UPD_004(in PrimitiveScope p_primitiveScope) runs on AeSimu system CseSystem {
// Local variables
- var RequestPrimitive v_groupRequest := m_createGroupBase;
+ var template RequestPrimitive v_groupRequest := m_createGroupBase;
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var integer v_aeIndex := -1;
var integer v_groupIndex := -1;
@@ -1673,7 +1673,7 @@ module OneM2M_PermutationFunctions {
// Local variables
var RequestPrimitive v_request;
- var RequestPrimitive v_groupRequest := m_createGroupBase;
+ var template RequestPrimitive v_groupRequest := m_createGroupBase;
var integer v_aeIndex := -1;
var integer v_groupIndex := -1;
var integer v_resourceIndex := -1;
@@ -1776,7 +1776,7 @@ module OneM2M_PermutationFunctions {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
}
@@ -1829,7 +1829,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
@@ -1873,7 +1873,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE creation successfull.");
}
@@ -2527,7 +2527,7 @@ module OneM2M_PermutationFunctions {
vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, v_poaList), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
@@ -2565,7 +2565,7 @@ module OneM2M_PermutationFunctions {
if(match(int23, p_requestPrimitive.resourceType)){
vc_ae2.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, v_poaList), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
@@ -7322,7 +7322,7 @@ module OneM2M_PermutationFunctions {
//vc_ae2.start(f_cse_createAccessControlPolicyAux("PermissionForAE1",{"all"}, int63));
//f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, v_acpIds, PX_TS_AE2.aeIdStem, c_defaultAE2Name, omit), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, v_acpIds, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex_2 := f_getLatestResource(vc_ae2);
@@ -7412,7 +7412,7 @@ module OneM2M_PermutationFunctions {
//vc_ae2.start(f_cse_createAccessControlPolicyAux("PermissionForAE1",{"all"}, int63));
//f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, v_acpIds, PX_TS_AE2.aeIdStem, c_defaultAE2Name, omit), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, v_acpIds, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex_2 := f_getLatestResourceIndex(vc_ae2);
@@ -10171,7 +10171,7 @@ module OneM2M_PermutationFunctions {
v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_TS_AE2.aeIdStem, c_defaultAE2Name, -), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex2 := f_getResourceFromAeSimu(vc_ae2);
@@ -10876,7 +10876,7 @@ module OneM2M_PermutationFunctions {
f_checkAeSimuStatus();
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}))); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index ced59c4..155e238 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -1266,7 +1266,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE to ";
- v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
+ v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, -, omit)),v_action));
v_cse1.done;
}
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 35c7aae..e326ff2 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -557,7 +557,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, creating AE with not allowed AE-ID ");
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
@@ -1070,7 +1070,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
if(v_response.primitive.responsePrimitive.primitiveContent.aE.resourceID[0] == "C"){
@@ -1256,7 +1256,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, creating AE with not allowed APP-ID ");
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
@@ -1468,7 +1468,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, vc_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.aE)) {
@@ -1599,7 +1599,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully registered.");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{
@@ -1612,7 +1612,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
//Check to see if the resource is present or not
- if (f_cse_isResourcePresent(vc_aeAuxIndex)){
+ if (f_cse_isResourcePresent(vc_aeIndex)){
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
@@ -2288,7 +2288,7 @@ module OneM2M_Testcases_CSE_Release_1 {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive);
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
setverdict(pass, __SCOPE__ & ": AE successfully created.");
}
@@ -3685,7 +3685,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Container
v_ae1.done;
@@ -3747,7 +3747,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.group_.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit)));//Group
+ v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Group
v_ae1.done;
@@ -3789,7 +3789,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit)));//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//AccessControlPolicy
v_ae1.done;
@@ -3829,7 +3829,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Subscription
v_ae1.done;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 7bc41bb..96b108c 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -601,7 +601,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit)));//PollingChannel
+ v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//PollingChannel
v_ae1.done;
@@ -2376,9 +2376,9 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp",{"all"}, int63);
- v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem, c_aeAuxName, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")}), -1); // AE1 is registred
+ v_ae1Index := f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem, c_defaultAe1ResourceName, {f_getCompletePoA(PX_TS_AE1.mcaPortIn, "")}), -1); // AE1 is registred
- vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, omit), -1)); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, omit), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
--
GitLab