diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 1d4a0d308c7cf072f82d8669e9ee07d3d951294e..29fd8f53006c6765991b4d81827c6f53a0c82979 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1100,7 +1100,7 @@ module OneM2M_Functions {
*/
function f_sendAeResource() runs on AeSimu {
- infoPort.send(vc_resourcesList[vc_aeAuxIndex]);
+ infoPort.send(vc_resourcesList[vc_aeIndex]);
}
@@ -1111,7 +1111,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]);
}
@@ -1206,19 +1206,6 @@ module OneM2M_Functions {
group PreambleFunctions {
- /**
- * @desc Creation of auxiliar resources ACP for correct execution of the test case
- * @param p_allowedOperations Allowed operations for the auxiliar AE resource
- * @return Internal ACP resource index
- * @verdict
- */
- function f_cse_preamble_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer {//c_CRUDNDi
-
- return f_cse_createAccessControlPolicyAux(p_acpName, -, p_allowedOperations);
-
- }
-
-
/**
* @desc Creation of auxiliar resource AE for correct execution of the test case
* @param p_accessControlPolicyIDs AccessControlPolicyIDs for the auxiliar AE resource
@@ -1234,7 +1221,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);
@@ -1249,10 +1236,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);
}
}
}
@@ -1273,7 +1260,7 @@ module OneM2M_Functions {
}
f_checkAeSimuStatus();
- return vc_aeAuxIndex;
+ return vc_aeIndex;
}
/**
@@ -1291,18 +1278,17 @@ module OneM2M_Functions {
f_cse_activateDefaults_ae();
if(PICS_ACP_SUPPORT){
- vc_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
+ f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations);
}
- if(vc_acpAuxIndex != -1) {
- vc_resourcesIndexToBeDeleted := {vc_acpAuxIndex};//TODO Not needed
- v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -));
+ if(vc_acpIndex != -1) {
+ vc_resourcesIndexToBeDeleted := {vc_acpIndex};//TODO Not needed
+ v_request := valueof(m_createAe(p_appId, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -));
- //TODO Test, to be removed
+ //Set CSEBase IUT as target
v_request.to_ := f_getResourceAddress();
f_send(e_mcaPort, m_request(v_request));
- //f_send(e_mcaPort, m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
} else {
f_send(e_mcaPort, m_request(m_createAe(p_appId)));
}
@@ -1313,10 +1299,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);
}
}
}
@@ -1338,7 +1324,7 @@ module OneM2M_Functions {
}
f_checkAeSimuStatus();
- return vc_aeAuxIndex;
+ return vc_aeIndex;
}
@@ -1393,7 +1379,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);
@@ -1415,7 +1401,7 @@ module OneM2M_Functions {
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae1);
p_ae1Index := f_getLatestResourceIndex(vc_ae1);
- vc_ae1.start(f_cse_preamble_createAcpAux(-, int61)); //c_CUDNDi), no resource retrieval privilege
+ vc_ae1.start(f_cse_createAccessControlPolicyAux(-, -, int61)); //c_CUDNDi), no resource retrieval privilege
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae1);
p_acpIndex := f_getLatestResourceIndex(vc_ae1);
}
@@ -1698,9 +1684,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
@@ -1744,8 +1730,8 @@ module OneM2M_Functions {
//Activate defaults when running on a PTC
f_cse_activateDefaults_ae();
- if(vc_acpAuxIndex != -1) {
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ if(vc_acpIndex != -1) {
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, p_parentIndex);
@@ -1758,14 +1744,12 @@ module OneM2M_Functions {
* @desc Creation of the auxiliar ACP resource
* @param p_acpName ACP name
* @param p_allowedOperations Allowed operations
- * @return Internal resource index of the created auxiliar ACP resource
* @verdict
*/
- function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer{
+ function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_defaultAcpResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu {
var RequestPrimitive v_request;
- var integer v_acpAuxIndex := -1;
- v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_acor := p_acor, p_allowedOperations := p_allowedOperations));
+ v_request := valueof(m_createAcp(p_acpName, p_acor, p_allowedOperations));
v_request := f_getCreateRequestPrimitive(int1, v_request, -1);
@@ -1776,8 +1760,7 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(1) & " created successfuly");
f_checkAttributesToBeSaved(int1, v_request, vc_response.primitive.responsePrimitive);
- v_acpAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int1);
- vc_acpAuxIndex := v_acpAuxIndex;
+ vc_acpIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int1);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -1794,8 +1777,6 @@ module OneM2M_Functions {
f_checkAeSimuStatus();
- return v_acpAuxIndex;
-
}
/**
@@ -2060,8 +2041,8 @@ module OneM2M_Functions {
v_request.requestIdentifier := valueof(v_request.requestIdentifier) & f_rnd(1, 1000000);
- v_request.to_ := f_getResourceAddress(vc_acpAuxIndex);
- v_request.from_ := f_getOriginator(vc_acpAuxIndex);
+ v_request.to_ := f_getResourceAddress(vc_acpIndex);
+ v_request.from_ := f_getOriginator(vc_acpIndex);
v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))};
f_send(e_mcaPort, m_request(v_request));
@@ -3209,10 +3190,6 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
}
- [] mccPort.receive {
- tc_ac.stop;
- setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
- }
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
}
@@ -4179,7 +4156,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);
+ p_utRequest := m_utCreateAe;
}
f_sendUtPrimitive(p_utRequest, v_action);
@@ -4768,8 +4745,8 @@ module OneM2M_Functions {
p_request.primitiveContent.container.locationID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);//resourceID of the locationPolicy
}
if(ispresent(p_request.primitiveContent.container.accessControlPolicyIDs)) {
- if((match(valueof(p_request.primitiveContent.container.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpAuxIndex))){
- p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
+ if((match(valueof(p_request.primitiveContent.container.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpIndex))){
+ p_request.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
}
}
} else if (p_resourceType == int4) {//contentInstance
@@ -4808,13 +4785,13 @@ module OneM2M_Functions {
//accessControlPolicyIds
if(ispresent(p_request.primitiveContent.subscription.accessControlPolicyIDs)) {
if(match(valueof(p_request.primitiveContent.subscription.accessControlPolicyIDs), v_defaultAcpIDs )){
- p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
+ p_request.primitiveContent.subscription.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
}
}
} else if(p_resourceType == int29){//timeSeries
if(ispresent(p_request.primitiveContent.timeSeries.accessControlPolicyIDs)) {
- if((match(valueof(p_request.primitiveContent.timeSeries.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpAuxIndex))){
- p_request.primitiveContent.timeSeries.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)};
+ if((match(valueof(p_request.primitiveContent.timeSeries.accessControlPolicyIDs), v_defaultAcpIDs )) and (isbound(vc_acpIndex))){
+ p_request.primitiveContent.timeSeries.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
}
}
} else if(p_resourceType == int30){//timeSeriesInstance
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 7b90e861e16746b86be67b18b2e70edf84e7f7f9..6b3bbf05d948ccffded2f0eb9bdbcb384f2497f3 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -932,7 +932,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 := PX_TS_AE1.aeIdStem, 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 := PX_TS_AE1.aeIdStem, template (omit) ResourceName p_resourceName := c_defaultAe1ResourceName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//It should be used either omit, or "s", or "c"
requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
@@ -947,13 +947,6 @@ module OneM2M_Templates {
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
*/
@@ -972,8 +965,7 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicyAnnc := m_contentCreateAcpAnnc ()}
};
- template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
- to_ := p_parentResourceAddress,
+ template (value) RequestPrimitive m_createAcp(in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
@@ -997,22 +989,6 @@ module OneM2M_Templates {
primitiveContent := {remoteCSEAnnc := mw_contentCreateRemoteCSEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
- /**
- * @desc Base CREATE request primitive for AccessControlPolicy resource (AUX)
- */
- template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createAcpAux",
- resourceType := int1,
- primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
- };
-
- /*template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
- from_ := PX_SUPER_USER,
- requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
- resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
- primitiveContent := {cSEBase := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
- };*/
-
/**
* @desc Base CREATE request primitive for CSEBase resource
*/
@@ -2501,7 +2477,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 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 f02e6f90765720f47aa3cf4a1873b472d4b0d72d..be995d3c68e4903521b0a4c42627b8a42b4ef06b 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -38,39 +38,49 @@ module OneM2M_TestSystem {
type record of Interface Interfaces;
type component Tester {
+ //Common Ports
port AdapterControlPort acPort;
port InfoPort infoPort;
port UpperTesterPort utPort;
- //timers
+ //Common timers
timer tc_ac := PX_TAC;
timer tc_wait := PX_TWAIT;
timer tc_done := PX_TDONE;
//global variables
+ //About configuration of the component
var Configurations vc_config;
var TestSystemRole vc_testSystemRole;
- var MyResourcesList vc_resourcesList;
- var IntegerList vc_resourcesIndexToBeDeleted := {};
- var integer vc_acpAuxIndex := -1;
- var MsgIn vc_request;
- var MsgIn vc_response;
+ //Default behaviour
var default vc_aeSimu := null;
var default vc_cseSimu := null;
- var PrimitiveContent vc_primitiveContentRetrievedResource;
+ //Interfaces
var Interfaces vc_myInterfaces := {};
+ //In/Out messages
+ var MsgIn vc_request;
+ var MsgIn vc_response;
+ var PrimitiveContent vc_primitiveContentRetrievedResource;
+ //Resources list
+ var MyResourcesList vc_resourcesList;
+ //Resource index
+ var IntegerList vc_resourcesIndexToBeDeleted := {};
+ var integer vc_acpIndex := -1;
};
type component AeSimu extends Tester {
+ //Attached components depending on config
var AeSimu vc_ae2;
+ var CseSimu vc_cse1;//For CF02 when AeSimu is master
+ //Ports
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
-
//global variables
- //var PrimitiveContent vc_primitiveContentRetrievedResource;
+ //About configuration of the component
var AeSimuComponentDesc vc_aeSimuDesc;
var AeSimuComponentDesc vc_dasSimuDesc;
- var CseSimu vc_cse1;//For CF02 when AeSimu is master
+ //Resource Index
+ var integer vc_aeIndex := -1;
+ //Status of attached component
var boolean vc_auxiliaryAe2Up := false;
- var integer vc_aeAuxIndex := -1;//Specific to AeSimu
//DAS
var AeSimu vc_das;
@@ -78,20 +88,25 @@ module OneM2M_TestSystem {
};
type component CseSimu extends Tester {
+ //Attached components depending on config
+ var AeSimu vc_ae1;//For CF02 when CseSimu is master
+ var CseSimu vc_cse2;
+ //Ports
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
-
//global variables
+ //About configuration of the component
var CseSimuComponentDesc vc_cseSimuDesc;
+ var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
+ //Resources list
var MyResourcesList vc_localResourcesList := {};
- var AeSimu vc_ae1;//For CF02 when CseSimu is master
- var CseSimu vc_cse2;
- var integer vc_localRemoteCseIndex := -1;
+ //Resource index
var integer vc_cSEBaseIndex := -1; //Index of the CSEBase resource of the Tester inside vc_localResourcesList
- var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
var integer vc_remoteCseIndex := -1;//Specific to CseSimu
+ var integer vc_localRemoteCseIndex := -1;
+ //Status of attached component
var boolean vc_auxiliaryCse2Up := false;
};
@@ -117,10 +132,6 @@ module OneM2M_TestSystem {
port UpperTesterPort utPort;
}
-
-
-
-
}// end of module
with {
extension "anytype charstring"
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 52a2df9fc4f139612595cca83730ceb47c579def..186db965b0c9fc665fbbfe7dc956d8a3e398b967 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -33,7 +33,6 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultRemoteCSEAnncResourceName := "MyRemoteCSEAnncResource";
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";
@@ -50,9 +49,9 @@ module OneM2M_TypesAndValues {
const XSD.String c_defaultRoleResourceName := "MyRoleResource";
const XSD.String c_defaultTokenResourceName := "MyTokenResource";
const XSD.String c_defaultGenericInterworkingServiceResourceName := "MyGenericInterworkingServiceResource"; //<genericInterworkingService>
- const XSD.ID c_aeAuxName := "MyAe";
- const XSD.String c_defaultAE2Name := "MyAe2";
- const XSD.String c_acpAuxName := "MyAcp";
+ const XSD.String c_defaultAe1ResourceName := "MyAe1";
+ const XSD.String c_defaultAe2ResourceName := "MyAe2";
+ const XSD.String c_defaultAcpResourceName := "MyAcp";
const charstring c_invalid_location_update_period := "-PT30M10S" ;//duration set to invalid value (minus value)
const XSD.ID c_resourceShortNameLatest := "la"; //<latest>
const XSD.ID c_resourceShortNameOldest := "ol"; //<oldest>
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4791e8f22ddcb9387354754533d1387f8ff0a66b..fdcd120cebdea1238d5adcb0195ca584983b6c12 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1423,7 +1423,7 @@ module OneM2M_PermutationFunctions {
var integer v_groupIndex := -1;
var integer v_resourceIndex := -1;
var AddressingMethod v_addressingMethod;
- var template RequestPrimitive v_request;
+ var RequestPrimitive v_request;
var template RequestPrimitive v_groupRequest := m_createGroupBase;
// Test control
@@ -1449,7 +1449,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_mcaPort, m_request(valueof(v_request)));
@@ -2030,7 +2030,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.");
}
@@ -2083,7 +2083,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{
@@ -2127,7 +2127,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.");
}
@@ -2606,7 +2606,7 @@ module OneM2M_PermutationFunctions {
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getCompletePoA()}));
vc_ae1.start(f_cse_preamble_registerAe());
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Creating resource in Hosting CSE
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
@@ -2764,8 +2764,7 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
- var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE2.mcaPortIn) };
+ var template RequestPrimitive v_parentRequestPrimitive;
// Test control
@@ -2777,33 +2776,26 @@ module OneM2M_PermutationFunctions {
// Preamble
if(ispresent(p_parentRequestPrimitive)) {
+ v_parentRequestPrimitive := p_parentRequestPrimitive;
if(match(int23, p_parentRequestPrimitive.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
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
-
- v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
- p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_parentRequestPrimitive, int23, -);
}
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
-
f_cse_preamble_registerAe();
-
}
- v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
-
+ v_parentIndex := f_cse_createResource(valueof(v_parentRequestPrimitive.resourceType), v_parentRequestPrimitive, v_parentIndex);
+ if(vc_ae2.running) {
+ vc_ae2.stop;
+ }
} else {//Resource under CSEBase
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if(ischosen(p_requestPrimitive.primitiveContent.group_)){
@@ -2815,15 +2807,8 @@ module OneM2M_PermutationFunctions {
}
// Test Body
-
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
- f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
- v_ae2Index := f_getResourceFromAeSimu(vc_ae2);
- p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, int23, -);
}
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
@@ -2877,7 +2862,6 @@ module OneM2M_PermutationFunctions {
var integer v_parentIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae1Index := -1;
- var integer v_acpAuxIndex := -1;
var PoaList v_poaList := { f_getCompletePoA(PX_TS_AE1.mcaPortIn) };
// Test control
@@ -2891,7 +2875,7 @@ module OneM2M_PermutationFunctions {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
if(match(int23, p_resourceType)){
- vc_ae1.start(f_cse_preamble_createAcpAux("SubscriptionVerificationAcp", int63));
+ vc_ae1.start(f_cse_createAccessControlPolicyAux("SubscriptionVerificationAcp", -, int63));
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
vc_ae1.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem, "MyAe", v_poaList), -1)); // AE1 is registered
f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
@@ -3091,7 +3075,6 @@ module OneM2M_PermutationFunctions {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_parentIndex := -1;
@@ -3108,12 +3091,12 @@ module OneM2M_PermutationFunctions {
// Preamble
if (p_resourceType != int23) {
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int62);//c_RUDNDi)
+ f_cse_createAccessControlPolicyAux(-, -, int62);//c_RUDNDi)
} else {
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int60);//c_UDNDi);
+ f_cse_createAccessControlPolicyAux(-, -, int60);//c_UDNDi);
}
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
if(p_resourceType != int18) {
@@ -3409,7 +3392,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_parentIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_ae2Index := -1;
const XSD.NCName c_accessControlPolicyIDs := "accessControlPolicyIDs";
var integer v_resourceIndex := -1;
@@ -3430,7 +3412,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if (v_myOptionalAttribute == c_accessControlPolicyIDs) {
- v_acpAuxIndex := f_cse_preamble_createAcpAux();//c_CRUDNDi)
+ f_cse_createAccessControlPolicyAux();//c_CRUDNDi)
}
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
@@ -4215,7 +4197,6 @@ module OneM2M_PermutationFunctions {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
var integer v_parentIndex := -1;
@@ -4233,8 +4214,8 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int61);//c_CRUDNDi)
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CRUDNDi)
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
}
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
@@ -4605,7 +4586,7 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpIndex].resource.accessControlPolicy.resourceID});
}
@@ -4622,7 +4603,7 @@ module OneM2M_PermutationFunctions {
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
@@ -4671,7 +4652,6 @@ module OneM2M_PermutationFunctions {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
@@ -4698,9 +4678,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, int61);
+ f_cse_createAccessControlPolicyAux(-, -, int61);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
@@ -4718,7 +4698,7 @@ module OneM2M_PermutationFunctions {
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
@@ -4762,7 +4742,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -4782,9 +4761,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -4798,7 +4777,7 @@ module OneM2M_PermutationFunctions {
} else {
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4848,7 +4827,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -4868,9 +4846,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -4884,7 +4862,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4933,7 +4911,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -4953,9 +4930,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -4969,7 +4946,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -5019,7 +4996,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -5039,9 +5015,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -5055,7 +5031,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -5101,7 +5077,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -5121,9 +5096,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_requestPrimitive := f_setAcpId(p_requestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -5137,7 +5112,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -5602,7 +5577,7 @@ module OneM2M_PermutationFunctions {
var XSD.ID v_originalResourceAddress;
var XSD.ID v_resourceAnncAddress;
var template RequestPrimitive v_createAE := m_createAe(PX_TS_AE1.appId, omit, omit);
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int63);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
var integer v_acpIndex;
@@ -5943,7 +5918,6 @@ module OneM2M_PermutationFunctions {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
var integer v_parentIndex := -1;
@@ -5960,14 +5934,14 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int59);//c_CRDNDi)
+ f_cse_createAccessControlPolicyAux(-, -, int59);//c_CRDNDi)
v_aeIndex := f_cse_preamble_registerAe(-, -);
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
if(p_resourceType != int1) {
- p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});//c_CRDNDi);
+ p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});//c_CRDNDi);
}
if(p_resourceType != int18) {
v_parentIndex := v_aeIndex;//For resources that can have AE resource as parent
@@ -6347,7 +6321,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
var integer v_acpIndex := -1;
// Test control
@@ -6368,9 +6341,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if(p_secondAcp) {//A second ACP is required
@@ -6389,7 +6362,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -6439,7 +6412,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
// Test control
@@ -6459,9 +6431,9 @@ module OneM2M_PermutationFunctions {
if(p_resourceType != int1) {
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, -, -);
+ f_cse_createAccessControlPolicyAux(-, -, -);
- p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[v_acpAuxIndex].resource.accessControlPolicy.resourceID});
+ p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {vc_resourcesList[vc_acpIndex].resource.accessControlPolicy.resourceID});
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
@@ -6474,7 +6446,7 @@ module OneM2M_PermutationFunctions {
}
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -7017,7 +6989,6 @@ module OneM2M_PermutationFunctions {
var MsgIn v_response;
var RequestPrimitive v_request;
var RequestPrimitive v_updateRequest;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
@@ -7036,7 +7007,7 @@ module OneM2M_PermutationFunctions {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -);//c_CRUNDi);
- v_acpAuxIndex := f_cse_createAccessControlPolicyAux(-, {f_getResourceId(vc_resourcesList[v_aeIndex].resource)},int55);//c_CRDNDi);
+ f_cse_createAccessControlPolicyAux(-, {f_getResourceId(vc_resourcesList[v_aeIndex].resource)},int55);//c_CRDNDi);
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
@@ -7044,7 +7015,7 @@ module OneM2M_PermutationFunctions {
if(p_resourceType == int1) {
p_createRequestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list := {m_createAcr({f_getResourceId(vc_resourcesList[v_aeIndex].resource)}, int55)};
} else {
- p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
+ p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
}
//Creation of resource
@@ -7525,7 +7496,7 @@ module OneM2M_PermutationFunctions {
var integer i;
var ListOfURIs v_memberIDs;
var AcpType v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7601,7 +7572,7 @@ module OneM2M_PermutationFunctions {
var integer v_groupIndex := -1;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, p_accessControlOperations);
+ var template RequestPrimitive v_createAcp := m_createAcp(-, -, p_accessControlOperations);
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7667,7 +7638,7 @@ module OneM2M_PermutationFunctions {
var integer i;
var ListOfURIs v_memberIDs;
var ListOfURIs v_acpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7743,7 +7714,7 @@ module OneM2M_PermutationFunctions {
var integer v_groupIndex := -1;
var ListOfURIs v_memberIDs;
var AcpType v_acpIDs;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, p_accessControlOperations);
+ var template RequestPrimitive v_createAcp := m_createAcp(-, -, p_accessControlOperations);
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7809,7 +7780,7 @@ module OneM2M_PermutationFunctions {
var ListOfURIs v_memberIDs;
var AcpType v_acpIds;
var integer i;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "PermissionForEveryone", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcp("PermissionForEveryone", -, -);
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7832,7 +7803,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);
@@ -7899,7 +7870,7 @@ module OneM2M_PermutationFunctions {
var integer i;
var ListOfURIs v_memberIDs;
var AcpType v_acpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "PermissionForEveryone", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcp("PermissionForEveryone", -, -);
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -7922,7 +7893,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);
@@ -8227,7 +8198,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_acpIndex1 := -1;
var integer v_acpIndex2 := -1;
- var RequestPrimitive v_createRequest := valueof(m_createAcp(f_getResourceAddress(-1), omit));
+ var RequestPrimitive v_createRequest := valueof(m_createAcpBase);
var RequestPrimitive v_updateRequest;
var AccessControlRule v_accessControlRule_1;
var SetOfAcrs v_setOfArcs;
@@ -8306,7 +8277,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
- v_createRequest := valueof(m_createAcp(f_getResourceAddress(), -, {"testDomain"}));
+ v_createRequest := valueof(m_createAcp( -, {"testDomain"}, -));
v_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -);
@@ -8439,9 +8410,9 @@ module OneM2M_PermutationFunctions {
v_currentTime := fx_generateTimestamp();
v_accessControlRule.accessControlContexts_list := {{{"* * * * " & int2str(f_getMonth(v_currentTime)) & " * *"}, omit, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
- vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -8509,9 +8480,9 @@ module OneM2M_PermutationFunctions {
}
v_accessControlRule.accessControlContexts_list := {{{"* * * * " & int2str(v_month) & " * *"}, omit, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
- vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, -);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -8686,9 +8657,9 @@ module OneM2M_PermutationFunctions {
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{{}, {{f_getIpv4Address(PX_TS_AE1.mcaPortIn)}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
- vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -8747,9 +8718,9 @@ module OneM2M_PermutationFunctions {
v_createRequest := f_getCreateRequestPrimitive(int1, m_createAcpBase, -1);
v_accessControlRule.accessControlContexts_list := {{{}, {{"240.0.0.0"}, omit}, omit}};
v_createRequest.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {v_accessControlRule};
- vc_acpAuxIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ vc_acpIndex := f_cse_createResource(int1, v_createRequest); // CSE child resource
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpAuxIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, {f_getCompletePoA(PX_TS_AE1.mcaPortIn)});
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -9362,7 +9333,7 @@ module OneM2M_PermutationFunctions {
var integer v_originalResourceIndex := -1;
var XSD.ID v_originalResourceAddress;
var template RequestPrimitive v_createAE := m_createAe(PX_TS_AE1.appId, omit, omit);
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", -, -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var XSD.ID v_resourceAnncAddress;
var integer v_acpIndex;
@@ -9440,7 +9411,7 @@ module OneM2M_PermutationFunctions {
var XSD.ID v_originalResourceAddress;
var XSD.ID v_resourceAnncAddress;
var template RequestPrimitive v_createAE := m_createAe(PX_TS_AE1.appId, omit, omit);
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int63);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
var integer v_acpIndex;
@@ -10554,7 +10525,6 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex1 := -1;
var integer v_aeIndex2 := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var RequestPrimitive v_request;
var MsgIn v_response;
var RequestPrimitive v_requestNotify;
@@ -10567,11 +10537,11 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);//c_CUDNDi)
+ f_cse_createAccessControlPolicyAux(-, -, int63);//c_CUDNDi)
- v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+ v_aeIndex1 := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].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[vc_acpIndex].resource)}, PX_TS_AE2.aeIdStem, c_defaultAe2ResourceName, -), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_aeIndex2 := f_getResourceFromAeSimu(vc_ae2);
@@ -10617,7 +10587,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
// Test control
if(not(PICS_BLOCKING_REQUEST)){
@@ -10688,7 +10657,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
// Test control
if(PICS_NON_BLOCKING_REQUEST_SYNCH){
@@ -10822,7 +10790,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var template PrimitiveContent v_contentResponseUri;
var template PrimitiveContent v_contentResponseRequestResource;
var RequestStatus v_requestStatus;
@@ -11103,7 +11070,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var template PrimitiveContent v_contentResponse;
// Test control
@@ -11177,7 +11143,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var template PrimitiveContent v_contentResponse;
// Test control
@@ -11254,7 +11219,6 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var integer v_aeIndex, v_ae2Index := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var template PrimitiveContent v_contentResponse;
// Test control
@@ -11276,7 +11240,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_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 8601d0c1b91e37d6407f152e5f13fdff78953ec1..0638c556a1411746f17f888dfc4b4c5bb67f7dd8 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");
@@ -628,7 +628,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -695,7 +695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -739,8 +739,8 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
-
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, v_link);
vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
@@ -759,7 +759,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeAnncIndex := f_getLatestLocalResource(vc_cse1);
//continue to test the content
@@ -972,7 +972,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler());
@@ -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");
@@ -2129,7 +2129,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0], -, -, -)));
@@ -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;
@@ -8250,7 +8250,6 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
@@ -8266,9 +8265,9 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int61);//c_CUDNDi)
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi)
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//c_CRDNDi);
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
@@ -9060,8 +9059,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_acpIndex1 := -1;
var integer v_acpIndex2 := -1;
- var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
- var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
+ var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(omit, -, -));
+ var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_updateRequest;
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
@@ -9152,8 +9151,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_acpIndex1 := -1;
var integer v_acpIndex2 := -1;
- var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
- var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
+ var RequestPrimitive v_createRequestAcp1 := valueof(m_createAcp(omit, -, -));
+ var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(omit, -, -));
var RequestPrimitive v_updateRequest;
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
@@ -10009,7 +10008,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
- var integer v_acpAuxIndex := -1;
const ResourceType c_containerResourceType := int3;
// Test control
@@ -10024,11 +10022,11 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int31);//c_CRUN)
+ f_cse_createAccessControlPolicyAux(-, -, int31);//c_CRUN)
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
- v_requestPrimitive := f_setAcpId(v_requestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
+ v_requestPrimitive := f_setAcpId(v_requestPrimitive, {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
v_resourceIndex := f_cse_createResource(c_containerResourceType, v_requestPrimitive, v_aeIndex);
v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
@@ -10290,7 +10288,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var RequestPrimitive v_request;
const ResourceType c_containerResourceType := int3;
var Labels v_labels := {"VALUE_1"};
@@ -10304,14 +10301,14 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, -);//c_CRUDNDi)
+ f_cse_createAccessControlPolicyAux(-, -);//c_CRUDNDi)
- //v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
+ //v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)});
v_aeIndex := f_cse_preamble_registerAe();
f_cse_updateAcpAuxResource(int31); //Not include DISCOVERY permission
- v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)};
+ v_createRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[vc_acpIndex].resource)};
v_createRequest.primitiveContent.container.labels := v_labels;
v_resourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex);
@@ -11075,7 +11072,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var integer i;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index d055efbefb0e440cfbf4f89cf8a79637c7389d83..2ee97414cfd08ef2b6aae79bbd1aed7e175b224a 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);
@@ -3341,7 +3341,6 @@ module OneM2M_Testcases_CSE_Release_2 {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var RequestPrimitive v_req1, v_req2, v_req3;
var MsgIn v_resp1, v_resp3;
var ResponsePrimitive v_resp2;
@@ -3357,9 +3356,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
- v_acpAuxIndex := f_cse_preamble_createAcpAux();
+ f_cse_createAccessControlPolicyAux();
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
@@ -3449,7 +3448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_002() runs on AeSimu system CseSystem {
// Local variables
- var integer v_aeIndex, v_acpAuxIndex := -1;
+ var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1, v_req2, v_req3;
var MsgIn v_resp1, v_resp3;
@@ -3464,11 +3463,11 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
- v_acpAuxIndex := f_cse_preamble_createAcpAux();
+ f_cse_createAccessControlPolicyAux();
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
@@ -3554,7 +3553,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_003() runs on AeSimu system CseSystem {
//Local variables
- var integer v_aeIndex, v_acpAuxIndex := -1;
+ var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1;
var RequestPrimitive v_req2;
@@ -3572,11 +3571,11 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
-
- v_acpAuxIndex := f_cse_preamble_createAcpAux();
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
+ f_cse_createAccessControlPolicyAux();
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
@@ -3785,7 +3784,7 @@ module OneM2M_Testcases_CSE_Release_2 {
function f_CSE_PCH_006() runs on AeSimu system CseSystem {
// Local variables
- var integer v_aeIndex, v_acpAuxIndex := -1;
+ var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_req1;
@@ -3800,9 +3799,9 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
- v_acpAuxIndex := f_cse_preamble_createAcpAux();
+ f_cse_createAccessControlPolicyAux();
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//AE1 is registred;
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
@@ -4014,7 +4013,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- v_ae1.start(f_CSE_RT_NBS_003(m_updateContainerBase, m_createContainerBase, int3)); //Update Container
+ v_ae1.start(f_CSE_RT_NBS_003(v_updateRequest, m_createContainerBase, int3)); //Update Container
v_ae1.done;
}
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 600e027f30bff05c0512275f471ec14fdd5e4b1a..3b7054217d0cc1b2de782c215e7008ea023eac66 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -591,7 +591,7 @@ module OneM2M_Testcases_CSE_Release_3 {
v_createRequest.primitiveContent.timeSeries.resourceName := omit;
- v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAeAux(omit,omit)));//TimeSeries
+ v_ae1.start(f_CSE_DMR_CRE_001(int29, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//TimeSeries
v_ae1.done;
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
@@ -6446,7 +6446,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_LOC_003() runs on AeSimu system CseSystem {//the originator has no privileges to create a locationPolicy resource!!
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
var ListOfDuration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
@@ -6464,9 +6463,9 @@ module OneM2M_Testcases_CSE_Release_3 {
f_cf01Up();
//Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int62);//c_RUDNDi) //No resource creation privilege
+ f_cse_createAccessControlPolicyAux(-, -, int62);//c_RUDNDi) //No resource creation privilege
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
//Set requestPrimitive
v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource,omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
@@ -12391,7 +12390,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_DAU_NTF_003() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -12411,8 +12409,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int61);//c_CUDNDi) //No resource retrieval privilege
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
var template RequestPrimitive v_createRequest := m_createContainerBase;
v_createRequest.primitiveContent.container.dynamicAuthorizationConsultationIDs := {"unknown_dac_id"};
@@ -12464,7 +12462,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_DAU_NTF_004() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
@@ -12486,8 +12483,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int61);//c_CUDNDi) //No resource retrieval privilege
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int61);//c_CUDNDi) //No resource retrieval privilege
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, false); //dynamicAuthorizationEnable set to FALSE
v_dynamicAuthorizationConsultationIndex := f_cse_createResource(int34, v_createRequest1, v_aeIndex);
@@ -12545,7 +12542,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var RequestPrimitive v_notificationRequest;
var integer v_dasIndex := -1;
var integer v_ae1Index := -1;
- var integer v_containerIndex := -1, v_acpIndex := -1;
+ var integer v_containerIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -12566,11 +12563,11 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_ae1Index := f_cse_preamble_registerAe();
- v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
+ f_cse_createAccessControlPolicyAux(-, -, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
var template RequestPrimitive v_createRequest2 := m_createContainerBase;
- f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, v_acpIndex, v_createRequest1, v_createRequest2);
+ f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, vc_acpIndex, v_createRequest1, v_createRequest2);
vc_das.start(f_cse_notifyProcedure_dynamicAuthorizationHandler(2)); //Dynamic Authorization Response
// Test Body
@@ -12628,7 +12625,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var Timestamp v_privilegesLifetime := "21001231T012345";
var integer v_dasIndex := -1;
var integer v_ae1Index := -1;
- var integer v_containerIndex := -1, v_acpIndex := -1;
+ var integer v_containerIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
// Test control
@@ -12648,11 +12645,11 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_ae1Index := f_cse_preamble_registerAe();
- v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
+ f_cse_createAccessControlPolicyAux(-, -, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
var template RequestPrimitive v_createRequest2 := m_createContainerBase;
- f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, v_acpIndex, v_createRequest1, v_createRequest2);
+ f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, vc_acpIndex, v_createRequest1, v_createRequest2);
vc_das.start(f_cse_notifyProcedure_dynamicAuthorizationHandler(2, -, v_grantedPrivileges, v_privilegesLifetime)); //Dynamic Authorization Response
// Test Body
@@ -12761,7 +12758,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var DynAuthJWT v_token;
var integer v_dasIndex := -1;
var integer v_ae1Index := -1;
- var integer v_containerIndex := -1, v_acpIndex := -1;
+ var integer v_containerIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
// Test control
@@ -12781,11 +12778,11 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_ae1Index := f_cse_preamble_registerAe();
- v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
+ f_cse_createAccessControlPolicyAux(-, -, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
var template RequestPrimitive v_createRequest2 := m_createContainerBase;
- f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, v_acpIndex, v_createRequest1, v_createRequest2);
+ f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, vc_acpIndex, v_createRequest1, v_createRequest2);
v_token := fx_generateJWT();
vc_das.start(f_cse_notifyProcedure_dynamicAuthorizationHandler(2, v_token)); //Dynamic Authorization Response
@@ -12842,7 +12839,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var RequestPrimitive v_notificationRequest;
var integer v_dasIndex := -1;
var integer v_ae1Index := -1;
- var integer v_containerIndex := -1, v_acpIndex := -1;
+ var integer v_containerIndex := -1;
var integer v_dynamicAuthorizationConsultationIndex := -1;
// Test control
@@ -12862,11 +12859,11 @@ module OneM2M_Testcases_CSE_Release_3 {
// Preamble
v_ae1Index := f_cse_preamble_registerAe();
- v_acpIndex := f_cse_preamble_createAcpAux(-, int61); //c_CUDNDi), no resource retrieval privilege
+ f_cse_createAccessControlPolicyAux(-, -, int61); //c_CUDNDi), no resource retrieval privilege
var template RequestPrimitive v_createRequest1 := m_createDynamicAuthorizationConsultationBase(omit, true); //dynamicAuthorizationEnable set to TRUE
var template RequestPrimitive v_createRequest2 := m_createContainerBase;
- f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, v_acpIndex, v_createRequest1, v_createRequest2);
+ f_cse_preamble_dau(v_dasIndex, v_dynamicAuthorizationConsultationIndex, v_containerIndex, vc_acpIndex, v_createRequest1, v_createRequest2);
vc_das.start(f_cse_notifyProcedure_dynamicAuthorizationHandler(1)); //Dynamic Authorization Request
// Test Body
@@ -13081,7 +13078,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var MsgIn v_response;
var template RequestPrimitive v_request;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var ResourceType v_resourceType := int24; //Semantic Descriptor
var template (omit) XSD.Base64Binary invalidDescriptor := '1234'O;
@@ -13091,8 +13087,8 @@ module OneM2M_Testcases_CSE_Release_3 {
f_cf01Up();
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
v_request := f_getCreateRequestPrimitive(v_resourceType, m_createSemanticDescriptorBase, v_aeIndex);
@@ -13138,7 +13134,6 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var template RequestPrimitive v_request;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var ResourceType v_resourceType := int24; //Semantic Descriptor
var template (omit) XSD.Boolean v_validationEnable := true;
var template (omit) XSD.AnyURI v_invalidOntologyRef := "http://invalidUri";
@@ -13151,8 +13146,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test body
v_request := f_getCreateRequestPrimitive(v_resourceType, m_createSemanticDescriptorBase, v_aeIndex);
@@ -13198,7 +13193,6 @@ module OneM2M_Testcases_CSE_Release_3 {
//Local variables
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var ResourceType v_resourceType := int24; //Semantic Descriptor
var template (omit) ListOfURIs v_relatedSemantics := {"http://invalidUri"};
var template (omit) XSD.Boolean v_validationEnable := true;
@@ -13212,8 +13206,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
v_request := f_getCreateRequestPrimitive(v_resourceType, m_createSemanticDescriptorBase, v_aeIndex);
v_request.primitiveContent.semanticDescriptor.validationEnable := v_validationEnable;
@@ -13419,7 +13413,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_006() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var XSD.AnyURI v_invalidSmjpID := "Invlid_AnyURI";
var RequestPrimitive v_request;
var integer v_resourceIndexJobProfile := -1;
@@ -13432,8 +13425,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13481,7 +13474,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndexJobProfile := -1;
@@ -13496,8 +13488,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13549,7 +13541,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_008() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
const octetstring v_invalidSmjpInputParameter := int2oct(0,76584);
@@ -13564,8 +13555,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
//Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13619,7 +13610,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_MashupInstancerequest;
@@ -13635,8 +13625,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
// member filter query to identify a non existing member
@@ -13691,7 +13681,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_010() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndexJobProfile := -1;
@@ -13706,8 +13695,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_request := f_getCreateRequestPrimitive(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13753,7 +13742,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_011() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndexJobProfile := -1;
@@ -13768,8 +13756,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_request := f_getCreateRequestPrimitive(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13815,7 +13803,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_012() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndexJobProfile := -1;
@@ -13831,8 +13818,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_request := f_getCreateRequestPrimitive(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13878,7 +13865,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_CRE_013() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndexJobProfile := -1;
@@ -13894,8 +13880,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_request := f_getCreateRequestPrimitive(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -13942,7 +13928,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_MashupInstancerequest;
@@ -13956,8 +13941,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, v_createRequestJobProfile, v_aeIndex);
@@ -14014,7 +13999,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_MashupInstancerequest;
@@ -14028,8 +14012,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, v_createRequestJobProfile, v_aeIndex);
@@ -14088,7 +14072,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_MashupInstancerequest;
@@ -14105,8 +14088,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, v_createRequestJobProfile, v_aeIndex);
@@ -14179,7 +14162,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_resourceIndex1 := -1;
@@ -14198,8 +14180,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
//Create Semantic Descritor
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -14249,7 +14231,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
@@ -14266,8 +14247,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -14316,7 +14297,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
@@ -14334,8 +14314,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Test Body
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -14386,7 +14366,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var integer v_aeIndex, v_remoteCseIndex, v_targetResourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive p_updateRequestPrimitive := m_updateSemanticDescriptorBase;
var RequestPrimitive v_request;
@@ -14560,7 +14539,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var integer v_aeIndex, v_remoteCseIndex, v_targetResourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive p_updateRequestPrimitive := m_updateSemanticDescriptorBase;
var RequestPrimitive v_request;
@@ -14735,7 +14713,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_008() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_updateRequest;
@@ -14749,8 +14726,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -14796,7 +14773,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_009() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_updateRequest;
@@ -14810,8 +14786,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -14857,7 +14833,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_010() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_updateRequest;
@@ -14871,8 +14846,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -14918,7 +14893,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_011() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_updateRequest;
@@ -14932,8 +14906,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// Create JobProfile resource
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -14979,7 +14953,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_012() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_createReqSmi;
@@ -14993,8 +14966,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -15052,7 +15025,6 @@ module OneM2M_Testcases_CSE_Release_3 {
function f_CSE_SEM_UPD_013() runs on AeSimu system CseSystem {
// Local variables
- var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndexJobProfile := -1;
var RequestPrimitive v_createReqSmi;
@@ -15067,8 +15039,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
// semanticMashupJobProfile
v_resourceIndexJobProfile := f_cse_createResource(int40, m_createSemanticMashupJobProfileBase, v_aeIndex);
@@ -15138,7 +15110,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_acpIndex;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
@@ -15288,7 +15260,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var ListOfURIs v_membersAcpIds;
var ResourceType p_resourceType := int9;
var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
var template RequestPrimitive v_groupRequest;
var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
@@ -15354,7 +15326,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var MsgIn v_response;
var XSD.AnyURI v_fanoutPointAddress;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_acpIndex;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_retrieveRequest;
@@ -15367,8 +15338,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
v_resourceIndex := f_cse_createResource(int24, m_createSemanticDescriptorBase, v_aeIndex);
@@ -15440,7 +15411,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var integer v_groupIndex := -1;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template RequestPrimitive v_createAcp := m_createAcpBase;
// Test component configuration
f_cf01Up();
@@ -15520,7 +15491,6 @@ module OneM2M_Testcases_CSE_Release_3 {
// Local variables
var integer v_aeIndex, v_remoteCseIndex, v_targetResourceIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var ResponseStatusCode v_responseStatusCode := int2004;
var RequestPrimitive v_request;
@@ -15817,7 +15787,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_containerIndex := -1;
var integer v_contentInstanceIndex := -1;
var FilterCriteria v_filterCriteria := valueof(m_filterCriteria);
@@ -15829,8 +15798,8 @@ module OneM2M_Testcases_CSE_Release_3 {
f_cf01Up();
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
//Create <container>
v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex);
@@ -15893,7 +15862,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_retrieveRequest;
var template RequestPrimitive v_createRequestPrimitive := m_createSemanticMashupJobProfileBase;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -15904,8 +15872,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
v_resourceIndex := f_cse_createResource(int40, v_createRequestPrimitive, v_aeIndex); //SemanticMashupJobProfile
// Test Body
@@ -15964,7 +15932,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_retrieveRequest;
var template RequestPrimitive v_createRequestPrimitive := m_createSemanticMashupInstanceBase;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -15974,8 +15941,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
v_resourceIndex := f_cse_createResource(int41, v_createRequestPrimitive, v_aeIndex); //SemanticMashupInstance
// Test Body
@@ -16034,7 +16001,6 @@ module OneM2M_Testcases_CSE_Release_3 {
var ResourceType p_resourceType := int42; //semanticMashupResult
var template RequestPrimitive p_createRequestPrimitive := m_createSemanticMashupResultBase;
var integer v_aeIndex := -1;
- var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
var template PrimitiveContent v_contentResponse;
@@ -16044,8 +16010,8 @@ module OneM2M_Testcases_CSE_Release_3 {
// Test adapter configuration
// Preamble
- v_acpAuxIndex := f_cse_preamble_createAcpAux(-, int63);
- v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);
+ f_cse_createAccessControlPolicyAux(-, -, int63);
+ v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); //SemanticMashupResult
v_contentResponse.semanticMashupResult := mw_retrievSemanticMashupResult; // check for attributes of resource representation