diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 350ce7a0561f57c459d890d8ae05567c4f11834c..87133a01b5d66e91b2742891c275b067f0d90a5f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -28,19 +28,46 @@ module OneM2M_Functions {
/**
@desc Ports mapping and default behaviour activation for Config 1
*/
- function f_cf01Up() runs on CseTester {
-
+ function f_cf01Up(in boolean p_auxiliaryAe2Required := false) runs on AeSimu {
+
// Variables
vc_config := e_cf01;
// Map
map(self:mcaPort, system:mcaPort);
map(self:acPort, system:acPort);
+
activate(a_default());
activate(a_cse_cf01());
- // Connect
-
+ // Initialize AE2
+ if(p_auxiliaryAe2Required) {
+ vc_auxiliaryAe2Up := p_auxiliaryAe2Required;
+ vc_ae2 := AeSimu.create("AE2") alive;
+ vc_ae2.start(f_cf01UpAe2());
+ }
+
+ //Initialze the IUT
+
+ } // end f_cf01Up
+
+ /**
+ @desc Ports mapping and default behaviour activation for Config 1 on the auxiliary AE2
+ */
+ function f_cf01UpAe2() runs on AeSimu {
+
+ // Variables
+ vc_config := e_cf01;
+
+ // Map
+ map(self:mcaPort, system:mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn);
+ map(self:acPort, system:acPort);
+
+ activate(a_default());
+ activate(a_cse_cf01());
+ activate(a_cse_cf01_ae2()); //For mcaPortIn
+
//Initialze the IUT
} // end f_cf01Up
@@ -48,28 +75,51 @@ module OneM2M_Functions {
/**
* @desc Ports mapping and default behaviour activation for Config 02
*/
- function f_cf02Up() runs on CseTester {
+ function f_cf02Up() runs on AeSimu {
// Variables
vc_config := e_cf02;
+ vc_cseSimu := CseSimu.create("CSE1") alive;
// Map
map(self:mcaPort, system:mcaPort);
- map(self:mccPort, system:mccPort);
+ map(vc_cseSimu:mccPort, system:mccPort);
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf02());
+ activate(a_cse_aeSimu());
// Connect
-
+ f_connectInfoPort(vc_cseSimu);
//Initialze the IUT
} // end f_cf02Up
+
+ /**
+ * @desc Ports mapping and default behaviour activation for Config 02
+ */
+ function f_cf02UpCseSimuMaster() runs on CseSimu {
+
+ // Variables
+ vc_config := e_cf02;
+ vc_aeSimu := AeSimu.create("AE1") alive;
+
+ // Map
+ map(self:mccPort, system:mccPort);
+ map(vc_aeSimu:mcaPort, system:mcaPort);
+ map(self:acPort, system:acPort);
+ activate(a_default());
+ activate(a_cse_cseSimu());
+
+ // Connect
+ f_connectInfoPort(vc_aeSimu);
+ //Initialze the IUT
+
+ } // end f_cf02UpCseSimuMaster
/**
* @desc Ports mapping and default behaviour activation for Config 03
*/
- function f_cf03Up() runs on AeTester {
+ function f_cf03Up() runs on CseSimu {
// Variables
vc_config := e_cf03;
@@ -89,7 +139,7 @@ module OneM2M_Functions {
/**
* @desc Ports mapping and default behaviour activation for Config 04
*/
- function f_cf04Up() runs on CseTester {
+ function f_cf04Up() runs on CseSimu {
// Variables
vc_config := e_cf04;
@@ -110,7 +160,7 @@ module OneM2M_Functions {
* @desc Ports unmapping
* @verdict
*/
- function f_cfCseTesterDown() runs on CseTester {
+ /*function f_cfCseTesterDown() runs on Tester {
if(vc_config == e_cf01) {
f_cf01Down()
@@ -122,35 +172,62 @@ module OneM2M_Functions {
* @desc Ports unmapping
* @verdict
*/
- function f_cfAeTesterDown() runs on AeTester {
+ /*function f_cfAeTesterDown() runs on AeSimu {
if(vc_config == e_cf03) {
f_cf03Down()
}
- }
+ }
/**
* @desc Ports unmapping
* @verdict
*/
- function f_cf01Down() runs on CseTester {
+ function f_cf01Down() runs on AeSimu {
unmap(self:mcaPort, system:mcaPort);
unmap(self:acPort, system:acPort);
- }
+ if(vc_auxiliaryAe2Up) {
+ vc_ae2.start(f_cf01DownAe2());
+ }
+ }
+
+ /**
+ * @desc Ports unmapping
+ * @verdict
+ */
+ function f_cf01DownAe2() runs on AeSimu {
+
+ unmap(self:mcaPort, system:mcaPort);
+ unmap(self:acPort, system:acPort);
+ unmap(self:mcaPortIn, system:mcaPortIn);
+ }
+
/**
* @desc Ports unmapping
* @verdict
*/
- function f_cf02Down() runs on CseTester {
+ function f_cf02Down() runs on AeSimu {
unmap(self:mcaPort, system:mcaPort);
+ unmap(vc_cseSimu:mccPort, system:mccPort);
+ unmap(self:acPort, system:acPort);
+ unmap(vc_cseSimu:acPort, system:acPort);
+ }
+ /**
+ * @desc Ports unmapping
+ * @verdict
+ */
+ function f_cf02DownCseSimuMaster() runs on CseSimu {
+
unmap(self:mccPort, system:mccPort);
+ unmap(vc_aeSimu:mcaPort, system:mcaPort);
unmap(self:acPort, system:acPort);
+ unmap(vc_aeSimu:acPort, system:acPort);
}
/**
* @desc Ports unmapping for Config 03
*/
- function f_cf03Down() runs on AeTester {
+ function f_cf03Down() runs on CseSimu {
unmap(self:mcaPort, system:mcaPort);
unmap(self:acPort, system:acPort);
@@ -159,12 +236,22 @@ module OneM2M_Functions {
/**
* @desc Ports unmapping for Config 04
*/
- function f_cf04Down() runs on CseTester {
+ function f_cf04Down() runs on CseSimu {
unmap(self:mccPort, system:mccPort);
unmap(self:acPort, system:acPort);
}
+ function f_connectInfoPort(in Tester p_tester) runs on Tester {
+ // Connect
+ connect(self:infoPort, p_tester:infoPort);
+ }
+
+ function f_disconnectInfoPort(in Tester p_tester) runs on Tester {
+ // Disconnect
+ disconnect(self:infoPort, p_tester:infoPort);
+ }
+
}//end group configFunctions
group CseFunctions {
@@ -177,7 +264,7 @@ module OneM2M_Functions {
* @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 CseTester return integer {//c_CRUDNDi
+ 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);
@@ -190,7 +277,7 @@ module OneM2M_Functions {
* @return Internal AE resource index
* @verdict
*/
- function f_cse_preamble_registerAe(template (omit) AcpType p_accessControlPolicyIDs := omit, in template (omit) PoaList p_poaList := omit) runs on CseTester return integer {//c_CRUDNDi
+ function f_cse_preamble_registerAe(template (omit) AcpType p_accessControlPolicyIDs := omit, in template (omit) PoaList p_poaList := omit) runs on AeSimu return integer {//c_CRUDNDi
var RequestPrimitive v_request;
var MsgIn v_response;
@@ -236,7 +323,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
return vc_aeAuxIndex;
}
@@ -247,10 +334,9 @@ module OneM2M_Functions {
* @return Internal AE resource index
* @verdict
*/
- function f_cse_preamble_registerAeWithId(XSD.ID p_appId, in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer {//c_CRUDNDi
+ function f_cse_preamble_registerAeWithId(XSD.ID p_appId, in template (value) AccessControlOperations p_allowedOperations := int63) runs on AeSimu return integer {//c_CRUDNDi
var RequestPrimitive v_request;
- var MsgIn v_response;
var integer v_aeAuxIndex := -1;
var integer v_acpAuxIndex := -1;
@@ -273,15 +359,15 @@ module OneM2M_Functions {
}
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&": INFO: Application registered successfuly");
- if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)) {
+ if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.aE)) {
- vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2);
+ vc_aeAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int2);
- if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
- f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(v_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)));
+ if(ispresent(vc_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)){
+ f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_response.primitive.responsePrimitive.primitiveContent.aE.aE_ID)));
} else {
f_sendAcPrimitive("AE-ID_changed", "0");
}
@@ -304,12 +390,12 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
return vc_aeAuxIndex;
}
- function f_cse_preamble_createServiceSubscribedAppRule(in template ListOfM2MID p_allowedAEs := {""}) runs on CseTester return integer {//c_CRUDNDi
+ function f_cse_preamble_createServiceSubscribedAppRule(in template ListOfM2MID p_allowedAEs := {""}) runs on AeSimu return integer {//c_CRUDNDi
var integer v_serviceSubscribedAppRuleIndex := -1;
@@ -319,14 +405,33 @@ module OneM2M_Functions {
}
- function f_cse_preamble_subscriptionVerification(out CseTester p_notifyHandler,in integer p_aeIndex, inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on CseTester {
+ function f_cse_preamble_createServiceSubscribedProfile(in template ListOfM2MID p_allowedAEs := {""}) runs on AeSimu return integer {//c_CRUDNDi
+
+ var integer v_serviceSubscribedAppRuleIndex := -1;
+ var integer v_serviceSubscribedProfileIndex := -1;
+ var template RequestPrimitive m_request := m_createM2mServiceSubscriptionProfileBase;
+
+ //TODO Create/Update serviceSubscribedNode //m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode := m_contentServiceSubscribedNode;
+ v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs)));
+ m_request.primitiveContent.m2mServiceSubscriptionProfile.choice.choice_list[0].serviceSubscribedNode.ruleLinks := {f_getResourceAddress(v_serviceSubscribedAppRuleIndex)};
+ v_serviceSubscribedProfileIndex := f_cse_createResource(int11, m_request);
+
+ return v_serviceSubscribedProfileIndex;
+
+ }
+
+ function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
if(p_resourceType == int23){
- p_notifyHandler := CseTester.create("NotifyHandler") alive;
- p_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1); // AE2 is registred
+
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
+
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
+ p_ae2Index := f_getResource(vc_ae2);
if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
}
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_aeIndex, p_responseStatusCode));
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_responseStatusCode));
}
}
@@ -338,13 +443,17 @@ module OneM2M_Functions {
* @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution
* @verdict
*/
- function f_cse_postamble_deleteResources() runs on CseTester {
+ function f_cse_postamble_deleteResources() runs on AeSimu {
var integer i;
var XSD.ID v_resourceAddress;
var RequestPrimitive v_request;
if (PX_RUN_POSTAMBLE) {
+ if(vc_auxiliaryAe2Up) {
+ f_cse_postamble_aeSimu(vc_ae2);
+ }
+
for(i := lengthof(vc_resourcesIndexToBeDeleted) -1; i >=0; i := i - 1) {
v_resourceAddress := f_getResourceAddress(vc_resourcesIndexToBeDeleted[i]);
@@ -372,15 +481,25 @@ module OneM2M_Functions {
}
}
-
- f_cse_postamble_default();
+
+ }
+
+ /**
+ * @desc Calls to postamble for AE2 entity
+ * @verdict
+ */
+ function f_cse_postamble_aeSimu(in AeSimu p_ae) runs on AeSimu {
+ if(p_ae.running) {
+ p_ae.stop;
+ }
+ p_ae.start(f_cse_postamble_deleteResources());
}
/**
* @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution
* @verdict
*/
- function f_cse_postamble_deleteResourcesCSE() runs on CseTester {
+ function f_cse_postamble_deleteResourcesCSE() runs on CseSimu {
var integer i;
var XSD.ID v_resourceAddress;
var RequestPrimitive v_request;
@@ -414,35 +533,178 @@ module OneM2M_Functions {
}
}
+
+ }
+
+ /**
+ @desc
+ */
+ function f_getResponsePrimitive(in AeSimu p_ae) runs on Tester return ResponsePrimitive {
+ var ResponsePrimitive v_response;
- f_cse_postamble_default();
+ f_connectInfoPort(p_ae);
+
+ p_ae.start(f_sendResponsePrimitive());
+ alt {
+ []infoPort.receive(mw_responsePrimitiveforInfoPort) -> value v_response {
+ }
+ }
+
+ f_disconnectInfoPort(p_ae);
+
+ return v_response;
+
}
/**
- * @desc Default postamble
- * @verdict
- */
- function f_cse_postamble_default() runs on CseTester {
+ @desc
+ */
+ function f_getRequestPrimitive(in AeSimu p_ae) runs on Tester return RequestPrimitive {
+ var RequestPrimitive v_request;
+
+ f_connectInfoPort(p_ae);
+
+ p_ae.start(f_sendRequestPrimitive());
+ alt {
+ []infoPort.receive(mw_requestPrimitiveforInfoPort) -> value v_request {
+ }
+ }
+
+ f_disconnectInfoPort(p_ae);
+
+ return v_request;
+
}
- function f_is_component_done(in CseTester p_notifyHandler) runs on CseTester {
+ function f_getRemoteCseRequestPrimitive(in CseSimu p_cse) runs on Tester return RequestPrimitive {
+ var RequestPrimitive v_request;
+
+ f_connectInfoPort(p_cse);
+
+ p_cse.start(f_sendRemoteCseRequestPrimitive());
+ alt {
+ []infoPort.receive(mw_requestPrimitiveforInfoPort) -> value v_request {
+ }
+ }
+
+ f_disconnectInfoPort(p_cse);
+
+ return v_request;
+
+ }
- tc_ac.start(10.0);
+
+ /**
+ @desc
+ */
+ function f_getPrimitiveContentRetrievedResource(in AeSimu p_ae) runs on Tester return PrimitiveContent {
+ var PrimitiveContent v_primitiveContent;
+
+ f_connectInfoPort(p_ae);
+
+ p_ae.start(f_sendPrimitiveContentRetrievedResource());
alt {
- [] p_notifyHandler.done {
- tc_ac.stop;
+ []infoPort.receive(mw_primitiveContent) -> value v_primitiveContent {
}
- [] tc_ac.timeout {
- setverdict(inconc, __SCOPE__ & "INFO: Notify verification not received");
+ }
+
+ f_disconnectInfoPort(p_ae);
+
+ return v_primitiveContent;
+
+ }
+
+ /**
+ @desc
+ */
+ function f_getRemoteCseResource(in CseSimu p_cse) runs on AeSimu return integer {
+ var MyResource v_resource;
+ var integer v_resourceIndex := -1;
+
+ f_connectInfoPort(p_cse);
+
+ p_cse.start(f_sendRemoteCseResource());
+ alt {
+ []infoPort.receive(mw_resource) -> value v_resource {
+ v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex, false);
}
}
- } //end f_is_component_done
+
+ f_disconnectInfoPort(p_cse);
+
+ return v_resourceIndex;
+
+ }
+
+ /**
+ @desc
+ */
+ function f_getResource(in AeSimu p_ae, in integer p_resourceIndex := -1) runs on AeSimu return integer {
+ var MyResource v_resource;
+ var integer v_resourceIndex := -1;
+
+ f_connectInfoPort(p_ae);
+
+ p_ae.start(f_sendResource(p_resourceIndex));
+ alt {
+ []infoPort.receive(mw_resource) -> value v_resource {
+ v_resourceIndex := f_setResource(v_resource.resource, v_resource.resourceType, v_resource.parentIndex, false);
+ }
+ }
+
+ f_disconnectInfoPort(p_ae);
+
+ p_ae.done;
+
+ return v_resourceIndex;
+
+ }
+
+ function f_sendResponsePrimitive() runs on AeSimu {
+
+ infoPort.send(vc_response.primitive.responsePrimitive);
+
+ }
+
+ function f_sendRequestPrimitive() runs on AeSimu {
+
+ infoPort.send(vc_request.primitive.requestPrimitive);
+
+ }
+
+ function f_sendRemoteCseRequestPrimitive() runs on CseSimu {
+
+ infoPort.send(vc_request.primitive.requestPrimitive);
+
+ }
+
+ function f_sendPrimitiveContentRetrievedResource() runs on AeSimu {
+
+ infoPort.send(vc_primitiveContentRetrievedResource);
+
+ }
+
+ function f_sendRemoteCseResource() runs on CseSimu {
+
+ infoPort.send(vc_resourcesList[vc_remoteCseIndex]);
+
+ }
+
+ function f_sendResource(in integer p_resourceIndex) runs on AeSimu {
+
+ if(p_resourceIndex == -1) {
+ infoPort.send(vc_resourcesList[vc_aeAuxIndex]);
+ } else {
+ infoPort.send(vc_resourcesList[p_resourceIndex]);
+ }
+
+ }
}//end group postambleFunctions
- group HelpingFunctions {
-
+ group AeSimuFunctions {
+
/**
* @desc Creation of a resource
* @param p_resourceType Resource type of the resource to be created
@@ -451,9 +713,8 @@ module OneM2M_Functions {
* @return Internal resource index of the created resource
* @verdict
*/
- function f_cse_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive := m_create, integer p_parentIndex := -1) runs on CseTester return integer {
+ function f_cse_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive := m_create, integer p_parentIndex := -1) runs on AeSimu return integer {
- var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_resourceIndex := -1;
@@ -462,11 +723,14 @@ module OneM2M_Functions {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
- f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, p_parentIndex);
+ 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;
+ }
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -481,7 +745,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
return v_resourceIndex;
@@ -494,8 +758,7 @@ module OneM2M_Functions {
* @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 CseTester return integer{ var RequestPrimitive v_request;
- var MsgIn v_response;
+ 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{ var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations));
@@ -505,11 +768,11 @@ module OneM2M_Functions {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(1) & " created successfuly");
- f_checkAttributesToBeSaved(int1, v_request, v_response.primitive.responsePrimitive);
- v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1);
+ f_checkAttributesToBeSaved(int1, v_request, vc_response.primitive.responsePrimitive);
+ v_acpAuxIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, int1);
vc_acpAuxIndex := v_acpAuxIndex;
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
@@ -525,7 +788,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
return v_acpAuxIndex;
@@ -538,7 +801,7 @@ module OneM2M_Functions {
* @return Internal resource index of the created Container resource
* @verdict
*/
- function f_cse_createContainerResourceAux (integer p_parentIndex := -1) runs on CseTester return integer {
+ function f_cse_createContainerResourceAux (integer p_parentIndex := -1) runs on AeSimu return integer {
var RequestPrimitive v_request;
var integer v_acpAuxIndex := -1;
@@ -561,17 +824,16 @@ module OneM2M_Functions {
* @param p_requestPrimitive
* @verdict
*/
- function f_cse_updateResource(in RequestPrimitive p_requestPrimitive) runs on CseTester {
- var MsgIn v_response;
+ function f_cse_updateResource(in RequestPrimitive p_requestPrimitive) runs on AeSimu {
mcaPort.send(m_request(p_requestPrimitive));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Attribute of resource updated successfuly");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while updating resource");
}
@@ -584,7 +846,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
}// end f_cse_updateResource
@@ -593,17 +855,16 @@ module OneM2M_Functions {
* @param p_resourceIndex
* @verdict
*/
- function f_cse_retrieveResource(integer p_resourceIndex) runs on CseTester return PrimitiveContent{
- var MsgIn v_response;
+ function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while retrieving resource");
}
@@ -616,9 +877,9 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
- return v_response.primitive.responsePrimitive.primitiveContent;
+ return vc_response.primitive.responsePrimitive.primitiveContent;
}// end f_cse_retrievingResource
@@ -627,7 +888,7 @@ module OneM2M_Functions {
* @param p_requestPrimitive
* @verdict
*/
- function f_cse_deleteResource(in integer p_index, in template (omit) RequestPrimitive p_requestPrimitive := omit) runs on CseTester {
+ function f_cse_deleteResource(in integer p_index, in template (omit) RequestPrimitive p_requestPrimitive := omit) runs on AeSimu {
var RequestPrimitive v_request;
if(not isvalue(p_requestPrimitive)) {
@@ -655,7 +916,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
}// end f_cse_deleteResource
@@ -664,7 +925,7 @@ module OneM2M_Functions {
* @param p_resourceIndex Resource index
* @return boolean
*/
- function f_isResourcePresent (integer p_resourceIndex) runs on CseTester return boolean {
+ function f_isResourcePresent (integer p_resourceIndex) runs on AeSimu return boolean {
//Check to see if the resource is present or not
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
@@ -694,29 +955,26 @@ module OneM2M_Functions {
* @param p_resourceName Resource name (Hierarchical method is used)
* @return boolean
*/
- function f_isResourceNotPresent (integer p_parentIndex, XSD.String p_resourceName) runs on CseTester return boolean {
+ function f_isResourceNotPresent (integer p_parentIndex, XSD.String p_resourceName) runs on AeSimu return boolean {
- log(testcasename() & ":INFO: Hierarchical method is required to check the non presence of the resource");
- vc_addressingMethod := e_hierarchical;
+ log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
+
//Check to see if the resource has NOT been created
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource not present");
- vc_addressingMethod := PX_ADDRESSING_METHOD;
return true;
}
[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
tc_ac.stop;
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
- vc_addressingMethod := PX_ADDRESSING_METHOD;
return false;
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No answer while retrieving resource");
- vc_addressingMethod := PX_ADDRESSING_METHOD;
return false;
}
}
@@ -728,7 +986,7 @@ module OneM2M_Functions {
* @param p_allowedOperations New allowed operations
* @verdict
*/
- function f_cse_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on CseTester {
+ function f_cse_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on AeSimu {
var RequestPrimitive v_request;
v_request := valueof(m_updateAcpBase);
@@ -753,7 +1011,7 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
}
/**
@@ -763,23 +1021,23 @@ module OneM2M_Functions {
* @verdict
*/
//TODO To finalize this function
- function f_cse_resourceAnnouncementHandler(template XSD.ID p_from := *, template XSD.ID p_to := ?) runs on CseTester {
+ function f_cse_resourceAnnouncementHandler(template XSD.ID p_from := *, template XSD.ID p_to := ?) runs on CseSimu {
// Local variables
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- map(self:mccPort, system:mccPort);
- map(self:acPort, system:acPort);
-
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_create(p_from, p_to))) -> value v_request {
+ [] mccPort.receive(mw_request(mw_create(p_from, p_to))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
+ //TODO Save resource and generate required attributes
v_responsePrimitive := f_getCreateResponsePrimitive(v_request.primitive.requestPrimitive.resourceType, v_request.primitive.requestPrimitive);
- mcaPort.send(m_response(v_responsePrimitive));
+ mccPort.send(m_response(v_responsePrimitive));
+ f_checkAttributesToBeSaved(v_request.primitive.requestPrimitive.resourceType, v_request.primitive.requestPrimitive, vc_response.primitive.responsePrimitive);
+ f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, v_request.primitive.requestPrimitive.resourceType, vc_remoteCseIndex);
}
- [] mcaPort.receive{
+ [] mccPort.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Unexpected message received");
}
@@ -787,10 +1045,52 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ":ERROR: No announcement received");
}
}
+
+ f_checkCseSimuStatus();
+
+ } //end f_cse_resourceAnnouncementHandler
+
+ /**
+ * @desc Function for announcement of resources
+ * @param p_from
+ * @param p_to
+ * @verdict
+ */
+ //TODO To finalize this function
+ function f_cse_announceResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive := m_create) runs on CseSimu return integer {
+ // Local variables
+ var RequestPrimitive v_request;
+ var ResponsePrimitive v_responsePrimitive;
+ var integer v_resourceIndex := -1;
+
+ v_request := f_getCreateRequestPrimitive(f_getAnnouncedResourceType(p_resourceType), p_requestPrimitive, vc_remoteCseIndex);
+
+ mccPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
+ f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, vc_remoteCseIndex);
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type " & int2str(enum2int(p_resourceType)));
+ }
+ [] mcaPort.receive {
+ tc_ac.stop;
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
+ }
+ [] tc_ac.timeout {
+ setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+ }
+ }
+
+ f_checkCseSimuStatus();
+
+ return v_resourceIndex;
- unmap(self:mccPort, system:mccPort);
- unmap(self:acPort, system:acPort);
-
} //end f_cse_resourceAnnouncementHandler
function f_checkAttributesToBeSaved (ResourceType p_resourceType, RequestPrimitive p_request, inout ResponsePrimitive p_response) {
@@ -866,49 +1166,48 @@ module OneM2M_Functions {
// TODO test that if the resource name is returned is the same resource name as used in the create message
}
- function f_compareURIs(in integer p_expectedURIIndex, in XSD.ID p_receivedURI) runs on CseTester return boolean{
+ function f_compareURIs(in integer p_expectedURIIndex, in XSD.ID p_receivedURI) runs on Tester return boolean{
// Local variables
var boolean v_matchResult := false;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
if (f_isNonHierarchical(p_receivedURI)) {
- vc_addressingMethod := e_nonHierarchical;
+ v_addressingMethod := e_nonHierarchical;
} else if (f_isHierarchical(p_receivedURI)) {
- vc_addressingMethod := e_hierarchical;
+ v_addressingMethod := e_hierarchical;
}
if (f_isScopeCseRelative(p_receivedURI)) {
- vc_primitiveScope := e_cseRelative;
+ v_primitiveScope := e_cseRelative;
}
if (f_isScopeSpRelative(p_receivedURI)) {
- vc_primitiveScope := e_spRelative;
+ v_primitiveScope := e_spRelative;
}
if (f_isScopeAbsolute(p_receivedURI)) {
- vc_primitiveScope := e_absolute;
+ v_primitiveScope := e_absolute;
}
- if(match(f_getResourceAddress(p_expectedURIIndex), p_receivedURI)) {
+ if(match(f_getResourceAddress(p_expectedURIIndex, v_addressingMethod, v_primitiveScope), p_receivedURI)) {
v_matchResult := true;
} else {
v_matchResult := false;
}
-
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
- vc_addressingMethod := PX_ADDRESSING_METHOD;
-
+
return v_matchResult;
} //end f_compareURIs
+
+ }//end group AeSimu
+
+ group CseSimuFunctions {
group NotificationFunctions {
- function f_cse_notifyProcedure_subscriptionVerificationHandler(in integer p_creatorIndex, in ResponseStatusCode p_responseStatusCode := int2001) runs on CseTester {
+ function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
// Local variables
- var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template Notification v_notificationRequest := mw_contentNotificationVerification;
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
-
+
//Preparation of expected Notification verification
//TODO To add checks for creator and subscription reference
//v_notificationRequest.creator := p_creator; TODO To check what address format is to be expected
@@ -920,62 +1219,57 @@ module OneM2M_Functions {
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_notify(v_notificationRequest))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
- v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
-// if(f_isHierarchical(v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
-// setverdict(fail, __SCOPE__ & ": Creator cannot contain a hierarchical address");
-// v_responsePrimitive.responseStatusCode := int4000;
-// }
-// if(f_compareURIs(p_creatorIndex, v_request.primitive.requestPrimitive.primitiveContent.notification.creator)) {
-// setverdict(pass, __SCOPE__ & ": Creator set to originator of the subscription creation primitive");
-// } else {
-// setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
-// v_responsePrimitive.responseStatusCode := int4000;
-// }
- mcaPort.send(m_httpResponse(v_responsePrimitive));
}
- [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
}
- [] mcaPort.receive{
+ [] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
+ stop;
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
+ stop;
}
}
-
+
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ if(getverdict == pass) {
+ mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+ } else {
+ v_responsePrimitive.responseStatusCode := int4000;
+ mcaPortIn.send(m_httpResponse(v_responsePrimitive));
+ }
+
//mcaPort.send(m_response(v_responsePrimitive)); // TODO have to be deleted
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
+
} //end f_subscriptionVerificationHandler
- function f_cse_notifyProcedure_representationHandler(template PrimitiveContent p_primitiveContent) runs on CseTester {
+ function f_cse_notifyProcedure_representationHandler(template PrimitiveContent p_primitiveContent) runs on AeSimu {
// Local variables
- var MsgIn v_request;
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
-
+ var ResponsePrimitive v_responsePrimitive;
+
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
- if(f_check_notificationContent(v_request.primitive.requestPrimitive, p_primitiveContent)){
+ if(f_check_notificationContent(vc_request.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
- mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
}
else{
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
}
+ //Send response in any case
+ v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
}
- [] mcaPort.receive{
+ [] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
@@ -983,26 +1277,20 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
-
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
+
} //end f_cse_notifyProcedure_representationHandler
- function f_cse_notifyProcedure_aggregatedNoficationHandler(template PrimitiveContent p_primitiveContent,in integer p_numberOfAggregatedNotification) runs on CseTester {
+ function f_cse_notifyProcedure_aggregatedNoficationHandler(template PrimitiveContent p_primitiveContent,in integer p_numberOfAggregatedNotification) runs on AeSimu {
// Local variables
- var MsgIn v_response;
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
+ var ResponsePrimitive v_responsePrimitive;
+ var integer v_notificationsReceived := 0;
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_aggregatedNotifyBase)) -> value v_response {
+ [] mcaPortIn.receive(mw_request(mw_aggregatedNotifyBase)) -> value vc_request {
tc_ac.stop;
- if(p_numberOfAggregatedNotification == lengthof(v_response.primitive.requestPrimitive.primitiveContent.aggregatedNotification.notification_list)){
- if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){
+ if(p_numberOfAggregatedNotification == lengthof(vc_request.primitive.requestPrimitive.primitiveContent.aggregatedNotification.notification_list)){
+ if(f_check_notificationContent(vc_response.primitive.requestPrimitive, p_primitiveContent)){
setverdict(pass, __SCOPE__ & ": Notification received");
}
else{
@@ -1012,8 +1300,30 @@ module OneM2M_Functions {
else {
setverdict(fail, __SCOPE__ & ": Number of Notification in Aggregatednotification isn't right");
}
+ //Send response in any case
+ v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
}
- [] mcaPort.receive{
+ [] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
+ tc_ac.stop;
+ if(f_check_notificationContent(vc_request.primitive.requestPrimitive, p_primitiveContent)){
+ setverdict(pass, __SCOPE__ & ":INFO: Notification received");
+ }
+ else{
+ setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
+ }
+ //Send response in any case
+ v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
+ v_notificationsReceived := v_notificationsReceived + 1;
+ if(v_notificationsReceived < p_numberOfAggregatedNotification) {
+ tc_ac.start;
+ repeat;
+ }
+ }
+ [] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
}
@@ -1021,34 +1331,23 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ": No notification received");
}
}
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
+
} //end f_cse_notifyProcedure_aggregatedNotificationHandler
- function f_cse_notifyProcedure_subscriptionDeletionHandler( template PrimitiveContent p_primitiveContent) runs on CseTester {
- var MsgIn v_response;
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
-
+ function f_cse_notifyProcedure_subscriptionDeletionHandler( template Notification p_notification) runs on AeSimu {
+ var ResponsePrimitive v_responsePrimitive;
tc_ac.start;
alt {
- [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_response {
+ [] mcaPortIn.receive(mw_request(mw_notify(p_notification))) -> value vc_request {
tc_ac.stop;
- mcaPort.send(m_response(valueof(m_responseNotification(int2001))));
- if(not(match(v_response.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
+ v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
+ if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE");
}
- if(f_check_notificationContent(v_response.primitive.requestPrimitive, p_primitiveContent)){
- setverdict(pass, __SCOPE__ & ":INFO: Notification received");
- }
- else{
- setverdict(fail, __SCOPE__ & ":ERROR: Notification received but the content doesn't match");
- }
}
- [] mcaPort.receive{
+ [] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
@@ -1056,22 +1355,15 @@ module OneM2M_Functions {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
}
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
+
} //end f_cse_notifyProcedure_subscriptionDeletionHandler
- function f_cse_notifyProcedure_noNotificationHandler() runs on CseTester {
+ function f_cse_notifyProcedure_noNotificationHandler() runs on AeSimu {
// Local variables
- var MsgIn v_response;
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
tc_ac.start(10.0);
alt {
- [] mcaPort.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_response {
+ [] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Non expected notification received");
}
@@ -1079,24 +1371,23 @@ module OneM2M_Functions {
setverdict(pass, __SCOPE__ & ": No notification received");
}
}
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
+
} //end f_cse_notifyProcedure_noNotification Handler
- function f_check_notificationContent(in RequestPrimitive p_requestPrimitive, template PrimitiveContent p_primitiveContent) runs on CseTester return boolean{
+ function f_check_notificationContent(in RequestPrimitive p_requestPrimitive, template PrimitiveContent p_primitiveContent) runs on Tester return boolean{
// Local variables
var boolean v_matchResult := false;
var integer i;
var integer v_numberOfAggregatedNotification;
if (ischosen(p_primitiveContent.aE)){
- if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource)) {
- v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE, p_primitiveContent.aE)
+ log("Representation contains AE resource representation");
+ if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE)) {
+ v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE, p_primitiveContent.aE);
+ log("Expected primitiveContent");
}
else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) {
- v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE)
+ v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE);
}
else if (ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification)) {
v_matchResult := true;
@@ -1119,120 +1410,28 @@ module OneM2M_Functions {
}
}
-
- if (ischosen(p_primitiveContent.container)){
- if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource)) {
- v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container, p_primitiveContent.container)
- }
- else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) {
- v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
- }
- }
-
- return v_matchResult;
-
- } //end f_check_notificationContent
-
- }// end of group NotificationFunctions
-
- /**
- * @desc It determines whether the addressing method of the given address is non-hierarchical. Not valid for CSE-Base as target
- * @param p_resourceAddress
- * @return boolean
- */
- function f_isNonHierarchical(XSD.ID p_resourceAddress) runs on Tester return boolean {
- var integer i;
- var integer v_nbOfSlashes:= 0;
-
- for (i := 0; i < lengthof(p_resourceAddress); i:= i+1){
- if(match (p_resourceAddress[i], "/")){
- v_nbOfSlashes:= v_nbOfSlashes+1;
- }
- }
-
- if(f_isScopeCseRelative(p_resourceAddress)) {
- if(v_nbOfSlashes == 0 ) {
- return true;
- } else {
- return false;
- }
-
- } else if (f_isScopeSpRelative(p_resourceAddress)){
- if(v_nbOfSlashes == 2 ) {
- return true;
- } else {
- return false;
- }
- } else if (f_isScopeAbsolute(p_resourceAddress)){
- if(v_nbOfSlashes == 4 ) {
- return true;
- } else {
- return false;
+
+ if (ischosen(p_primitiveContent.container)){
+ if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container)) {
+ v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container, p_primitiveContent.container)
+ }
+ else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) {
+ v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
+ }
}
- } else {
- return false;
- }
- }
-
-
- /**
- * @desc It determines whether the addressing method of the given address is hierarchical. Not valid for CSE-Base as target
- * @param p_resourceAddress
- * @return boolean
- */
- function f_isHierarchical(XSD.ID p_resourceAddress) runs on Tester return boolean {
- if(f_isNonHierarchical(p_resourceAddress)) {
- return false;
- } else {
- return true;
- }
- }
-
- /**
- * @desc It determines whether the primitive scope of the given address is CSE-Relative
- * @param p_resourceAddress
- * @return boolean
- */
- function f_isScopeCseRelative(XSD.ID p_resourceAddress) runs on Tester return boolean {
- if (p_resourceAddress[0] != "/") {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * @desc It determines whether the primitive scope of the given address is SP-Relative
- * @param p_resourceAddress
- * @return boolean
- */
- function f_isScopeSpRelative(XSD.ID p_resourceAddress) runs on Tester return boolean {
- if ((p_resourceAddress[0] == "/") and (p_resourceAddress[1] != "/")){
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * @desc It determines whether the primitive scope of the given address is Absolute
- * @param p_resourceAddress
- * @return boolean
- */
- function f_isScopeAbsolute(XSD.ID p_resourceAddress) runs on Tester return boolean {
- if ((p_resourceAddress[0] == "/") and (p_resourceAddress[1] == "/")) {
- return true;
- } else {
- return false;
- }
- }
-
+
+ return v_matchResult;
+
+ } //end f_check_notificationContent
+
+ }// end of group NotificationFunctions
+
/**
* @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
* @param p_requestPrimitive Template request primitive
* @return Internal resource index of the created resource
*/
- function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on CseTester return integer {
+ function f_cse_registerRemoteCse(in template RequestPrimitive p_requestPrimitive) runs on CseSimu return integer {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1240,7 +1439,7 @@ module OneM2M_Functions {
v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1);
- mcaPort.send(m_request(v_request));
+ mccPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -1262,21 +1461,150 @@ module OneM2M_Functions {
}
}
- f_checkCseTesterStatus();
+ f_checkCseSimuStatus();
return v_resourceIndex;
}
-
- }//end group helpingFunctions
+ /**
+ * @desc Registration of the CSE IUT to the Test System (simulating a CSE)
+ * @param p_requestPrimitive Template request primitive
+ * @return Internal resource index of the created resource
+ */
+ function f_cse_registrationRemoteCse(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu return integer {
+
+ var MsgIn v_request;
+ var ResponsePrimitive v_response;
+ var PrimitiveContent v_remoteCSEResource;
+ var integer v_resourceIndex := -1;
+
+ tc_ac.start;
+ alt {
+ [] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value v_request {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__&":INFO: Resource type RemoteCSE created successfuly");
+ v_resourceIndex := f_cse_createLocalResource(v_request.primitive.requestPrimitive.primitiveContent, 1, int16, v_remoteCSEResource);//TODO Get index from v_request.primitive.requestPrimitive.to_
+ }
+ [] mccPortIn.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");
+ }
+ }
+
+ f_checkCseSimuStatus();
+
+ return v_resourceIndex;
+
+ }
+
+ /**
+ * @desc Send a request to the CSE IUT from the Test System (simulating a CSE)
+ * @param p_requestPrimitive Template request primitive
+ * @return Internal resource index of the created resource
+ */
+ function f_cse_sendCreateRequest(in template RequestPrimitive p_requestPrimitive) runs on CseSimu {
+
+//TODO: To be completed
+// var RequestPrimitive v_request;
+//
+// v_request := f_getCreateRequestPrimitive(p_requestPrimitive);
+//
+// mccPort.send(m_request(v_request));
+
+ }
+
+ /**
+ * @desc Receive a request from the CSE IUT to the Test System (simulating a CSE)
+ * @param p_requestPrimitive Template request primitive
+ * @return Internal resource index of the created resource
+ */
+ function f_cse_receiveCreateRequest(in template RequestPrimitive p_requestPrimitive := ?) runs on CseSimu {
+
+ tc_ac.start;
+ alt {
+ [] mccPort.receive(mw_request(p_requestPrimitive)) -> value vc_request {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__&":INFO: CREATE Request received successfuly");
+ }
+ [] mccPort.receive(mw_request(?)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__&":INFO: Unexpected CREATE Request received");
+ }
+ [] mccPort.receive {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__&":INFO: Unexpected message received");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__&":INFO: No answer while creating resource type RemoteCSE");
+ }
+ }
+
+ f_checkCseSimuStatus();
+
+ }
+
+ /**
+ * @desc Creates specified resource
+ * @param p_resource Resource to be created
+ * @param p_parentIndex Parent index of resource to be saved
+ * @param p_resourceType Type of the resource to be created
+ * @param p_modifiedResource Assigned and/or modified fields
+ * @return Internal resource index of the saved resource or -1
+ */
+ function f_cse_createLocalResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_myResource) runs on CseSimu return integer {
+
+ var integer v_resourceIndex := lengthof(vc_resourcesList);
+
+ // TODO To review the code (use of indexes, generation of value for certain attributes, etc..)
+ if(p_resourceType == int16 and ispresent(p_resource)) {
+ if(ischosen(p_resource.remoteCSE)){
+ p_myResource.remoteCSE := p_resource.remoteCSE;
+
+ if(not(ispresent(p_resource.remoteCSE.resourceName))) {
+ p_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
+ }
+ p_myResource.remoteCSE.resourceType := p_resourceType;
+ p_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+ p_myResource.remoteCSE.parentID := f_getResourceId(vc_resourcesList[p_parentIndex].resource);
+ p_myResource.remoteCSE.creationTime := fx_generateTimestamp();
+ if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
+ p_myResource.remoteCSE.expirationTime := "20301231T012345";
+ }
+ p_myResource.remoteCSE.lastModifiedTime := p_myResource.remoteCSE. creationTime;
+ p_myResource.remoteCSE.announceTo := omit;
+ p_myResource.remoteCSE.announcedAttribute := omit;
+
+ if(not(ispresent(p_resource.remoteCSE.pointOfAccess))) {
+ //TODO Create a pollingChannel resource
+ p_myResource.remoteCSE.pointOfAccess := omit;
+ }
+ if(vc_resourcesList[v_resourceIndex].resourceType == int5) {
+ p_myResource.remoteCSE.m2M_Ext_ID := omit;
+ p_myResource.remoteCSE.trigger_Recipient_ID:= omit;
+ }
+ p_myResource.remoteCSE.nodeLink := omit;
+
+ return f_setResource(p_myResource, p_resourceType, p_parentIndex, false);
+
+ }
+ }
+ return v_resourceIndex;
+
+ }//End of function
+
+
+ }//end group CseSimuFunctions
group CseAltstepFunctions {
/**
* @desc Cse altstep for config 01
*/
- altstep a_cse_cf01() runs on CseTester {
+ altstep a_cse_cf01() runs on AeSimu {
[] mcaPort.receive {
log(__SCOPE__&": WARNING: Unexpected message received");
@@ -1284,10 +1612,28 @@ module OneM2M_Functions {
}
}
+ /**
+ * @desc Cse altstep for config 01 for AE2
+ */
+ altstep a_cse_cf01_ae2() runs on AeSimu {
+
+ var MsgIn v_request;
+ var ResponsePrimitive v_responsePrimitive;
+
+ [] mcaPortIn.receive(mw_request(mw_notify(mw_contentNotification(?)))) -> value v_request {
+ //Send response
+ v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
+ log(__SCOPE__&": WARNING: Unexpected Notification message received");
+ repeat;
+ }
+ }
+
/**
* @desc Cse altstep for config 02
*/
- altstep a_cse_cf02() runs on CseTester {
+ altstep a_cse_cf02() runs on CseSimu {
[] mcaPort.receive {
log(__SCOPE__&": WARNING: Unexpected message received");
@@ -1299,10 +1645,32 @@ module OneM2M_Functions {
}
}
+ /**
+ * @desc CseSimu altstep
+ */
+ altstep a_cse_cseSimu() runs on CseSimu {
+
+ [] mccPort.receive {
+ log(__SCOPE__&": WARNING: Unexpected message received");
+ repeat;
+ }
+ }
+
+ /**
+ * @desc Cse altstep for config 02
+ */
+ altstep a_cse_aeSimu() runs on AeSimu {
+
+ [] mcaPort.receive {
+ log(__SCOPE__&": WARNING: Unexpected message received");
+ repeat;
+ }
+ }
+
/**
* @desc Cse altstep for config 04
*/
- altstep a_cse_cf04() runs on CseTester {
+ altstep a_cse_cf04() runs on CseSimu {
[] mccPort.receive {
log(__SCOPE__&": WARNING: Unexpected message received");
@@ -1323,7 +1691,7 @@ module OneM2M_Functions {
* @return Internal resource index of AE or -1 in case of failure
* @verdict inconc if no AE registration request is received
*/
- function f_ae_preamble_registerAe() runs on AeTester return integer {
+ function f_ae_preamble_registerAe() runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
@@ -1354,7 +1722,7 @@ module OneM2M_Functions {
}
}
- f_checkAeTesterStatus();
+ f_checkCseSimuStatus();
return v_resourceIndex;
}
@@ -1371,7 +1739,7 @@ module OneM2M_Functions {
* @param p_modifiedResource Assigned and/or modified fields
* @return Internal resource index of the saved resource or -1
*/
- function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on AeTester return integer {
+ function f_ae_createResource(in PrimitiveContent p_resource, in integer p_parentIndex, in ResourceType p_resourceType, out PrimitiveContent p_modifiedResource) runs on CseSimu return integer {
var integer v_resourceIndex;
@@ -1400,7 +1768,7 @@ module OneM2M_Functions {
p_resource.aE := v_ae;
p_modifiedResource.aE := v_aeModified;
- return f_setResource(p_resource, p_resourceType, p_parentIndex);
+ return f_setResource(p_resource, p_resourceType, p_parentIndex, false);
}
@@ -1419,7 +1787,7 @@ module OneM2M_Functions {
/**
* @desc Ae altstep
*/
- altstep a_ae_default() runs on AeTester {
+ altstep a_ae_default() runs on CseSimu {
var MsgIn v_request;
@@ -1440,7 +1808,7 @@ module OneM2M_Functions {
* @remark This altstep includes a_ae_default
* @see a_ae_default
*/
- altstep a_ae_cf03() runs on AeTester {
+ altstep a_ae_cf03() runs on CseSimu {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
@@ -1478,10 +1846,12 @@ module OneM2M_Functions {
* @return Created CREATE request primitive
* @verdict
*/
- function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request := m_create, integer p_parentIndex) runs on CseTester return RequestPrimitive {
+ function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request := m_create, integer p_parentIndex) runs on Tester return RequestPrimitive {
var template ListOfURIs v_defaultListOfURIs := {"NotInitialized"};
var template AcpType v_defaultAcpIDs := {"NotInitialized"};
+ p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+
if(p_resourceType != int2) {
if(p_resourceType == int16) {
p_request.from_ := f_getOriginator(p_parentIndex, false);
@@ -1497,7 +1867,7 @@ module OneM2M_Functions {
if (p_resourceType == int9) {//group
if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
- if (p_parentIndex == -1){
+ if ((p_parentIndex == -1) and (isbound(vc_aeAuxIndex))){
p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[vc_aeAuxIndex].resource)};
}else{
p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
@@ -1511,7 +1881,7 @@ 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 )){
+ 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)};
}
}
@@ -1560,7 +1930,7 @@ module OneM2M_Functions {
* @verdict
*/
//TODO To be completed
- function f_getCreateResponsePrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request := m_create) runs on CseTester return ResponsePrimitive {
+ function f_getCreateResponsePrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request := m_create) runs on Tester return ResponsePrimitive {
var template ResponsePrimitive v_responsePrimitive;
if(p_resourceType != int2) {
@@ -1603,8 +1973,10 @@ module OneM2M_Functions {
* @return Created UPDATE request primitive
* @verdict
*/
- function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on CseTester return RequestPrimitive {
+ function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on Tester return RequestPrimitive {
+ p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
+
p_request.from_ := f_getOriginator(p_resourceIndex);
p_request.to_ := f_getResourceAddress(p_resourceIndex);
@@ -1727,7 +2099,7 @@ module OneM2M_Functions {
* @return Originator for a given resource
* @verdict
*/
- function f_getOriginator(integer p_targetResourceIndex := -1, boolean p_testSystemRole := true) runs on CseTester return XSD.AnyURI {
+ function f_getOriginator(integer p_targetResourceIndex := -1, boolean p_testSystemRole := true) runs on Tester return XSD.AnyURI {
if(p_targetResourceIndex == -1) {
if(p_testSystemRole) {
@@ -1756,7 +2128,7 @@ module OneM2M_Functions {
* @return AE-ID or CSE-ID of the entity creating the given resource
* @verdict
*/
- function f_getCreator(integer p_targetResourceIndex := -1) runs on CseTester return XSD.ID {
+ function f_getCreator(integer p_targetResourceIndex := -1) runs on Tester return XSD.ID {
if(p_targetResourceIndex == -1) {
return PX_CSE_ID;
@@ -1826,12 +2198,12 @@ module OneM2M_Functions {
* @return Resource address for the given resource
* @verdict
*/
- function f_getResourceAddress(integer p_targetResourceIndex := -1) runs on Tester return XSD.ID {
+ function f_getResourceAddress(integer p_targetResourceIndex := -1, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on Tester return XSD.ID {
var XSD.ID v_resourceAddress;
- if(vc_primitiveScope == e_cseRelative) {
+ if(p_primitiveScope == e_cseRelative) {
- if(vc_addressingMethod == e_nonHierarchical) {
+ if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) {
return PX_CSE_RESOURCE_ID;
} else {
@@ -1841,40 +2213,40 @@ module OneM2M_Functions {
if(p_targetResourceIndex == -1) {
return PX_CSE_NAME;
} else {
- v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
- } else if (vc_primitiveScope == e_spRelative) {
- if(vc_addressingMethod == e_nonHierarchical) {
+ } else if (p_primitiveScope == e_spRelative) {
+ if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) {
- return PX_CSE_ID;
+ return PX_CSE_ID & "/" & PX_CSE_RESOURCE_ID;
} else {
- v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := PX_CSE_ID & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == -1) {
return PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
- v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
- } else if (vc_primitiveScope == e_absolute) {
- if(vc_addressingMethod == e_nonHierarchical) {
+ } else if (p_primitiveScope == e_absolute) {
+ if(p_addressingMethod == e_nonHierarchical) {
if(p_targetResourceIndex == -1) {
return PX_SP_ID & PX_CSE_ID;
} else {
- v_resourceAddress := f_getResourceAddress() & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := f_getResourceAddress(-, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceId(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
} else {
if(p_targetResourceIndex == -1) {
return PX_SP_ID & PX_CSE_ID & "/" & PX_CSE_NAME;
} else {
- v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
+ v_resourceAddress := f_getResourceAddress(vc_resourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_resourcesList[p_targetResourceIndex].resource);
return v_resourceAddress;
}
}
@@ -1890,7 +2262,7 @@ module OneM2M_Functions {
* @return Internal resource index of the saved resource
* @verdict
*/
- function f_setResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer p_parentIndex := -1) runs on Tester return integer {
+ function f_setResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer p_parentIndex := -1, in boolean p_resourceToBeDeleted := true) runs on Tester return integer {
var integer v_newIndex := -1;
if(isbound(vc_resourcesList)) {
vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resourceType, p_resource};
@@ -1899,8 +2271,10 @@ module OneM2M_Functions {
}
v_newIndex := lengthof(vc_resourcesList)-1;
- if(match(int2, p_resourceType) or match(-1, p_parentIndex)) {//If created resource is an AE or created under CSEBase, it needs to be added to the resourceToBeDeleted list
- vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_newIndex};
+ if(p_resourceToBeDeleted) {
+ if(match(int2, p_resourceType) or match(-1, p_parentIndex)) {//If created resource is an AE or created under CSEBase, it needs to be added to the resourceToBeDeleted list
+ vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_newIndex};
+ }
}
return v_newIndex;
@@ -1914,7 +2288,7 @@ module OneM2M_Functions {
* @return
* @verdict
*/
- function f_setAcpId(template RequestPrimitive p_requestPrimitive, template AcpType p_accessControlPolicyIDs) runs on CseTester return RequestPrimitive{
+ function f_setAcpId(template RequestPrimitive p_requestPrimitive, template AcpType p_accessControlPolicyIDs) runs on Tester return RequestPrimitive{
if (ischosen(p_requestPrimitive.primitiveContent.aE)){
p_requestPrimitive.primitiveContent.aE.accessControlPolicyIDs := p_accessControlPolicyIDs;
@@ -1965,7 +2339,7 @@ module OneM2M_Functions {
* @param p_targetResourceIndex Internal resource index of the given resource
* @return AE_ID of the given resource
*/
- function f_getAeId(integer p_targetResourceIndex := -1) runs on AeTester return XSD.ID {
+ function f_getAeId(integer p_targetResourceIndex := -1) runs on Tester return XSD.ID {
if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.aE)) {
return vc_resourcesList[p_targetResourceIndex].resource.aE.aE_ID;
@@ -1975,25 +2349,143 @@ module OneM2M_Functions {
return "";
} // end f_getAeId
+
+ /**
+ * @desc Retrieve Announced Resource Type from the given resource type
+ * @param p_targetResourceIndex Internal resource index of the given resource
+ * @return AE_ID of the given resource
+ */
+ function f_getAnnouncedResourceType(in ResourceType p_resourceType) runs on Tester return ResourceType {
+
+ if(p_resourceType == int2) {
+ return int10002;
+ }
+
+ return p_resourceType;
+
+
+ } // end f_getAnnouncedResourceType
}//end group getSetFunctions
+ group CheckingFunctions {
+
+ /**
+ * @desc It determines whether the addressing method of the given address is non-hierarchical. Not valid for CSE-Base as target
+ * @param p_resourceAddress
+ * @return boolean
+ */
+ function f_isNonHierarchical(XSD.ID p_resourceAddress) runs on Tester return boolean {
+ var integer i;
+ var integer v_nbOfSlashes:= 0;
+
+ for (i := 0; i < lengthof(p_resourceAddress); i:= i+1){
+ if(p_resourceAddress[i] == "/"){
+ v_nbOfSlashes:= v_nbOfSlashes+1;
+ }
+ }
+
+ if(f_isScopeCseRelative(p_resourceAddress)) {
+ if(v_nbOfSlashes == 0 ) {
+ return true;
+ } else {
+ return false;
+ }
+
+ } else if (f_isScopeSpRelative(p_resourceAddress)){
+ if(v_nbOfSlashes == 2 ) {
+ return true;
+ } else {
+ return false;
+ }
+ } else if (f_isScopeAbsolute(p_resourceAddress)){
+ if(v_nbOfSlashes == 4 ) {
+ return true;
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ }
+
+
+ /**
+ * @desc It determines whether the addressing method of the given address is hierarchical. Not valid for CSE-Base as target
+ * @param p_resourceAddress
+ * @return boolean
+ */
+ function f_isHierarchical(XSD.ID p_resourceAddress) runs on Tester return boolean {
+ if(f_isNonHierarchical(p_resourceAddress)) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * @desc It determines whether the primitive scope of the given address is CSE-Relative
+ * @param p_resourceAddress
+ * @return boolean
+ */
+ function f_isScopeCseRelative(XSD.ID p_resourceAddress) runs on Tester return boolean {
+ if (p_resourceAddress[0] != "/") {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @desc It determines whether the primitive scope of the given address is SP-Relative
+ * @param p_resourceAddress
+ * @return boolean
+ */
+ function f_isScopeSpRelative(XSD.ID p_resourceAddress) runs on Tester return boolean {
+ if ((p_resourceAddress[0] == "/") and (p_resourceAddress[1] != "/")){
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @desc It determines whether the primitive scope of the given address is Absolute
+ * @param p_resourceAddress
+ * @return boolean
+ */
+ function f_isScopeAbsolute(XSD.ID p_resourceAddress) runs on Tester return boolean {
+ if ((p_resourceAddress[0] == "/") and (p_resourceAddress[1] == "/")) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
+
+ }//end group CheckingFunctions
+
group CommonFunctions {
-
-
/**
* @desc Sending of an Adapter Control primitive
* @param event Action to be performed by TA
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
- function f_checkCseTesterStatus() runs on CseTester {
+ function f_checkAeSimuStatus() runs on AeSimu {
if (getverdict != pass) {
f_cse_postamble_deleteResources();
// Tear down
- f_cfCseTesterDown();
+ if(vc_config == e_cf01) {
+ f_cf01Down();
+ } else if (vc_config ==e_cf02) {
+ vc_cseSimu.start(f_cse_postamble_deleteResourcesCSE());
+ vc_cseSimu.done;
+ f_cf02Down();
+ }
stop;
}
}
@@ -2004,13 +2496,49 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
- function f_checkAeTesterStatus() runs on AeTester {
+ function f_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on AeSimu {
+
+ var verdicttype v_verdict := none;
+
+ tc_ac.start(15.0);
+ alt {
+ [] p_ae.done -> value v_verdict {
+ tc_ac.stop;
+ }
+ [] tc_ac.timeout {
+ setverdict(inconc, __SCOPE__ & "INFO: Component did not finish");
+ }
+ }
+
+ if(v_verdict == pass) { // Component was successfully completed and got stopped state
+ setverdict(pass);
+ } else {
+ setverdict(inconc); // Component was not completed successfully
+ }
+
+ f_checkAeSimuStatus();
+ }
+
+ /**
+ * @desc Sending of an Adapter Control primitive
+ * @param event Action to be performed by TA
+ * @param data Corresponding information for the correct execution of the given action
+ * @verdict
+ */
+ function f_checkCseSimuStatus() runs on CseSimu {
if (getverdict != pass) {
//f_ae_postamble_deleteResources();
// Tear down
- f_cfAeTesterDown();
- stop;
+ //f_cfAeTesterDown();
+ f_cse_postamble_deleteResourcesCSE();
+ if(vc_config == e_cf03) {
+ f_cf03Down();
+ stop;
+ } else if (vc_config ==e_cf04) {
+ f_cf04Down();
+ stop;
+ }
}
}
@@ -2277,7 +2805,7 @@ module OneM2M_Functions {
}
}
- else if(ischosen(p_primitiveContent.subscription)){ // Schedule
+ else if(ischosen(p_primitiveContent.subscription)){ // Subscription
v_primitiveContent := {subscription := mw_contentSubscriptionBase};
if(ispresent(p_primitiveContent.subscription.labels)){
@@ -2329,10 +2857,49 @@ module OneM2M_Functions {
v_primitiveContent.subscription.subscriberURI := ?;
}
}
+ else if(ischosen(p_primitiveContent.remoteCSE)){ //remoteCSE
+ v_primitiveContent := {remoteCSE := mw_contentRemoteCSEBase};
+
+ if(ispresent(p_primitiveContent.remoteCSE.labels)){
+ v_primitiveContent.remoteCSE.labels := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.accessControlPolicyIDs)){
+ v_primitiveContent.remoteCSE.accessControlPolicyIDs := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.announceTo)){
+ v_primitiveContent.remoteCSE.announceTo := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.announcedAttribute)){
+ v_primitiveContent.remoteCSE.announcedAttribute := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.cseType)){
+ v_primitiveContent.remoteCSE.cseType := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.pointOfAccess)){
+ v_primitiveContent.remoteCSE.pointOfAccess := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.m2M_Ext_ID)){
+ v_primitiveContent.remoteCSE.m2M_Ext_ID := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.trigger_Recipient_ID)){
+ v_primitiveContent.remoteCSE.trigger_Recipient_ID := ?;
+ }
+
+ if(ispresent(p_primitiveContent.remoteCSE.nodeLink)){
+ v_primitiveContent.remoteCSE.nodeLink := ?;
+ }
+ }
return v_primitiveContent;
}
- function f_match2PrimitiveContent (in PrimitiveContent p_responsePrimitiveContent, in template PrimitiveContent p_requestPrimitiveContent) runs on CseTester {
+ function f_match2PrimitiveContent (in PrimitiveContent p_responsePrimitiveContent, in template PrimitiveContent p_requestPrimitiveContent) runs on Tester {
var template PrimitiveContent v_primitiveContent;
var PrimitiveContent v_response;
v_response := p_responsePrimitiveContent;
@@ -2341,8 +2908,7 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__&":INFO: Resource incomplete, some attribute missing ");
}
- }
-
+ }
}//end of commonFunctions
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index a37cf2f01ea29615b96d5092a9554da317c06e3d..60d918179eda0041668c216beadf66096bd8e3b6 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -18,83 +18,106 @@ module OneM2M_Pixits {
group TestAdapterParameters {}
- modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
- modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
-
- modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
-
- modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
+ group IutParameters {
+
+ modulepar boolean PX_MN_CSE := true;
+
+ modulepar boolean PX_IN_CSE := false;
- modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
-
- modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
+ modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
+
+ /**
+ * @desc IUT CSE Name
+ */
+ modulepar XSD.ID PX_CSE_NAME := "cseName";
+
+ /**
+ * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE_ID := "/cseId";
+
+ /**
+ * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
+
+ /**
+ * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+ */
+ modulepar XSD.ID PX_SP_ID := "//om2m.org";
+
+ /**
+ * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
+
+ /**
+ * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
+
+ modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+
+ modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
+
+ modulepar charstring PX_SERIALIZATION := "XML";
+
+ modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
+
+ modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
+
+ modulepar ListOfURIs PX_ACOR := {"*"};
+ }
+
+ group TesterParameters {
+
+ modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
- modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
+ modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
- modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
+ modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
- /**
- * @desc IUT CSE Name
- */
- modulepar XSD.ID PX_CSE_NAME := "cseName";
-
- /**
- * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE_ID := "/cseId";
-
- /**
- * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
- */
- modulepar XSD.ID PX_SP_ID := "//om2m.org";
-
- /**
- * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
-
- /**
- * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
-
- /**
- * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE1_ID_STEM := "";
+ /**
+ * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
+
+ /**
+ * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_AE1_ID_STEM := "";
- /**
- * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE2_ID_STEM := "";
-
- /**
- * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_SUPER_AE_ID := "admin:admin";
-
- /**
- * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
+ /**
+ * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_AE2_ID_STEM := "";
+
+ /**
+ * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_APP_ID := "NMyAppId";
- /**
- * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_APP_ID := "NMyAppId";
-
- modulepar boolean PX_RUN_POSTAMBLE := true;
+ }
+
+ group ExecutionParameters {
+
+ modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
- modulepar ListOfURIs PX_ACOR := {"*"};
+ modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
- modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+ modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
- modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
+ modulepar boolean PX_RUN_POSTAMBLE := true;
+
+
+ }
+
+
- modulepar charstring PX_SERIALIZATION := "XML";
+
- modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
+
modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
@@ -102,6 +125,7 @@ module OneM2M_Pixits {
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases
modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases
+ modulepar boolean PX_IUT_IS_IN_CSE := false; //default //set it to true when running Share-based location testcases
//constant parameters for LOC
modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
diff --git a/LibOneM2M/OneM2M_Ports.ttcn b/LibOneM2M/OneM2M_Ports.ttcn
index 5da6c3b8186ce4022f61dee06603569fcb10f134..bc714dc4054ea6037393149b7e26ba7688e124e3 100644
--- a/LibOneM2M/OneM2M_Ports.ttcn
+++ b/LibOneM2M/OneM2M_Ports.ttcn
@@ -41,5 +41,15 @@ module OneM2M_Ports {
out
AcRequestPrimitive;
}
+
+ /**
+ * @desc Port to exchange information between components
+ */
+ type port InfoPort message {
+ in
+ RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
+ out
+ RequestPrimitive, ResponsePrimitive, PrimitiveContent, MyResource;
+ }
}//end module
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index d1e09873ddea2a36e6cf5a2cf08b70ec4f8d0966..05ba96a6c4738110fd2c3d29fff1d9f27018ec14 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -84,7 +84,7 @@ module OneM2M_Templates {
* @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
- template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive) := {
+ template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?) := {
primitive := { responsePrimitive := p_responsePrimitive}
};
@@ -298,7 +298,7 @@ module OneM2M_Templates {
operation := int3,
to_ := "NotInitialized",
from_ := "NotInitialized",
- requestIdentifier := "m_update" & f_rnd(1, 1000000),
+ requestIdentifier := "m_update",
resourceType := omit,
primitiveContent:= omit,
role := omit,
@@ -320,7 +320,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Ae resource
*/
template (value) RequestPrimitive m_updateAeBase modifies m_update:= {
- requestIdentifier := "m_updateAe" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAe",
primitiveContent:= {aE := m_contentUpdateAe}
};
@@ -328,7 +328,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Container resource
*/
template (value) RequestPrimitive m_updateContainerBase modifies m_update:= {
- requestIdentifier := "m_updateContainer" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateContainer",
primitiveContent:= {container := m_contentUpdateContainer}
};
@@ -336,7 +336,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for ContentInstance resource
*/
template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= {
- requestIdentifier := "m_updateContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateContentInstance",
primitiveContent:= {contentInstance := m_contentUpdateContentInstance}
};
@@ -344,12 +344,12 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for AccessControlPolicy resource
*/
template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
- requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAcp",
primitiveContent:= {accessControlPolicy := m_contentUpdateAcp}
};
template (value) RequestPrimitive m_updateAcpPrivileges(in template(omit) SetOfAcrs p_privileges := omit, in template(omit) SetOfAcrs p_selfPrivileges := omit) modifies m_update := {
- requestIdentifier := "m_updateAcp" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAcp",
primitiveContent:= {accessControlPolicy := m_contentUpdateAcpPrivileges(p_privileges, p_selfPrivileges)}
};
@@ -357,7 +357,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Group resource
*/
template (value) RequestPrimitive m_updateGroupBase modifies m_update := {
- requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateGroup",
primitiveContent:= {group_ := m_contentUpdateGroup}
};
@@ -365,7 +365,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_updateCSEBaseBase modifies m_update := {
- requestIdentifier := "m_updateGroup" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateGroup",
primitiveContent:= {cSEBase := m_contentUpdateCSEBase}
};
@@ -373,7 +373,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_updateScheduleBase modifies m_update := {
- requestIdentifier := "m_updateSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateSchedule",
primitiveContent:= {schedule := m_contentUpdateSchedule}
};
@@ -381,7 +381,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for PollingChannel resource
*/
template (value) RequestPrimitive m_updatePollingChannelBase modifies m_update := {
- requestIdentifier := "m_updatePollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updatePollingChannel",
primitiveContent:= {pollingChannel := m_contentUpdatePollingChannel}
};
@@ -389,7 +389,7 @@ module OneM2M_Templates {
* @desc Base UPDATE request primitive for Subscription resource
*/
template (value) RequestPrimitive m_updateSubscriptionBase modifies m_update := {
- requestIdentifier := "m_updateSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateSubscription",
primitiveContent:= {subscription := m_contentUpdateSubscription}
};
@@ -400,24 +400,24 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
- requestIdentifier := "m_updateNode" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateNode",
primitiveContent:= {node := m_contentUpdateNode}
}
template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
- requestIdentifier := "m_updateRemoteCSEBase" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateRemoteCSEBase",
primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
}
template (value) RequestPrimitive m_updateAE modifies m_update := {
- requestIdentifier := "m_updateAE" & f_rnd(1, 1000000),
+ requestIdentifier := "m_updateAE",
primitiveContent := {aE := m_contentUpdateAe}
}
template (value) RequestPrimitive m_updateAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_update:= {
- requestIdentifier := testcasename() & "-m_updateAEAnnc" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_updateAEAnnc",
resourceType := int10002,
- primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
+ primitiveContent := {aEAnnc := m_contentUpdateAEAnnc(p_appId,p_stemId)}
};
}//end group Update
@@ -427,7 +427,7 @@ module OneM2M_Templates {
operation := int1,
to_ := "NotInitialized",
from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_create" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_create",
resourceType := omit,
primitiveContent := omit,
role := omit,
@@ -482,7 +482,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_create:= {
to_ := p_to,
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAEAnnc" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)}
};
@@ -497,7 +497,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAe(XSD.ID p_appId, template (omit) AcpType p_accessControlPolicyIds := omit,template (omit) XSD.ID p_from := omit, template (omit) ResourceName p_resourceName := c_aeAuxName, in template (omit) PoaList p_poaList := omit) modifies m_create := {
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds,p_resourceName, p_appId, p_poaList)}
};
@@ -512,7 +512,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
- requestIdentifier := testcasename() & "-m_createAe" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAe",
resourceType := int2,
primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
};
@@ -521,14 +521,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for AccessControlPolicy resource
*/
template (value) RequestPrimitive m_createAcpBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
};
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,
- requestIdentifier := testcasename() & "-m_createAcp" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcp",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
};
@@ -548,7 +548,7 @@ module OneM2M_Templates {
* @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" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createAcpAux",
resourceType := int1,
primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
};
@@ -564,7 +564,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for CSEBase resource
*/
template (value) RequestPrimitive m_createCSEBaseBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createCSEBase" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createCSEBase",
resourceType := int5,
primitiveContent := {cSEBase := m_contentCreateCSEBase}
};
@@ -574,7 +574,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Container resource
*/
template (value) RequestPrimitive m_createContainerBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
primitiveContent := {container := m_contentCreateContainer}
};
@@ -583,11 +583,19 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for remoteCSE resource
*/
template (value) RequestPrimitive m_createRemoteCSEBase(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) ResourceName p_resourceName := c_defaultRemoteCSEResourceName, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createRemoteCSE" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createRemoteCSE",
resourceType := int16,
primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
};
+ /**
+ * @desc CREATE request primitive for remoteCSE resource
+ */
+ template RequestPrimitive mw_createRemoteCSEBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+ resourceType := int16,
+ primitiveContent := ?//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+ };
+
/**
* @desc CREATE request primitive for Container resource wiht no resourceName provided
*/
@@ -597,7 +605,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createContainer" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
};
@@ -622,7 +630,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Content Instance resource
*/
template (value) RequestPrimitive m_createContentInstanceBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContentInstance",
resourceType := int4,
primitiveContent := {contentInstance := m_contentCreateContentInstance}
};
@@ -637,7 +645,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
to_ := p_parentResourceAddress,
from_ := "admin:admin",
- requestIdentifier := testcasename() & "-m_createContentInstance" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createContentInstance",
resourceType := int4,
primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
};
@@ -672,7 +680,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Group resource
*/
template (value) RequestPrimitive m_createGroupBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createGroup",
resourceType := int9,
primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)} //TODO: p_resourceId
};
@@ -684,7 +692,7 @@ module OneM2M_Templates {
in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
- requestIdentifier := testcasename() & "-m_createGroup" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createGroup",
resourceType := int9,
primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId
};
@@ -709,7 +717,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for MgmtCmd resource
*/
template (value) RequestPrimitive m_createMgmtCmdBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtCmd" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtCmd",
resourceType := int12,
primitiveContent := {mgmtResource := m_contentCreateMgmtCmd (-,-)}
};
@@ -718,7 +726,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for MgmtObj resource
*/
template (value) RequestPrimitive m_createMgmtObjBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtObj",
resourceType := int13,
primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-,-)}
};
@@ -727,7 +735,7 @@ module OneM2M_Templates {
* @desc CREATE request primitive for MgmtObj resource
*/
template (value) RequestPrimitive m_createMgmtObj modifies m_create := {
- requestIdentifier := testcasename() & "-m_createMgmtObj" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createMgmtObj",
resourceType := int13,
primitiveContent := {mgmtResource := m_contentCreateMgmtObj (-, -)}
};
@@ -752,7 +760,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Node resource
*/
template (value) RequestPrimitive m_createNodeBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNode",
resourceType := int14,
primitiveContent := {node := m_contentCreateNode(-, -, -) }
};
@@ -761,7 +769,7 @@ module OneM2M_Templates {
* @desc CREATE request primitive for Node resource
*/
template (value) RequestPrimitive m_createNode modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNode" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNode",
resourceType := int14,
primitiveContent := {node := m_contentCreateNode(-,-,-) }
};
@@ -778,7 +786,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for PollingChannel resource
*/
template (value) RequestPrimitive m_createPollingChannelBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createPollingChannel",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentCreatePollingChannel (-)}
};
@@ -786,7 +794,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
to_ := p_parentResourceAddress,
from_ := p_originatorId,
- requestIdentifier := testcasename() & "-m_createPollingChannel" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createPollingChannel",
resourceType := int15,
primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
};
@@ -795,14 +803,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Schedule resource
*/
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createSchedule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
};
@@ -824,7 +832,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
resourceType := int19,//FIXME Is this the correct value?
primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRule (p_applicableCredIDs, p_allowedAppIDs, p_allowedAEs)}
};
@@ -833,7 +841,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for ServiceSubscribedAppRule Resource
*/
template (value) RequestPrimitive m_createServiceSubscribedAppRuleBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRuleBase",
resourceType := int19,
primitiveContent := {serviceSubscribedAppRule := m_contentCreateServiceSubscribedAppRuleBase}
};
@@ -842,14 +850,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Subscription resource
*/
template (value) RequestPrimitive m_createSubscriptionBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
to_ := p_parentResourceAddress,
- requestIdentifier := testcasename() & "-m_createSubscription" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createSubscription",
resourceType := int23,
primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
};
@@ -871,14 +879,14 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Location Policy resource
*/
template (value) RequestPrimitive m_createLocationPolicyBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createLocationPolicy",
resourceType := int10,
primitiveContent := {locationPolicy := m_contentCreateLocationPolicyBase}
};
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) NodeID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createLocationPolicy" & f_rnd(1, 1000000), //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
+ requestIdentifier := testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
resourceType := int10,
primitiveContent := {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
resultContent := int1//default
@@ -901,7 +909,7 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
- requestIdentifier := testcasename() & "-m_createNotification" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createNotification",
primitiveContent := {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
resultContent := int1 //default
@@ -911,7 +919,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Stats Config resource
*/
template (value) RequestPrimitive m_createStatsConfigBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createStatsConfig" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createStatsConfig",
resourceType := int22,
primitiveContent := {statsConfig := m_contentCreateStatsConfigBase}
};
@@ -920,7 +928,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for Stats Config resource
*/
template (value) RequestPrimitive m_createStatsCollectBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createStatsCollect" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createStatsCollect",
resourceType := int21,
primitiveContent := {statsCollect := m_contentCreateStatCollectBase}
};
@@ -929,7 +937,7 @@ module OneM2M_Templates {
* @desc Base CREATE request primitive for M2mServiceSubscriptionProfile resource
*/
template (value) RequestPrimitive m_createM2mServiceSubscriptionProfileBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile" & f_rnd(1, 1000000),
+ requestIdentifier := testcasename() & "-m_createM2mServiceSubscriptionProfile",
resourceType := int11,
primitiveContent := {m2mServiceSubscriptionProfile := m_contentCreatem2mServiceSubscriptionProfileBase}
};
@@ -1029,6 +1037,9 @@ module OneM2M_Templates {
}//end group RequestPrimitives
group ContentCreate {
+
+ template PrimitiveContent mw_primitiveContent := ?;
+
/**
* @desc Base primitiveContent for CREATE operation for AEAnnc resource
* @param p_labels Labels
@@ -1137,7 +1148,7 @@ module OneM2M_Templates {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
selfPrivileges := {
- accessControlRule_list := {valueof(m_createAcr(p_acor, int63))}
+ accessControlRule_list := {valueof(m_createAcr({"*"}, int63))}
},//M
choice := omit //NP
};
@@ -1852,6 +1863,23 @@ module OneM2M_Templates {
allowedAEs := omit,
choice := omit //NP
};
+
+ template ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
+ resourceName := "MyServiceServiceSubscribedNodeResource", //O
+ resourceType := omit, //M
+ resourceID := omit, //M
+ parentID := omit, //M
+ creationTime := omit, //M
+ lastModifiedTime := omit, //M
+ labels := omit, //O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //M
+ nodeID := omit, //M
+ cSE_ID := omit, //O
+ deviceIdentifier := omit, //M
+ ruleLinks := omit, //O
+ choice := omit //O
+ };
}//end group ContentCreate
group ContentUpdate {
@@ -2129,7 +2157,7 @@ module OneM2M_Templates {
choice := omit
}
- template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
+ template (value) AEAnnc_optional m_contentUpdateAEAnnc (template (omit) XSD.ID p_appId := omit, template (omit) XSD.ID p_stemId := omit) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
@@ -2141,7 +2169,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
appName := omit,
- app_ID := omit,
+ app_ID := p_appId,
aE_ID := omit,
pointOfAccess := omit,
ontologyRef := omit,
@@ -3279,6 +3307,10 @@ module OneM2M_Templates {
primitiveContent := p_content
}
+ template ResponsePrimitive mw_responsePrimitiveforInfoPort := ?;
+
+ template RequestPrimitive mw_requestPrimitiveforInfoPort := ?;
+
template ResponsePrimitive mw_responsePrimitive(in template (present) ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
responseStatusCode := p_statusCode,
requestIdentifier := ?,
@@ -3344,6 +3376,12 @@ module OneM2M_Templates {
resultExpirationTimestamp := omit,
eventCategory := omit
};
+
+ group InfoPortTemplates {
+
+ template MyResource mw_resource := ?;
+
+ }//end group InfoPortTemplates
}//end group ResponsePrimitives
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index b9af2a79e822635cd8d088d14a9706680e71ebf1..9350a91643ea9c9f96b693211fe7a3a102ef2240 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -24,6 +24,7 @@ module OneM2M_TestSystem {
*/
type component Tester {
port AdapterControlPort acPort;
+ port InfoPort infoPort;
//timers
timer tc_ac := PX_TAC;
timer tc_wait;
@@ -31,30 +32,48 @@ module OneM2M_TestSystem {
var Configurations vc_config;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {};
- var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
- var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
- }
-
- type component CseTester extends Tester {
- port OneM2MPort mcaPort;
- port OneM2MPort mccPort;
-
- //global variables
+ //var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
+ //var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
var integer vc_aeAuxIndex;//TODO To be removed
- var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
+ var integer vc_acpAuxIndex;
var AccessControlPolicy_optional vc_acpAux;
- var integer vc_acpAuxIndex := -1;
+ };
+
+ type component AeSimu extends Tester {
+ var AeSimu vc_ae2;
+ port OneM2MPort mcaPort;
+ port OneM2MPort mcaPortIn;
+
+ //global variables
+ var PrimitiveContent vc_primitiveContentRetrievedResource;
- }
+ var MsgIn vc_request;
+ var MsgIn vc_response;
+ var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
+ var boolean vc_auxiliaryAe2Up := false;
+ //var AeSimu vc_ae2;
- type component AeTester extends Tester {
+ };
+
+ type component CseSimu extends Tester {
port OneM2MPort mcaPort;
+ port OneM2MPort mccPort;
+ port OneM2MPort mccPortIn;
//global variables
- }
+ var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
+ var integer vc_remoteCseIndex;
+ var MsgIn vc_request;
+ var MsgIn vc_response;
+ };
+
+ type component InCseSimu extends CseSimu {}
+
+ type component MnCseSimu extends CseSimu {}
type component CseSystem {
port OneM2MPort mcaPort;
+ port OneM2MPort mcaPortIn;
port OneM2MPort mccPort;
port AdapterControlPort acPort;
}
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 6177b6181df7ceaafaaf60456bf7f68ee6c4848c..471d9a4c35f1ef9d74ffb70699f8f40e2b032a42 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -3242,10 +3242,12 @@ module OneM2M_Types {
// TODO To be added
type union Representation {
Resource_2 resource,
- ResponsePrimitive responsePrimitive
+ ResponsePrimitive responsePrimitive,
+ XSD.AnyURI uRI
}
with {
variant "name as 'representation'";
+ variant (uRI) "name as capitalized";
}
type record Notification_1
@@ -3618,12 +3620,12 @@ module OneM2M_Types {
};
- type record ResourceWrapper
+ type record ResourceWrapper//Make of union elements type _optional
{
union {
- AccessControlPolicy accessControlPolicy,
+ AccessControlPolicy_optional accessControlPolicy,
ActiveCmdhPolicy activeCmdhPolicy,
- AE aE,
+ AE_optional aE,
AreaNwkDeviceInfo areaNwkDeviceInfo,
AreaNwkInfo areaNwkInfo,
Battery battery,
@@ -3635,36 +3637,36 @@ module OneM2M_Types {
CmdhNetworkAccessRules cmdhNetworkAccessRules,
CmdhNwAccessRule cmdhNwAccessRule,
CmdhPolicy cmdhPolicy,
- Container container,
- ContentInstance contentInstance,
- CSEBase cSEBase,
- Delivery delivery,
+ Container_optional container,
+ ContentInstance_optional contentInstance,
+ CSEBase_optional cSEBase,
+ Delivery_optional delivery,
DeviceCapability deviceCapability,
DeviceInfo deviceInfo,
EventConfig eventConfig,
EventLog eventLog,
ExecInstance execInstance,
Firmware firmware,
- Group group_,
- LocationPolicy locationPolicy,
- M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
+ Group_optional group_,
+ LocationPolicy_optional locationPolicy,
+ M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
Memory memory,
- MgmtCmd mgmtCmd,
- Node node,
+ MgmtCmd_optional mgmtCmd,
+ Node_optional node,
Notification notification,
- PollingChannel pollingChannel,
+ PollingChannel_optional pollingChannel,
Reboot reboot,
- RemoteCSE remoteCSE,
- Request request,
+ RemoteCSE_optional remoteCSE,
+ Request_optional request,
RequestPrimitive requestPrimitive,
ResponsePrimitive responsePrimitive,
- Schedule schedule,
- ServiceSubscribedAppRule serviceSubscribedAppRule,
- ServiceSubscribedNode serviceSubscribedNode,
+ Schedule_optional schedule,
+ ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
+ ServiceSubscribedNode_optional serviceSubscribedNode,
Software software,
- StatsCollect statsCollect,
- StatsConfig statsConfig,
- Subscription subscription
+ StatsCollect_optional statsCollect,
+ StatsConfig_optional statsConfig,
+ Subscription_optional subscription
} choice,
XSD.AnyURI uRI
}
@@ -5124,6 +5126,39 @@ group optionalResourceTypes {
variant (choice.subscription_list[-]) "name as 'subscription'";
};
+ type record ServiceSubscribedNode_optional
+ {
+ ResourceName resourceName optional,
+ ResourceType resourceType optional,
+ XSD.ID resourceID optional,
+ NhURI parentID optional,
+ Timestamp creationTime optional,
+ Timestamp lastModifiedTime optional,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime optional,
+ NodeID nodeID optional,
+ XSD.ID cSE_ID optional,
+ record of DeviceID deviceIdentifier optional,
+ ListOfURIs ruleLinks optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of Subscription subscription_list
+ } choice optional
+ }
+ with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (cSE_ID) "name as 'CSE-ID'";
+ variant (deviceIdentifier) "list";
+ variant (choice) "untagged";
+ variant (choice.childResource_list) "untagged";
+ variant (choice.childResource_list[-]) "name as 'childResource'";
+ variant (choice.subscription_list) "untagged";
+ variant (choice.subscription_list[-]) "name as 'subscription'";
+ };
+
type record StatsCollect_optional
{
ResourceName resourceName optional,
diff --git a/LibOneM2M/XSD.ttcn b/LibOneM2M/XSD.ttcn
index 4aeeeea6d605bdf6637592f32cd3de29cb71d9e3..24dfde9c38c503a7cf630b4c5c1e64558e40bc8f 100644
--- a/LibOneM2M/XSD.ttcn
+++ b/LibOneM2M/XSD.ttcn
@@ -209,9 +209,9 @@ variant "XSD:double";
// Time types
-type charstring Duration (pattern
- "{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
- "{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
+type charstring Duration //(pattern TODO Check the pattern "PT5S" not matching
+ //"{dash}#(,1)P({nums}(Y({nums}(M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|" &
+ //"{durTime}#(,1))|M({nums}D{durTime}#(,1)|{durTime}#(,1))|D{durTime}#(,1))|{durTime})")
with {
variant "XSD:duration";
};
diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 18722af085bbfcb7c25733aad900cdf65676385d..4596e1f6fb3804b8278cfa8bb62351f361205ca1 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -40,11 +40,12 @@ module OneM2M_TestControl {
execute(TC_CSE_REG_CRE_016_CST());
execute(TC_CSE_REG_CRE_016_POA());
execute(TC_CSE_REG_CRE_016_NL());
- execute(TC_CSE_REG_CRE_018());
+ execute(TC_CSE_REG_CRE_019());
execute(TC_CSE_REG_CRE_022());
execute(TC_CSE_REG_CRE_023());
execute(TC_CSE_REG_CRE_025());
- execute(TC_CSE_REG_CRE_026());
+ execute(TC_CSE_REG_CRE_028());
+ execute(TC_CSE_REG_CRE_029());
execute(TC_CSE_REG_RET_001());
execute(TC_CSE_REG_RET_005());
execute(TC_CSE_REG_RET_008());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 50de04414dc0c9ac4aa4239bbfa3a03619852742..4c21a2389a9c4bca282d2c3d02132ab290067519 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -28,7 +28,7 @@ module OneM2M_Testcases {
group helpingTestCases {//These are not part of the test suite, just for verification purposes
- testcase TC_DELETE_RESOURCES() runs on CseTester system CseSystem {
+ testcase TC_DELETE_RESOURCES() runs on AeSimu system CseSystem {
timer t_ac := 5.0;
var integer i;
@@ -87,30 +87,40 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a resource using unstructured resource identifier
*
*/
- testcase TC_CSE_GEN_CRE_001_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_001_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_001(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_001(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_CRE_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_001_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_001(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_001(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_CRE_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_001_ABS() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_GEN_CRE_001(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_001(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_CRE_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_CRE_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -130,9 +140,10 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_nonHierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_nonHierarchical;
+ v_primitiveScope := p_primitiveScope;
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
+ v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -155,8 +166,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -173,30 +182,41 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a resource using structured resource identifier
*
*/
- testcase TC_CSE_GEN_CRE_002_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_002_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_002(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_002(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_CRE_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_002_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_002(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_002(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_CRE_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_002_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_002(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_CRE_002(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_CRE_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_CRE_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -216,10 +236,11 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_hierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_hierarchical;
+ v_primitiveScope := p_primitiveScope;
v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
-
+ v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
+
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -241,8 +262,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -262,29 +281,39 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the retrieval of a <container> resource using unstructured resource identifier
*
*/
- testcase TC_CSE_GEN_RET_001_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_001_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_RET_001(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_001(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_RET_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_001_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_RET_001(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_001(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_RET_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_001_ABS() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_GEN_RET_001(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_001(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_RET_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_RET_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -304,10 +333,10 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_nonHierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_nonHierarchical;
+ v_primitiveScope := p_primitiveScope;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -328,8 +357,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -346,29 +373,39 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the retrieval of a <container> resource using structured resource identifier
*
*/
- testcase TC_CSE_GEN_RET_002_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_002_CSR() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_GEN_RET_002(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_002(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_RET_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_002_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_RET_002(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_002(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_RET_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_002_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_RET_002(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_RET_002(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_RET_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_RET_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -388,10 +425,10 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_hierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_hierarchical;
+ v_primitiveScope := p_primitiveScope;
- mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));tc_ac.start;
+ mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
tc_ac.stop;
@@ -411,8 +448,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -431,30 +466,39 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the update of a <container> resource using unstructured resource identifier
*
*/
- testcase TC_CSE_GEN_UPD_001_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_001_CSR() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_GEN_UPD_001(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_001(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_UPD_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_001_SPR() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_GEN_UPD_001(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_001(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_UPD_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_001_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_001(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_001(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_UPD_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_UPD_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -474,12 +518,13 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_nonHierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_nonHierarchical;
+ v_primitiveScope := p_primitiveScope;
v_updateRequest.primitiveContent.container.labels := {"MyLabel"};
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
+ v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
mcaPort.send(m_request(v_updateRequest));
tc_ac.start;
@@ -502,8 +547,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -519,30 +562,41 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the update of a <container> resource using structured resource identifier
*
*/
- testcase TC_CSE_GEN_UPD_002_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_002_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_002(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_002(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_UPD_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_002_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_002(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_002(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_UPD_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_002_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_002(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_UPD_002(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_UPD_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_UPD_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -562,12 +616,13 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_hierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_hierarchical;
+ v_primitiveScope := p_primitiveScope;
v_updateRequest.primitiveContent.container.labels := {"MyLabel"};
v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
+ v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
mcaPort.send(m_request(v_updateRequest));
tc_ac.start;
@@ -590,8 +645,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -611,30 +664,41 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the deletion of a <container> resource using unstructured resource identifier
*
*/
- testcase TC_CSE_GEN_DEL_001_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_001_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_001(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_001(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_DEL_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_001_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_001(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_001(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_DEL_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_001_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_001(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_001(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_DEL_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_DEL_001(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -654,10 +718,10 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_nonHierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_nonHierarchical;
+ v_primitiveScope := p_primitiveScope;
- v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -680,8 +744,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -698,30 +760,41 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the deletion of a <container> resource using structured resource identifier
*
*/
- testcase TC_CSE_GEN_DEL_002_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_002_CSR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_002(e_cseRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_002(e_cseRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_DEL_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_002_SPR() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_002(e_spRelative);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_002(e_spRelative));
+ v_ae1.done;
}
- testcase TC_CSE_GEN_DEL_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_002_ABS() runs on Tester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_002(e_absolute);
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GEN_DEL_002(e_absolute));
+ v_ae1.done;
}
- function f_CSE_GEN_DEL_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_DEL_002(in PrimitiveScope p_primitiveScope) runs on AeSimu {
// Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
+ var AddressingMethod v_addressingMethod;
+ var PrimitiveScope v_primitiveScope;
// Test control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -741,10 +814,10 @@ module OneM2M_Testcases {
// Test Body
//Force usage of Non-Hierarchical addressing method
- vc_addressingMethod := e_hierarchical;
- vc_primitiveScope := p_primitiveScope;
+ v_addressingMethod := e_hierarchical;
+ v_primitiveScope := p_primitiveScope;
- v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
+ v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -767,8 +840,6 @@ module OneM2M_Testcases {
}
// Postamble
- vc_addressingMethod := PX_ADDRESSING_METHOD;
- vc_primitiveScope := PX_PRIMITIVE_SCOPE;
f_cse_postamble_deleteResources();
// Tear down
@@ -791,7 +862,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE registration (allowed App-ID, C-AE-ID-STEM not provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_001() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -802,12 +873,12 @@ module OneM2M_Testcases {
f_cf01Up();
//Preamble
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"C-AE-ID-STEM"});//c_CRUDNDi);
+ v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"S*"}); //c_CRUDNDi);
//Test Body
v_request := valueof(m_createAe(PX_APP_ID, omit, omit));
- v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
+ v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
mcaPort.send(m_request(v_request));
@@ -838,7 +909,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a registration CREATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource
*
*/
- testcase TC_CSE_REG_CRE_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_002() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -849,12 +920,11 @@ module OneM2M_Testcases {
f_cf01Up();
//Preambule
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"C-AE-ID-STEM"});//c_CRUDNDi);
//Test Body
v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
+ v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -884,7 +954,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects an AE registration (allowed App-ID, not allowed C-AE-ID-STEM provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_004() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -895,14 +965,15 @@ module OneM2M_Testcases {
f_cf01Up();
//Preambule
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule(-);//c_CRUDNDi);
-
+ //vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+ //TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule
+ //v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
+
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
-
- v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
+ //v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
+
+ f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "C"));
- mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -916,7 +987,7 @@ module OneM2M_Testcases {
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
- }
+ }
// Postamble
f_cse_postamble_deleteResources();
@@ -930,28 +1001,32 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE registration (allowed App-ID, S-AE-ID-STEM not provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_005() runs on InCseSimu system CseSystem {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
// Test component configuration
- f_cf02Up();
+ f_cf02UpCseSimuMaster();
//Preambule
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
+ //v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
+ vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
+ vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));
- v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
+ //v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
- mcaPort.send(m_request(v_request));
+ //mcaPort.send(m_request(v_request));
tc_ac.start;
-
- alt {
- [] mccPort.receive(mw_request(mw_createAEAnnc(-, -, -))) {
+ alt{
+ []mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))){
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": AE creation redirected.");
+ }
+ []mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))){
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
@@ -962,13 +1037,16 @@ module OneM2M_Testcases {
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}
- }
-
+ }
+
+ /*vc_cseSimu.start(f_cse_receiveCreateRequest(mw_createAEAnnc(-, -, -)));
+ vc_cseSimu.done;*/
+
// Postamble
- f_cse_postamble_deleteResources();
+ f_cse_postamble_deleteResourcesCSE();
// Tear down
- f_cf01Down();
+ f_cf02DownCseSimuMaster();
}
@@ -976,28 +1054,34 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer request to the IN-CSE
*
*/
- testcase TC_CSE_REG_CRE_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_008() runs on InCseSimu system CseSystem {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
// Test component configuration
- f_cf02Up();
+ f_cf02UpCseSimuMaster();
//Preambule
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
-
+ vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+ vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
+
+ //TODO:
+ //v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
+ //mcaPort.send(m_request(v_request));
+
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
-
- v_request := f_getUpdateRequestPrimitive(v_resourceType,v_cseBaseIndex, v_request);
-
- mcaPort.send(m_request(v_request));
+ vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
+
tc_ac.start;
alt {
- [] mccPort.receive(mw_request(mw_createAEAnnc("/S", "CSE_ID", -))) {
+ [] mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": AE creation redirected.");
+ }
+ [] mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
@@ -1011,10 +1095,10 @@ module OneM2M_Testcases {
}
// Postamble
- f_cse_postamble_deleteResources();
+ f_cse_postamble_deleteResourcesCSE();
// Tear down
- f_cf02Down();
+ f_cf02DownCseSimuMaster();
}
@@ -1022,7 +1106,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), communication between MN-CSE and IN-CSE
*
*/
- testcase TC_CSE_REG_CRE_009() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_009() runs on MnCseSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1030,16 +1114,21 @@ module OneM2M_Testcases {
var ResourceType v_resourceType := int2;
// Test component configuration
- f_cf02Up();
+ f_cf04Up();
//Preambule
- v_aeAnncIndex := f_cse_preamble_registerAe();//TODO TestSystem acting as MN. It should register AeAnnc into the IUT (IN) via mcc
- f_cse_deleteResource(v_aeAnncIndex); //to deregister the AE
-
+
+ vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+
+ v_aeAnncIndex := f_cse_announceResource(int2, m_createAEAnnc(-, -, -, PX_APP_ID, -));
+
//Test Body
- v_request := valueof(m_updateAEAnnc(-, -, -, "APP-ID", -)); //TODO to double check all parameters
+ v_request := valueof(m_updateAEAnnc(-, -, -, PX_APP_ID, -)); //TODO to double check all parameters
- v_request := f_getUpdateRequestPrimitive(v_resourceType,v_aeAnncIndex, v_request);//TODO
+ v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO
+ v_request.from_ := f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S";
+ v_request.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
+ v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
mccPort.send(m_request(v_request));
tc_ac.start;
@@ -1062,10 +1151,10 @@ module OneM2M_Testcases {
//v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
- f_cse_postamble_deleteResources();
+ f_cse_postamble_deleteResourcesCSE();
// Tear down
- f_cf02Down();
+ f_cf04Down();
}
@@ -1073,29 +1162,50 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer response to the AE
*
*/
- testcase TC_CSE_REG_CRE_010() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_010() runs on AeSimu system CseSystem {
var MsgIn v_response;
- var ResponsePrimitive v_request;
- var integer v_cseBaseIndex := -1;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
// Test component configuration
f_cf02Up();
//Preambule
- v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi);
-
+ vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+ vc_cseSimu.done;
+
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
+
+ vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
+ vc_cseSimu.done;
+
+ //TODO Deregister
+ //f_cse_deleteResource(v_aeIndex);
+ v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
+ mcaPort.send(m_request(v_request));
+
//Test Body
- v_request := valueof(m_responsePrimitive(int2001, "To_be_defined", {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, omit, PX_APP_ID, "/CSE_ID/S-AE-ID-STEM")}));
-
- mccPort.send(m_response(v_request));
+ f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
+
+ vc_cseSimu.start(f_cse_resourceAnnouncementHandler(PX_CSE_ID, f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative)));
+ vc_cseSimu.done;
+
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": AE creation success.");
//continue to test the content
+ if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)){
+ if (v_response.primitive.responsePrimitive.primitiveContent.aE.app_ID == PX_APP_ID){
+ setverdict(pass, __SCOPE__ & ": AE creation success.");
+ }else{
+ setverdict(fail, __SCOPE__ & ": Error in AE content.");
+ }
+ }else{
+ setverdict(fail, __SCOPE__ & ": primitiveContent doesn't exist");
+ }
}
[] mcaPort.receive {
tc_ac.stop;
@@ -1112,59 +1222,66 @@ module OneM2M_Testcases {
// Tear down
f_cf02Down();
- } //end TC_CSE_REG_CRE_010
+ }; //end TC_CSE_REG_CRE_010
- group g_CSE_REG_CRE_016{
+ group g_CSE_REG_CRE_016 {
/**
* @desc Check that the IUT accepts a create request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE.
*
*/
- testcase TC_CSE_REG_CRE_016_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_016_LBL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
-
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
- f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
+ v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+ v_cse1.done;
}
- testcase TC_CSE_REG_CRE_016_CST() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_016_CST() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"cseType", omit};
-
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
v_createRequest.primitiveContent.remoteCSE.cseType := int1;
- f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
-
+ v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+ v_cse1.done;
}
- testcase TC_CSE_REG_CRE_016_POA() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_016_POA() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
- f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
+ v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+ v_cse1.done;
}
- testcase TC_CSE_REG_CRE_016_NL() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_016_NL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"nodeLink", omit};
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
- f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute);
+ v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+ v_cse1.done;
}
- function f_CSE_REG_CRE_016(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseTester {
+ function f_CSE_REG_CRE_016(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
// Local variables
var MsgIn v_response;
@@ -1189,14 +1306,17 @@ module OneM2M_Testcases {
[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation for resource type remoteCSE containing attribute " & p_optionalAttribute.name);
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Accepted creation for resource type remoteCSE without containing attribute " & p_optionalAttribute.name);
+ f_setResource(v_request.primitiveContent,int16);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
@@ -1208,7 +1328,7 @@ module OneM2M_Testcases {
}
// Postamble
- f_cse_postamble_deleteResources();
+ f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
@@ -1221,7 +1341,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects an AE registration (not allowed App-ID)
*
*/
- testcase TC_CSE_REG_CRE_018() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_019() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1267,7 +1387,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1.
*
*/
- testcase TC_CSE_REG_CRE_022() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_022() runs on CseSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1321,7 +1441,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
*
*/
- testcase TC_CSE_REG_CRE_023() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_023() runs on CseSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1371,7 +1491,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the create request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_CRE_025() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_025() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1415,13 +1535,60 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end TC_CSE_REG_CRE_024
+ }//end TC_CSE_REG_CRE_025
+
+ /**
+ * @desc Check that the IUT rejects the create request of <CSEBase> resource.
+ *
+ */
+ testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
+
+ // Local variables
+ var RequestPrimitive v_request;
+ var integer v_cseBaseIndex := -1;
+ var ResourceType v_resourceType := int2;
+
+ // Test control
+
+ // Test component configuration
+ f_cf02Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+
+ // Test Body
+ f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": AE creation successful.");
+ }
+ [] mcaPort.receive {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while creating AE");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while creating AE");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf02Down();
+
+ }//end TC_CSE_REG_CRE_027
/**
* @desc Check that the IUT rejects registration of already registered AE (C-AE-ID-STEM provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_026() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_CRE_028() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1467,6 +1634,47 @@ module OneM2M_Testcases {
}
+ testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
+
+ var MsgIn v_response;
+
+ var RequestPrimitive v_request;
+ var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
+ var ResourceType v_resourceType := int16;
+
+ // Test control
+
+ // Test component configuration
+ f_cf04Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
+
+ tc_ac.start;
+ alt {
+ [] mccPort.receive(mw_request(mw_createRemoteCSEBase(PX_CSE_ID,f_getResourceAddress(-1)))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Resource type remoteCSE created successfully");
+ }
+ [] mccPort.receive {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while creating resource type remoteCSE");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResourcesCSE();
+
+ // Tear down
+ f_cf04Down();
+
+ }
+
} //end group Create
@@ -1477,7 +1685,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an retrieval request of <CSEBase> resource and responds with all attributes that have multiplicity equals to 1.
*
*/
- testcase TC_CSE_REG_RET_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_RET_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1534,7 +1742,7 @@ module OneM2M_Testcases {
* @desc Check that if the IUT is IN-CSE, it accepts an retrieval request of <CSEBase> resource and returns the cseType attribute. cseType Attribute is mandatory for IN-CSE
*
*/
- testcase TC_CSE_REG_RET_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_RET_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1604,7 +1812,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts a retrieval request of <CSEBase> resource and responds with supportedResourceTypes attribute containing a list of the supported resources and pointOfAccess containing the list of physical addresses to be used by Registree to connect to this CSE (e.g. IP address, FQDN).
*
*/
- testcase TC_CSE_REG_RET_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_RET_008() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -1677,7 +1885,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the update request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_UPD_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_UPD_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1731,7 +1939,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the delete request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_DEL_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_REG_DEL_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1787,16 +1995,17 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource on the TARGET_RESOURCE_ADDRESS of type PARENT_RESOURCE_TYPE with resource name not provided
*
*/
- testcase TC_CSE_DMR_CRE_001_CNT_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_CNT_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;//TODO useless but need to be initialized see if we can remove it
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, -, v_notifyHandler); //Container
-
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
+ v_ae1.done;
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1804,16 +2013,19 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_CNT_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_CNT_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit),v_notifyHandler);//Container
-
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAeAux(omit,omit)));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1821,16 +2033,20 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_CNT_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_CNT_CNT() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase, v_notifyHandler);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1838,16 +2054,20 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_GRP_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_GRP_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.group_.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int9, v_createRequest, -, v_notifyHandler);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, -));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1855,16 +2075,20 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_GRP_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_GRP_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.group_.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAeAux(omit,omit)));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1872,16 +2096,20 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_ACP_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_ACP_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int1, v_createRequest, -, v_notifyHandler);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, -));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -1889,133 +2117,162 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_ACP_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_ACP_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//AccessControlPolicy
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
- setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
+ v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAeAux(omit,omit)));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
+ setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
+ }
}
- testcase TC_CSE_DMR_CRE_001_SCH_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SCH_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int18, v_createRequest, -, v_notifyHandler);//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, -));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
+ }
}
}
- testcase TC_CSE_DMR_CRE_001_SCH_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SCH_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Schedule
-
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
- setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
- }
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createAeAux(omit,omit)));//Schedule
+ v_ae1.done;
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
+ setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+ }
}
+
+ }
- testcase TC_CSE_DMR_CRE_001_SCH_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SCH_SUB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.schedule.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase, v_notifyHandler);//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_001(int18, v_createRequest, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
+ }
}
}
- testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//PollingChannel
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
- setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
- }
+ v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAeAux(omit,omit)));//PollingChannel
+ v_ae1.done;
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
+ setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+ }
}
+
+ }
- testcase TC_CSE_DMR_CRE_001_SUB_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, -, v_notifyHandler);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
+ }
}
}
- testcase TC_CSE_DMR_CRE_001_SUB_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_AE() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAeAux(omit,omit)));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
}
- }
+ }
- testcase TC_CSE_DMR_CRE_001_SUB_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_CNT() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2023,61 +2280,77 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_SUB_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_ACP() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
- setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
- }
- }
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+ setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
+ }
+ }
+ }
- testcase TC_CSE_DMR_CRE_001_SUB_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_SCH() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createScheduleBase));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
- }
+ }
}
}
- testcase TC_CSE_DMR_CRE_001_SUB_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_SUB_GRP() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_createRequest.primitiveContent.subscription.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createGroupBase));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
}
}
- testcase TC_CSE_DMR_CRE_001_NOD_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_NOD_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createNodeBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.node.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int14, v_createRequest, -, v_notifyHandler);//Node
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int14, v_createRequest, -));//Node
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2085,15 +2358,19 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_MGC_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_MGC_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createMgmtCmdBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.mgmtResource.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int12, v_createRequest, -, v_notifyHandler);//Management Command
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int12, v_createRequest, -));//Management Command
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.mgmtResource.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2101,15 +2378,19 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_LCP_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_LCP_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createLocationPolicyBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.locationPolicy.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int10, v_createRequest, -, v_notifyHandler);//Location Policy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int10, v_createRequest, -));//Location Policy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2117,31 +2398,39 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_STCG_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_STCG_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createStatsConfigBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.statsConfig.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int22, v_createRequest, -, v_notifyHandler);//Stats Config
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int22, v_createRequest, -));//Stats Config
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
}
}
- testcase TC_CSE_DMR_CRE_001_STCL_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_STCL_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createStatsCollectBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.statsCollect.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int21, v_createRequest, -, v_notifyHandler);//Stats Collect
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int21, v_createRequest, -));//Stats Collect
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2149,15 +2438,19 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_MSSP_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_MSSP_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createM2mServiceSubscriptionProfileBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.m2mServiceSubscriptionProfile.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int11, v_createRequest, -, v_notifyHandler);//Subscription Profile
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int11, v_createRequest, -));//Subscription Profile
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2165,15 +2458,19 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_ASAR_CB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_ASAR_CB() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createServiceSubscribedAppRuleBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.serviceSubscribedAppRule.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int19, v_createRequest, -, v_notifyHandler);//Service Subscribed App
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_CRE_001(int19, v_createRequest, -));//Service Subscribed App
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
@@ -2181,23 +2478,27 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_001_CIN_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_001_CIN_CNT() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var ResponsePrimitive v_responsePrimitive;
- var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_createRequest.primitiveContent.contentInstance.resourceName := omit;
- v_responsePrimitive := f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase, v_notifyHandler);//Subscription
- if(getverdict == pass){
- if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
+ v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
}
}
}
- function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in CseTester p_notifyHandler) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_CRE_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
@@ -2211,17 +2512,19 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
-
+ f_cf01Up(true);
+
// Test adapter configuration
// Preamble
if(ispresent(p_parentRequestPrimitive)) {
if(match(int23, p_parentRequestPrimitive.resourceType)){
- v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+ vc_ae2.done;
+ v_ae2Index := f_getResource(vc_ae2);
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
@@ -2252,9 +2555,11 @@ module OneM2M_Testcases {
// Test Body
if(match(int23, p_requestPrimitive.resourceType)){
- v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
+ vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1)); // AE2 is registred
+ vc_ae2.done;
+ v_ae2Index := f_getResource(vc_ae2);
p_requestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
@@ -2262,16 +2567,17 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
+ f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -2280,7 +2586,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_isResourcePresent(v_resourceIndex)){
@@ -2291,14 +2597,11 @@ module OneM2M_Testcases {
// Postamble
f_cse_postamble_deleteResources();
- vc_resourcesIndexToBeDeleted := {};
-
+
// Tear down
- //notifyHandler.stop;
f_cf01Down();
-
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_CRE_001
@@ -2311,13 +2614,17 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with a non-existing resource name provided by AE
*
*/
- testcase TC_CSE_DMR_CRE_002_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_CNT() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
-
- v_responsePrimitive := f_CSE_DMR_CRE_002(int3, m_createContainerBase);//container
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2326,15 +2633,20 @@ module OneM2M_Testcases {
}
}
}
+
}
- testcase TC_CSE_DMR_CRE_002_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_GRP() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_CRE_002(int9, m_createGroupBase);//group
-
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2345,13 +2657,17 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_002_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_ACP() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
-
- v_responsePrimitive := f_CSE_DMR_CRE_002(int1, m_createAcpBase );//accessControlPolicy
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2362,13 +2678,17 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_002_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_SCH() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_CRE_002(int18, m_createScheduleBase);//Schedule
-
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2378,13 +2698,17 @@ module OneM2M_Testcases {
}
}
}
- testcase TC_CSE_DMR_CRE_002_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase);//Pollingchannel
-
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2395,13 +2719,17 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_002_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_002_SUB() runs on Tester system CseSystem {
// Local variables
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase);//Subscription
-
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
} else {
@@ -2412,27 +2740,26 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -2440,16 +2767,17 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfully");
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+ f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while creating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -2458,7 +2786,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)){
@@ -2468,11 +2796,11 @@ module OneM2M_Testcases {
}
// Postamble
f_cse_postamble_deleteResources();
-
+
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_CRE_002
@@ -2485,66 +2813,84 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource with an existing resource name provided by AE
*
*/
- testcase TC_CSE_DMR_CRE_003_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_CNT() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_DMR_CRE_003(int3, m_createContainerBase);//container
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int3, m_createContainerBase));//container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_003_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_GRP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_003(int9, m_createGroupBase);//group
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int9, m_createGroupBase));//group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_003_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_ACP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_003(int1, m_createAcpBase);//accessControlPolicy
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int1, m_createAcpBase));//accessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_003_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_SCH() runs on Tester system CseSystem {
// Local variables
-
- f_CSE_DMR_CRE_003(int18, m_createScheduleBase);//Schedule
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_003_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_PCH() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase);//Pollingchannel
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int15, m_createPollingChannelBase));//Pollingchannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_003_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_003_SUB() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_003(int23, m_createSubscriptionBase);//Subscription
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_003(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi)
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
+ if(p_resourceType == int23){
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
+ }
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
// Test Body
@@ -2586,43 +2932,61 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of a RESOURCE_TYPE resource when AE has no privileges
*
*/
- testcase TC_CSE_DMR_CRE_004_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_CNT() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int3, m_createContainerBase);//container
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int3, m_createContainerBase));//container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_004_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_GRP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int9, m_createGroupBase);//group
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int9, m_createGroupBase));//group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_004_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_ACP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int1, m_createAcpBase);//accessControlPolicy
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int1, m_createAcpBase));//accessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_004_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_SCH() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int18, m_createScheduleBase);//Schedule
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_004_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_PCH() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase);//Pollingchannel
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int15, m_createPollingChannelBase));//Pollingchannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_004_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_004_SUB() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_004(int23, m_createSubscriptionBase);//Subscription
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_004(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
// Local variables
var MsgIn v_response;
@@ -2673,7 +3037,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -2698,42 +3062,48 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the CREATE Request of container resource when the RW ATTRIBUTE is provided with an invalid value
*
*/
- testcase TC_CSE_DMR_CRE_005_MNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_005_MNI() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AttributeAux v_invalidAttribute;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
- f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_005_MBS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_005_MBS() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AttributeAux v_invalidAttribute;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.maxByteSize := 0;
v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
- f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_005_MIA() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_005_MIA() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var AttributeAux v_invalidAttribute;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.maxInstanceAge := 0;
v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
- f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_invalidAttribute) runs on CseTester {
+ function f_CSE_DMR_CRE_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_invalidAttribute) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -2773,7 +3143,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -2799,28 +3169,36 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns a default value to RW ATTRIBUTE in the response of a <container> CREATE Request where no a RW ATTRIBUTE is provided by AE
*
*/
- testcase TC_CSE_DMR_CRE_006_MNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_006_MNI() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_responsePrimitive := f_CSE_DMR_CRE_006(int3, v_createRequest);
+ v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
}
}
}
- testcase TC_CSE_DMR_CRE_006_MBS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_006_MBS() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_responsePrimitive := f_CSE_DMR_CRE_006(int3, v_createRequest);
+ v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
}
@@ -2828,21 +3206,25 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_CRE_006_MIA() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_006_MIA() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_CRE_006(int3, v_createRequest);
-
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
}
}
}
- function f_CSE_DMR_CRE_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_CRE_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
@@ -2866,16 +3248,17 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation rejected for resource type " & int2str(enum2int(p_resourceType)));
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
+ f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_aeIndex);
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Creation rejected of resource type " & int2str(enum2int(p_resourceType)));
}
@@ -2884,7 +3267,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)){
@@ -2899,7 +3282,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_CRE_006
@@ -2911,7 +3294,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
*
*/
- testcase TC_CSE_DMR_CRE_007() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -2957,7 +3340,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
@@ -2982,7 +3365,7 @@ module OneM2M_Testcases {
* @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
*
*/
- testcase TC_CSE_DMR_CRE_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -3029,7 +3412,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
@@ -3054,7 +3437,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT increaments and then copies the field value of attribute stateTag in parent container resource when contentInstance resource is created as the direct child of the parent container
*
*/
- testcase TC_CSE_DMR_CRE_009() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -3126,7 +3509,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the CREATE Request of a container resource named “la†as a direct child of a container resource
*
*/
- testcase TC_CSE_DMR_CRE_010() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -3173,7 +3556,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
@@ -3198,7 +3581,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the CREATE Request of a container resource named “ol†as a direct child of a container resource
*
*/
- testcase TC_CSE_DMR_CRE_011() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -3245,7 +3628,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_containerIndex, f_getResourceName(v_request.primitiveContent))){
@@ -3270,62 +3653,78 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully after a CREATE request an empty content of created resource when the ResultContent set to 0 (Nothing)
*
*/
- testcase TC_CSE_DMR_CRE_012_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_CRE_012(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_CRE_012(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_012_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_GRP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_012(int9, m_createGroupBase);//Group
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_012(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_012_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_ACP() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_012(int1, m_createAcpBase);//AccessControlPolicy
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_012(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_012_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_SCH() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_012(int18, m_createScheduleBase);//Schedule
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_012(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_012_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_PCH() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_012(int15, m_createPollingChannelBase);//PollingChannel
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_012(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_012_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_012_SUB() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_CRE_012(int23, m_createSubscriptionBase);//Subscription
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_CRE_012(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_CRE_012(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var CseTester v_notifyHandler;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -3371,80 +3770,91 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully after a CREATE request only hierarchichal address of the created resource when the Result Content is set to 2 (hierarchical address)
*
*/
- testcase TC_CSE_DMR_CRE_013_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_CNT() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.uRI := mw_contentContainer_rc2;
- f_CSE_DMR_CRE_013(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_CRE_013(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_013_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_GRP() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.uRI := mw_contentGroup_rc2;
- f_CSE_DMR_CRE_013(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_CRE_013(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_013_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_ACP() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_contentResponse.uRI := mw_contentAcp_rc2;
- f_CSE_DMR_CRE_013(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_013(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_013_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_SCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_contentResponse.uRI := mw_contentSchedule_rc2;
- f_CSE_DMR_CRE_013(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_013_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_PCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_contentResponse.uRI := mw_contentPollingChannel_rc2;
- f_CSE_DMR_CRE_013(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_CRE_013(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_013_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_013_SUB() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
-
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
v_contentResponse.uRI := mw_contentSubscription_rc2;
- f_CSE_DMR_CRE_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_CRE_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var CseTester v_notifyHandler;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -3480,9 +3890,10 @@ module OneM2M_Testcases {
// Postamble
f_cse_postamble_deleteResources();
-
+
// Tear down
f_cf01Down();
+
}//end f_CSE_DMR_CRE_013
@@ -3494,81 +3905,92 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully after a CREATE request only attributes and hierarchichal address of the created resource when Result Content is set 3 (attributes and hierarchichal address)
*
*/
- testcase TC_CSE_DMR_CRE_014_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_CNT() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentContainer_rc3;
- f_CSE_DMR_CRE_014(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_CRE_014(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_014_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_GRP() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentGroup_rc3;
- f_CSE_DMR_CRE_014(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_CRE_014(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_014_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_ACP() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentAcp_rc3;
- f_CSE_DMR_CRE_014(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_014(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_014_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_SCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentSchedule_rc3;
- f_CSE_DMR_CRE_014(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_014(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_014_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_PCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentPollingChannel_rc3;
- f_CSE_DMR_CRE_014(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_CRE_014(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_014_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_014_SUB() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.resource := mw_contentSubscription_rc3;
- f_CSE_DMR_CRE_014(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_CRE_014(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_CRE_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
- var CseTester v_notifyHandler;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
v_request.resultContent := int3;//Attributes + Hierarchichal Address
@@ -3617,344 +4039,405 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute OPTIONAL_ATTRIBUTE provided
*
*/
- testcase TC_CSE_DMR_CRE_015_CNT_ACPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_ACPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs", omit};
v_createRequest.primitiveContent.container.accessControlPolicyIDs := {"NotInitialized"};
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"expirationTime", omit};
v_createRequest.primitiveContent.container.expirationTime := "20301231T012345";
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
v_createRequest.primitiveContent.container.labels := {"MyLabel"};
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_MNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_MNI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"maxNrOfInstances", omit};
v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_MBS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_MBS() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"maxByteSize", omit};
v_createRequest.primitiveContent.container.maxByteSize := 0;
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_MIA() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_MIA() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"maxInstanceAge", omit};
v_createRequest.primitiveContent.container.maxInstanceAge := 0;
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CNT_OR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_CNT_OR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeAux c_optionalAttribute := {"ontologyRef", omit};
v_createRequest.primitiveContent.container.ontologyRef := "MyOntologyRef";
- f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int3, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CIN_ET() runs on CseTester system CseSystem {//TODO
+ testcase TC_CSE_DMR_CRE_015_CIN_ET() runs on Tester system CseSystem {//TODO
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeAux c_optionalAttribute := {"expirationTime", omit};
v_createRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
- f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CIN_LBL() runs on CseTester system CseSystem {//TODO
+ testcase TC_CSE_DMR_CRE_015_CIN_LBL() runs on Tester system CseSystem {//TODO
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
v_createRequest.primitiveContent.contentInstance.labels := {"MyLabel"};
- f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CIN_CR() runs on CseTester system CseSystem {//TODO
+ testcase TC_CSE_DMR_CRE_015_CIN_CR() runs on Tester system CseSystem {//TODO
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeAux c_optionalAttribute := {"creator", omit};
v_createRequest.primitiveContent.contentInstance.creator := "MyCreator";
- f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CIN_CNF() runs on CseTester system CseSystem {//TODO
+ testcase TC_CSE_DMR_CRE_015_CIN_CNF() runs on Tester system CseSystem {//TODO
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeAux c_optionalAttribute := {"contentInfo", omit};
v_createRequest.primitiveContent.contentInstance.contentInfo := "MyContentInfo";
- f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_CIN_OR() runs on CseTester system CseSystem {//TODO
+ testcase TC_CSE_DMR_CRE_015_CIN_OR() runs on Tester system CseSystem {//TODO
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
const AttributeAux c_optionalAttribute := {"ontologyRef", omit};
v_createRequest.primitiveContent.contentInstance.ontologyRef := "MyOntologyRef";
- f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int4, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_ACP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_ACP_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase;
const AttributeAux c_optionalAttribute := {"expirationTime", omit};
v_createRequest.primitiveContent.accessControlPolicy.expirationTime := "20301231T012345";
- f_CSE_DMR_CRE_015(int1, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int1, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
v_createRequest.primitiveContent.accessControlPolicy.labels := {"MyLabel"};
- f_CSE_DMR_CRE_015(int1, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int1, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_ACPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_ACPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"accessControlPolicyIDs", omit};
v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := {"NotInitialized"};
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"expirationTime", omit};
v_createRequest.primitiveContent.subscription.expirationTime := "20301231T012345";
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
v_createRequest.primitiveContent.subscription.labels := {"MyLabel"};
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_ENC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_ENC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"eventNotificationCriteria", omit};
v_createRequest.primitiveContent.subscription.eventNotificationCriteria := valueof(m_eventNotificationCriteria({int1}, -));
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"expirationCounter", omit};
v_createRequest.primitiveContent.subscription.expirationCounter := 1;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_GPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_GPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"groupID", omit};
v_createRequest.primitiveContent.subscription.groupID := "MyGroupID";
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_NFU() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_NFU() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"notificationForwardingURI", omit};
v_createRequest.primitiveContent.subscription.notificationForwardingURI := "MyForwardingURI";
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_BN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_BN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"batchNotify", omit};
v_createRequest.primitiveContent.subscription.batchNotify := {0, "PT1S"};
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
-
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_RL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_RL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"rateLimit", omit};
v_createRequest.primitiveContent.subscription.rateLimit := {0, omit};
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_PSN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_PSN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"preSubscriptionNotify", omit};
v_createRequest.primitiveContent.subscription.preSubscriptionNotify := 1;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_PN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_PN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"pendingNotification", omit};
v_createRequest.primitiveContent.subscription.pendingNotification := int1;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_NSP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_NSP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"notificationStoragePriority", omit};
v_createRequest.primitiveContent.subscription.notificationStoragePriority := 1;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_LN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_LN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"latestNotify", omit};
v_createRequest.primitiveContent.subscription.latestNotify := true;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_NCT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_NCT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"notificationContentType", omit};
v_createRequest.primitiveContent.subscription.notificationContentType := int1;
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_NEC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_NEC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"notificationEventCat", omit};
v_createRequest.primitiveContent.subscription.notificationEventCat := {alt_1 := 100};
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_CR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_CR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"creator", omit};
v_createRequest.primitiveContent.subscription.creator := "MyCreator";
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_015_SUB_SU() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_015_SUB_SU() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
const AttributeAux c_optionalAttribute := {"subscriberURI", omit};
v_createRequest.primitiveContent.subscription.subscriberURI := "MySubscriberURI";
- f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute);
+ v_ae1.start(f_CSE_DMR_CRE_015(int23, v_createRequest, c_optionalAttribute));
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseTester {
+ function f_CSE_DMR_CRE_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -3962,7 +4445,6 @@ module OneM2M_Testcases {
var integer v_containerIndex := -1;
var integer v_parentIndex := -1;
var integer v_acpAuxIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
const XSD.NCName c_accessControlPolicyIDs := "accessControlPolicyIDs";
var integer v_resourceIndex := -1;
@@ -3976,7 +4458,7 @@ module OneM2M_Testcases {
}
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -3987,7 +4469,7 @@ module OneM2M_Testcases {
v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_parentIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
if(p_resourceType == int4) {
@@ -4004,6 +4486,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Accepted creation for resource type " & int2str(enum2int(p_resourceType)) & " containing attribute " & p_optionalAttribute.name);
+ f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_resourceType, v_parentIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK(f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -4023,7 +4506,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
@@ -4048,79 +4531,95 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announceTo provided
*
*/
- testcase TC_CSE_DMR_CRE_016_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createAcpBase;
v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int1, v_createRequest, mw_createAccessControlPolicyAnnc);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_CRE_016(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int3, v_createRequest, mw_createContainerAnncBase);//Container
+ v_ae1.start(f_CSE_DMR_CRE_016(int3, v_createRequest, mw_createContainerAnncBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_CIN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_CIN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int4, v_createRequest, mw_createContentInstanceAnncBase);//ContentInstance
+ v_ae1.start(f_CSE_DMR_CRE_016(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int9, v_createRequest, mw_createGroupAnncBase);//Group
+ v_ae1.start(f_CSE_DMR_CRE_016(int9, v_createRequest, mw_createGroupAnncBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_LCP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_LCP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int10, v_createRequest, mw_createLocationPolicyAnncBase);//LocationPolicy
+ v_ae1.start(f_CSE_DMR_CRE_016(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_MGO() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_MGO() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int13, v_createRequest, mw_createMgmtObjAnncBase);//MgmtObj
+ v_ae1.start(f_CSE_DMR_CRE_016(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_NOD() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_NOD() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createNodeBase;
v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int14, v_createRequest, mw_createNodeAnnc);//Node
+ v_ae1.start(f_CSE_DMR_CRE_016(int14, v_createRequest, mw_createNodeAnnc));//Node
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_016_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_016_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
- f_CSE_DMR_CRE_016(int18, v_createRequest, mw_createScheduleAnncBase);//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_016(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
+ v_ae1.done;
}
- function f_CSE_DMR_CRE_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on CseTester {
+ function f_CSE_DMR_CRE_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -4147,20 +4646,9 @@ module OneM2M_Testcases {
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
mcaPort.send(m_request(v_request));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_request(p_requestAnnc)) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Correct CREATE request for the resource announced variant");
- }
- [] mccPort.receive(mw_request(?)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong CREATE request received");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
- }
- }
+
+ vc_cseSimu.start(f_cse_receiveCreateRequest(p_requestAnnc));
+ vc_cseSimu.done;
// Postamble
f_cse_postamble_deleteResources();
@@ -4178,20 +4666,24 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a RESOURCE_TYPE resource with the optional attribute announcedAttribute provided
*
*/
- testcase TC_CSE_DMR_CRE_017_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var RequestPrimitive v_requestPrimitive;
var XSD.NonNegativeInteger maxByteSize := 512; //Correct value? Shall be indicated in TP?
- v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+ //v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.maxByteSize := maxByteSize;
v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int3, v_createRequest, mw_createContainerAnncBase());//Container
+ v_ae1.start(f_CSE_DMR_CRE_017(int3, v_createRequest, mw_createContainerAnncBase()));//Container
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if maxByteSize attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != maxByteSize){
setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
@@ -4204,20 +4696,24 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_017_CIN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_CIN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var RequestPrimitive v_requestPrimitive;
var XSD.NonNegativeInteger v_contentSize := 512; //Correct value? Shall be indicated in TP?
- v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+ //v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;
v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"contentSize"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int4, v_createRequest, mw_createContentInstanceAnncBase());//ContentInstance
+ v_ae1.start(f_CSE_DMR_CRE_017(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if contentSize attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize)){
if(v_requestPrimitive.primitiveContent.contentInstanceAnnc.contentSize != v_contentSize){
setverdict(fail, __SCOPE__ & ": Error: Value of contentSize has not been announced successfully");
@@ -4230,8 +4726,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_017_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var RequestPrimitive v_requestPrimitive;
var XSD.PositiveInteger maxNrOfMembers := 10; //Correct value? Shall be indicated in TP?
@@ -4240,10 +4737,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int9, v_createRequest, mw_createGroupAnncBase());//Group
+ v_ae1.start(f_CSE_DMR_CRE_017(int9, v_createRequest, mw_createGroupAnncBase()));//Group
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if maxNrOfMembers attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != maxNrOfMembers){
setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
@@ -4256,8 +4755,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_017_LCP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_LCP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
var RequestPrimitive v_requestPrimitive;
var LocationSource locationSource := int1;//Network-based //Correct value? Shall be indicated in TP?
@@ -4266,10 +4766,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int10, v_createRequest, mw_createLocationPolicyAnncBase());//LocationPolicy
+ v_ae1.start(f_CSE_DMR_CRE_017(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if locationSource attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != locationSource){
setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
@@ -4282,8 +4784,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_017_MGO() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_MGO() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
var RequestPrimitive v_requestPrimitive;
var XSD.String description := "Description of mgmtObj"; //Correct value? Shall be indicated in TP?
@@ -4292,10 +4795,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.mgmtResource.description := description;
v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int13, v_createRequest, mw_createMgmtObjAnncBase());//MgmtObj
+ v_ae1.start(f_CSE_DMR_CRE_017(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if description attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.announcedMgmtResource.description)){
if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != description){
setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
@@ -4308,8 +4813,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_CRE_017_NOD() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_NOD() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createNodeBase;
var RequestPrimitive v_requestPrimitive;
@@ -4317,11 +4823,13 @@ module OneM2M_Testcases {
//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
- v_requestPrimitive := f_CSE_DMR_CRE_017(int14, v_createRequest, mw_createNodeAnnc);//Node
+ v_ae1.start(f_CSE_DMR_CRE_017(int14, v_createRequest, mw_createNodeAnnc));//Node
+ v_ae1.done;
}
- testcase TC_CSE_DMR_CRE_017_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_017_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var RequestPrimitive v_requestPrimitive;
var ScheduleEntries scheduleElement := {{"0,0,0 1 2,1,1,*"}};
@@ -4330,10 +4838,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP?
v_createRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"}; //Correct value? Shall be indicated in TP?
- v_requestPrimitive := f_CSE_DMR_CRE_017(int18, v_createRequest, mw_createScheduleAnncBase());//Schedule
+ v_ae1.start(f_CSE_DMR_CRE_017(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//Check if scheduleElement attribute has been announced
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != scheduleElement){
setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
@@ -4346,13 +4856,16 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_CRE_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on CseTester return RequestPrimitive{
+ function f_CSE_DMR_CRE_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu{
// Local variables
var MsgIn v_anncRequest;
var RequestPrimitive v_request;
var integer v_parentIndex := -1;
var integer v_containerIndex := -1;
+ var integer v_remoteCseIndex;
+ var integer v_aeAnncIndex;
+ var integer v_resourceIndex;
// Test control
@@ -4362,7 +4875,17 @@ module OneM2M_Testcases {
// Test adapter configuration
// Preamble
- v_parentIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ if (PX_IUT_IS_MN_CSE == true) {
+ vc_cseSimu.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
+ }else if (PX_IUT_IS_IN_CSE == true) {
+ vc_cseSimu.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
+ }
+ vc_cseSimu.done;
+
+ vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
+ v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
+ vc_cseSimu.done;
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
@@ -4371,30 +4894,20 @@ module OneM2M_Testcases {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
-
+
+ vc_cseSimu.start(f_cse_receiveCreateRequest(p_requestAnnc));
mcaPort.send(m_request(v_request));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_request(p_requestAnnc)) -> value v_anncRequest {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Correct CREATE request for the resource announced variant");
- }
- [] mccPort.receive(mw_request(?)) -> value v_anncRequest {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong CREATE request received");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
- }
- }
-
+ vc_cseSimu.done;
+
+ vc_request.primitive.requestPrimitive := f_getRemoteCseRequestPrimitive(vc_cseSimu);
+
// Postamble
f_cse_postamble_deleteResources();
-
+
// Tear down
f_cf02Down();
- return v_anncRequest.primitive.requestPrimitive;
+ //return v_anncRequest.primitive.requestPrimitive;
}//end f_CSE_DMR_CRE_017
@@ -4406,7 +4919,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize
*
*/
- testcase TC_CSE_DMR_CRE_020() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_020() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -4468,7 +4981,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT updates the currentByteSize attribute in a <container> parent resource when a new <contentInstance> resource is created.
*
*/
- testcase TC_CSE_DMR_CRE_021() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_CRE_021() runs on AeSimu system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest;
var MsgIn v_response;
@@ -4562,84 +5075,98 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_RET_001_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_001(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_001(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_001(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_001(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- v_responsePrimitive := f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_001(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_001(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_001_CIN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_001_CIN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ResponsePrimitive v_responsePrimitive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.contentInstance := mw_contentContentInstance_rc1;
- v_responsePrimitive := f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse);//ContentInstance
+ v_ae1.start(f_CSE_DMR_RET_001(int4, m_createContentInstanceBase, v_contentResponse));//ContentInstance
+ v_ae1.done;
}
- function f_CSE_DMR_RET_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_RET_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
@@ -4647,20 +5174,19 @@ module OneM2M_Testcases {
var integer v_containerIndex := -1;
var integer v_parentIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
if(p_resourceType == int4) { //ContentInstance
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -4715,7 +5241,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve the resource TARGET_RESOURCE_ADDRESS which does not exist
*
*/
- testcase TC_CSE_DMR_RET_002() runs on CseTester system CseSystem{
+ testcase TC_CSE_DMR_RET_002() runs on AeSimu system CseSystem{
// Local variables
var MsgIn v_response;
@@ -4736,9 +5262,9 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
// Test Body
- if((vc_addressingMethod == e_nonHierarchical) and (vc_primitiveScope == e_cseRelative)) {
+ if((PX_ADDRESSING_METHOD == e_nonHierarchical) and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
v_targetResourceAddress := v_resourceId;
- } else if (vc_addressingMethod == e_nonHierarchical) {
+ } else if (PX_ADDRESSING_METHOD == e_nonHierarchical) {
v_targetResourceAddress := f_getResourceAddress() & "/" & v_resourceId;
} else {
v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
@@ -4781,53 +5307,64 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under AE without having privileges for the RETRIEVE operation
*
*/
- testcase TC_CSE_DMR_RET_003_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_003(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_003(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_003(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_003(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
- f_CSE_DMR_RET_003(int1, v_requestPrimitive);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_003(int1, v_requestPrimitive));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_003(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_003(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_003(int15, m_createPollingChannelBase);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_003_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_003(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_003(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
@@ -4837,7 +5374,7 @@ module OneM2M_Testcases {
}
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -4846,7 +5383,7 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});//c_CRUDNDi;
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -4890,87 +5427,98 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To†option)
*
*/
- testcase TC_CSE_DMR_RET_004_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
- f_CSE_DMR_RET_004(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_004(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_004_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
- f_CSE_DMR_RET_004(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_004(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_004_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
- f_CSE_DMR_RET_004(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_004(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_004_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_SCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
- f_CSE_DMR_RET_004(int18, m_createScheduleBase,v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_004(int18, m_createScheduleBase,v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_004_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_PCH() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
v_contentResponse.pollingChannel.parentID := ?;
- f_CSE_DMR_RET_004(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_004(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_004_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_004_SUB() runs on Tester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
- f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_004(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5016,87 +5564,98 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content†option)
*
*/
- testcase TC_CSE_DMR_RET_005_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
- f_CSE_DMR_RET_005(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_005(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_005_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
- f_CSE_DMR_RET_005(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_005(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_005_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
- f_CSE_DMR_RET_005(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_005(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_005_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
- f_CSE_DMR_RET_005(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_005(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_005_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
v_contentResponse.pollingChannel.parentID := ?;
- f_CSE_DMR_RET_005(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_005(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_005_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_005_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
- f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_005(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5142,93 +5701,104 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_RET_006_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
v_contentResponse.container.creationTime := ?;
- f_CSE_DMR_RET_006(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_006(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_006_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
v_contentResponse.group_.creationTime := ?;
- f_CSE_DMR_RET_006(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_006(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_006_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
v_contentResponse.accessControlPolicy.creationTime := ?;
- f_CSE_DMR_RET_006(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_006(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_006_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
v_contentResponse.schedule.creationTime := ?;
- f_CSE_DMR_RET_006(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_006(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_006_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := m_contentPollingChannel_allOmit;
v_contentResponse.pollingChannel.parentID := ?;
v_contentResponse.pollingChannel.creationTime := ?;
- f_CSE_DMR_RET_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_006(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_006_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_006_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
v_contentResponse.subscription.creationTime := ?;
- f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_006(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5275,63 +5845,74 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single†attribute case)
*
*/
- testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_007(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_007(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_007(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_007(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int15, m_createPollingChannelBase);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_007(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_007_SUB_LBL() runs on AeSimu system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_007(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_007(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5373,63 +5954,74 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attributes of the TARGET_RESOURCE_ADDRESS resource (“multiple†attributes case)
*
*/
- testcase TC_CSE_DMR_RET_008_CNT_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_CNT_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_008(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_GRP_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_GRP_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_008(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_ACP_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_ACP_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_008(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_SCH_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_SCH_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_008(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_PCH_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_PCH_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int15, m_createPollingChannelBase);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_008(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_008_SUB_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_008_SUB_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_008(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_008(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
@@ -5471,7 +6063,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the RETRIEVE Request of a latest resource target to a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_RET_009() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_009() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -5526,7 +6118,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the RETRIEVE Request of the oldest contentInstance target to a <container> resource
*
*/
- testcase TC_CSE_DMR_RET_010() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -5595,7 +6187,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the RETRIEVE Request of a oldest resource target to a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_RET_011() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_011() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -5650,7 +6242,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the RETRIEVE Request of the latest contentInstance target to a <container> resource7
*
*/
- testcase TC_CSE_DMR_RET_012() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -5720,90 +6312,107 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the TARGET_RESOURCE_ADDRESS resource under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_013_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
- f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_013(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_AE() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := mw_contentAeBase;
- f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE
+ v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc1;
- f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_013(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc1;
- f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_013(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_CSR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
- f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_013(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc1;
- f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_013(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_013_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_013_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc1;
- f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_013(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -5818,13 +6427,16 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
-
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+
} else { //ResourceType = RemoteCSE
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
@@ -5870,55 +6482,66 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a resource TARGET_RESOURCE_ADDRESS under CSEBase without having privileges for the RETRIEVE operation
*
*/
- testcase TC_CSE_DMR_RET_014_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int61;
- f_CSE_DMR_RET_014(int1, v_requestPrimitive);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_014(int1, v_requestPrimitive));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_014_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_AE() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_014(int2, m_createPollingChannelBase);//AE
+ v_ae1.start(f_CSE_DMR_RET_014(int2, m_createPollingChannelBase));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_014_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_014(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_014(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_014_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_014(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_014(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_014_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_014(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_014(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_014_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_014_SUB() runs on AeSimu system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_014(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_014(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
-
+
// Test control
if(not(PICS_ACP_SUPPORT)) {
log(__SCOPE__ & ":INFO: AccessControlPolicy support is required for executing this test case");
@@ -5926,7 +6549,7 @@ module OneM2M_Testcases {
}
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -5944,13 +6567,16 @@ module OneM2M_Testcases {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
@@ -5992,91 +6618,108 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“To†option) under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_015_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
- f_CSE_DMR_RET_015(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_015(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_AE() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := m_contentAe_allOmit;
v_contentResponse.aE.parentID := ?;
- f_CSE_DMR_RET_015(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE
+ v_ae1.start(f_CSE_DMR_RET_015(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
- f_CSE_DMR_RET_015(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_015(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
- f_CSE_DMR_RET_015(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_015(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_CSR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
v_contentResponse.remoteCSE.parentID := ?;
- f_CSE_DMR_RET_015(int16, m_createRemoteCSEBase, v_contentResponse);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_015(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
- f_CSE_DMR_RET_015(int18, m_createScheduleBase,v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_015(int18, m_createScheduleBase,v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_015_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_015_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
- f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_015(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_015(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -6091,12 +6734,15 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
} else {
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
// Test Body
@@ -6141,91 +6787,108 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully the ATTRIBUTE of TARGET_RESOURCE_ADDRESS resource (“Content†option) under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_016_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
- f_CSE_DMR_RET_016(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_016(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_AE() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := m_contentAe_allOmit;
v_contentResponse.aE.parentID := ?;
- f_CSE_DMR_RET_016(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE
+ v_ae1.start(f_CSE_DMR_RET_016(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
- f_CSE_DMR_RET_016(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_016(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
- f_CSE_DMR_RET_016(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_016(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_CSR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
v_contentResponse.remoteCSE.parentID := ?;
- f_CSE_DMR_RET_016(int16, m_createRemoteCSEBase, v_contentResponse);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_016(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
- f_CSE_DMR_RET_016(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_016(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_016_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_016_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
- f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_016(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_016(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -6240,12 +6903,15 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
@@ -6289,164 +6955,193 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully multiple attributes of TARGET_RESOURCE_ADDRESS resource under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_017_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.parentID := ?;
v_contentResponse.accessControlPolicy.creationTime := ?;
- f_CSE_DMR_RET_017(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_017(int1, m_createAcpBase, v_contentResponse));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_AE() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_AE() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := m_contentAe_allOmit;
v_contentResponse.aE.parentID := ?;
v_contentResponse.aE.creationTime := ?;
- f_CSE_DMR_RET_017(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE
+ v_ae1.start(f_CSE_DMR_RET_017(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := m_contentContainer_allOmit;
v_contentResponse.container.parentID := ?;
v_contentResponse.container.creationTime := ?;
- f_CSE_DMR_RET_017(int3, m_createContainerBase, v_contentResponse);//Container
+ v_ae1.start(f_CSE_DMR_RET_017(int3, m_createContainerBase, v_contentResponse));//Container
+ v_ae1.done;
}
- /*testcase TC_CSE_DMR_RET_017_DLV() runs on CseTester system CseSystem {
+ /*testcase TC_CSE_DMR_RET_017_DLV() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.delivery := m_contentDelivery_allOmit;
v_contentResponse.delivery.parentID := ?;
v_contentResponse.delivery.creationTime := ?;
- f_CSE_DMR_RET_017(int6, m_createDeliveryBase, v_contentResponse);//Delivery
+ v_ae1.start(f_CSE_DMR_RET_017(int6, m_createDeliveryBase, v_contentResponse));//Delivery
+ v_ae1.done;
}*/
- testcase TC_CSE_DMR_RET_017_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := m_contentGroup_allOmit;
v_contentResponse.group_.parentID := ?;
v_contentResponse.group_.creationTime := ?;
- f_CSE_DMR_RET_017(int9, m_createGroupBase, v_contentResponse);//Group
+ v_ae1.start(f_CSE_DMR_RET_017(int9, m_createGroupBase, v_contentResponse));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_LCP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_LCP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.locationPolicy := m_contentLocationPolicy_allOmit;
v_contentResponse.locationPolicy.parentID := ?;
v_contentResponse.locationPolicy.creationTime := ?;
- f_CSE_DMR_RET_017(int10, m_createLocationPolicyBase, v_contentResponse);//LocationPolicy
+ v_ae1.start(f_CSE_DMR_RET_017(int10, m_createLocationPolicyBase, v_contentResponse));//LocationPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_MGC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_MGC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.mgmtCmd := m_contentMgmtCmd_allOmit;
v_contentResponse.mgmtCmd.parentID := ?;
v_contentResponse.mgmtCmd.creationTime := ?;
- f_CSE_DMR_RET_017(int12, m_createMgmtCmdBase, v_contentResponse);//MgmtCmd
+ v_ae1.start(f_CSE_DMR_RET_017(int12, m_createMgmtCmdBase, v_contentResponse));//MgmtCmd
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_NOD() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_NOD() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.node := m_contentNode_allOmit;
v_contentResponse.node.parentID := ?;
v_contentResponse.node.creationTime := ?;
- f_CSE_DMR_RET_017(int14, m_createNodeBase, v_contentResponse);//Node
+ v_ae1.start(f_CSE_DMR_RET_017(int14, m_createNodeBase, v_contentResponse));//Node
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_CSR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_CSR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.remoteCSE := m_contentRemoteCSE_allOmit;
v_contentResponse.remoteCSE.parentID := ?;
v_contentResponse.remoteCSE.creationTime := ?;
- f_CSE_DMR_RET_017(int16, m_createRemoteCSEBase, v_contentResponse);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_017(int16, m_createRemoteCSEBase, v_contentResponse));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := m_contentSchedule_allOmit;
v_contentResponse.schedule.parentID := ?;
v_contentResponse.schedule.creationTime := ?;
- f_CSE_DMR_RET_017(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_017(int18, m_createScheduleBase, v_contentResponse));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_STCL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_STCL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.statsCollect := m_contentStatsCollect_allOmit;
v_contentResponse.statsCollect.parentID := ?;
v_contentResponse.statsCollect.creationTime := ?;
- f_CSE_DMR_RET_017(int21, m_createStatsCollectBase, v_contentResponse);//StatsCollect
+ v_ae1.start(f_CSE_DMR_RET_017(int21, m_createStatsCollectBase, v_contentResponse));//StatsCollect
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_STCG() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_STCG() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.statsConfig := m_contentStatsConfig_allOmit;
v_contentResponse.statsConfig.parentID := ?;
v_contentResponse.statsConfig.creationTime := ?;
- f_CSE_DMR_RET_017(int22, m_createStatsConfigBase, v_contentResponse);//StatsConfig
+ v_ae1.start(f_CSE_DMR_RET_017(int22, m_createStatsConfigBase, v_contentResponse));//StatsConfig
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_017_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_017_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := m_contentSubscription_allOmit;
v_contentResponse.subscription.parentID := ?;
v_contentResponse.subscription.creationTime := ?;
- f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_017(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_RET_017(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -6461,12 +7156,15 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
@@ -6511,63 +7209,80 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“single†attribute case) under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_018(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_AE_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_AE_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID));//AE
+ v_ae1.start(f_CSE_DMR_RET_018(int2, m_createAe(PX_APP_ID)));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_018(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_018(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_CSR_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_018(int16, m_createRemoteCSEBase));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_018(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_018_SUB_LBL() runs on AeSimu system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_018(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_018(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_018(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_018(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ };
// Test adapter configuration
@@ -6582,12 +7297,15 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
@@ -6628,63 +7346,80 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to retrieve a non-existing attribute of the TARGET_RESOURCE_ADDRESS resource (“multiple†attributes case) under CSEBase
*
*/
- testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_ACP_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_019(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_AE_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID));//AE
+ v_ae1.start(f_CSE_DMR_RET_019(int2, m_createAe(PX_APP_ID)));//AE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_CNT_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_019(int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_GRP_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_019(int9, m_createGroupBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_CSR_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase);//RemoteCSE
+ v_ae1.start(f_CSE_DMR_RET_019(int16, m_createRemoteCSEBase));//RemoteCSE
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_SCH_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_019(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_019_SUB_LBL_AT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_RET_019(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_019(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_019(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -6699,12 +7434,15 @@ module OneM2M_Testcases {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
- v_resourceIndex := f_cse_registerRemoteCse(p_requestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
@@ -6745,22 +7483,28 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects a RETRIEVE Request target to TARGET_RESOURCE_ADDRESS resource when the Result Content set to RESULT_CONTENT
*
*/
- testcase TC_CSE_DMR_RET_020_RCN_0() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_020_RCN_0() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_RET_020(int3, m_createContainerBase, int0);//ResultContent = 0 (nothing)
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int0));//ResultContent = 0 (nothing)
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_020_RCN_2() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_020_RCN_2() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_RET_020(int3, m_createContainerBase, int2);//ResultContent = 2 (hierarchical address)
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int2));//ResultContent = 2 (hierarchical address)
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_020_RCN_3() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_020_RCN_3() runs on Tester system CseSystem {
// Local variables
- f_CSE_DMR_RET_020(int3, m_createContainerBase, int3);//ResultContent = 3 (attributes and hierarchichal address)
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ v_ae1.start(f_CSE_DMR_RET_020(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
+ v_ae1.done;
}
- function f_CSE_DMR_RET_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on CseTester {
+ function f_CSE_DMR_RET_020(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, ResultContent p_resultContent) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -6819,66 +7563,77 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully only attributes of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 1 (attributes)
*
*/
- testcase TC_CSE_DMR_RET_021_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc1;
- f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_021(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_021_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc1;
- f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_021(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_021_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
- f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_021(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_021_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc1;
- f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_021(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_021_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_021(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_021_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_021_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc1;
- f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_021(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_021(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -6887,7 +7642,7 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -6896,9 +7651,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -6952,66 +7707,77 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully a list all discovered resource addresses
*
*/
- testcase TC_CSE_DMR_RET_022_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc4;
- f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_022_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc4;
- f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_022_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
- f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_022_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc4;
- f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_022(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_022_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_022_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_022_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc4;
- f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_022(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7020,7 +7786,7 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -7029,9 +7795,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7084,66 +7850,77 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully only attributes and child resource references of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 5 (attributes and child resource references)
*
*/
- testcase TC_CSE_DMR_RET_023_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc5;
- f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_023_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc5;
- f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_023_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
- f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_023_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc5;
- f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_023(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_023_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_023_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_023_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc5;
- f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7152,7 +7929,7 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -7161,9 +7938,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7217,66 +7994,77 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully only child resource references of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 6 (child resource references)
*
*/
- testcase TC_CSE_DMR_RET_024_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc6;
- f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_024_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc6;
- f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_024_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
- f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_024_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc6;
- f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_024(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_024_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_024(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_024_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_024_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc6;
- f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_024(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_024(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7285,7 +8073,7 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -7294,9 +8082,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7349,66 +8137,77 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully only child resources of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 8 (child resources)
*
*/
- testcase TC_CSE_DMR_RET_025_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainer_rc8;
- f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_025_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.group_ := mw_contentGroup_rc8;
- f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_025_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
- f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_025_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.schedule := mw_contentSchedule_rc8;
- f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_RET_025(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_025_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
- f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
+ v_ae1.start(f_CSE_DMR_RET_025(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_RET_025_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_RET_025_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.subscription := mw_contentSubscription_rc8;
- f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_RET_025(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_RET_025(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -7417,7 +8216,7 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -7426,9 +8225,9 @@ module OneM2M_Testcases {
if(isvalue(p_childResourceType)) {
if(valueof(p_childResourceType) == int23) {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_childRequestPrimitive, valueof(p_childResourceType));
} else {
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, valueof(p_resourceType));
}
}
@@ -7484,8 +8283,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT updates successfully the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_001_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2:= {"VALUE_2"};
var ResponsePrimitive v_responsePrimitive;
@@ -7496,9 +8296,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.labels := v_labels_1;
v_updateRequest.primitiveContent.container.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Container
+ v_ae1.start(f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7507,17 +8310,21 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
if(v_primitiveContentRetrieveResource.container.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_001_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createGroupBase;
@@ -7528,9 +8335,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.group_.labels := v_labels_1;
v_updateRequest.primitiveContent.group_.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Group
+ v_ae1.start(f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest));//Group
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7539,17 +8349,21 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_001_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -7560,9 +8374,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//ACP
+ v_ae1.start(f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest));//ACP
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7571,18 +8388,21 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
if(v_primitiveContentRetrieveResource.accessControlPolicy.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
+ }
}
- }
-
+ }
}
- testcase TC_CSE_DMR_UPD_001_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createScheduleBase;
@@ -7593,9 +8413,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.schedule.labels := v_labels_1;
v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int18, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
+ v_ae1.start(f_CSE_DMR_UPD_001(int18, v_createRequest, v_updateRequest));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
@@ -7604,18 +8427,22 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
+ }
}
- }
+ }
}
- testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
@@ -7626,9 +8453,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
+ v_ae1.start(f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest));//PollingChannel
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -7637,17 +8467,21 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_001_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_001_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -7658,9 +8492,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.labels := v_labels_1;
v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_001(int23, v_createRequest, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_001(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7669,37 +8506,39 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(v_primitiveContentRetrieveResource.subscription.labels != v_labels_2){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
+ }
}
- }
+ }
}
- function f_CSE_DMR_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive{
+ function f_CSE_DMR_UPD_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu return ResponsePrimitive{
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -7709,15 +8548,15 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -7726,10 +8565,10 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Used to check that the resource has been updated
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -7737,7 +8576,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_UPD_001
@@ -7749,8 +8588,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT adds successfully the attribute ATTRIBUTE_NAME to the TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_002_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7758,9 +8598,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
+ v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7769,18 +8612,21 @@ module OneM2M_Testcases {
}
}
}
-
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
- if(ischosen(v_primitiveContentRetrieveResource.container)) {
+ if(ischosen(v_primitiveContentRetrieveResource.container)) {
if(v_primitiveContentRetrieveResource.container.labels != v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_002_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7788,9 +8634,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
+ v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7799,18 +8648,21 @@ module OneM2M_Testcases {
}
}
}
-
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.labels != v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_002_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7818,9 +8670,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7829,18 +8684,21 @@ module OneM2M_Testcases {
}
}
}
+
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
if(v_primitiveContentRetrieveResource.accessControlPolicy.labels != v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_002_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7848,9 +8706,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
+ v_ae1.start(f_CSE_DMR_UPD_002(int18, m_createScheduleBase,v_updateRequest));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
@@ -7860,17 +8721,20 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7878,9 +8742,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
+ v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -7890,17 +8757,20 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_1){
- setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+ }
+ }
}
}
- testcase TC_CSE_DMR_UPD_002_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_002_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
@@ -7908,9 +8778,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
- v_responsePrimitive := f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7920,36 +8793,37 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(v_primitiveContentRetrieveResource.subscription.labels != v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
- }
- }
+ }
+ }
}
}
- function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -7959,15 +8833,15 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -7977,7 +8851,7 @@ module OneM2M_Testcases {
}
//Used to check that the resource has been updated
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -7985,7 +8859,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_UPD_002
@@ -7997,8 +8871,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT deletes successfully the attribute ATTRIBUTE_NAME from the TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_003_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8012,9 +8887,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
+ v_ae1.start(f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -8026,19 +8904,22 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
if(ispresent(v_primitiveContentRetrieveResource.container.labels)) {
if(not(match(v_primitiveContentRetrieveResource.container.labels,{""}))){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
- testcase TC_CSE_DMR_UPD_003_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8052,9 +8933,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
+ v_ae1.start(f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -8064,19 +8948,22 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(ispresent(v_primitiveContentRetrieveResource.group_.labels)) {
if(not(match(v_primitiveContentRetrieveResource.group_.labels,{""}))){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
- }
- }
+ }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_003_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8090,9 +8977,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -8102,6 +8992,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.labels)) {
@@ -8113,8 +9005,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_003_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8128,9 +9021,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
+ v_ae1.start(f_CSE_DMR_UPD_003(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
@@ -8140,6 +9036,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) {
@@ -8151,8 +9049,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8166,9 +9065,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
+ v_ae1.start(f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -8178,19 +9080,22 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(ispresent(v_primitiveContentRetrieveResource.pollingChannel.labels)) {
if(not(match(v_primitiveContentRetrieveResource.pollingChannel.labels,{""}))){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
- }
- }
+ }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_003_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_003_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8204,9 +9109,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -8216,6 +9124,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(ispresent(v_primitiveContentRetrieveResource.subscription.labels)) {
@@ -8227,27 +9137,26 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -8259,15 +9168,15 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request, p_nullFields));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -8276,7 +9185,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -8284,7 +9193,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_UPD_003
@@ -8296,8 +9205,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT updates the value of the attribute ATTRIBUTE_NAME_1, and creates the ATTRIBUTE_NAME_2 and deletes the ATTRIBUTE_NAME_3 of the TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -8313,9 +9223,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
+ v_ae1.start(f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
//Check attribute 1
@@ -8333,6 +9246,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
//Check attribute 1
@@ -8351,8 +9266,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_groupName_1 := "VALUE_1";
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
@@ -8370,9 +9286,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
+ v_ae1.start(f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
//Check attribute 1
@@ -8390,16 +9309,18 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
//Check attribute 1
if(v_primitiveContentRetrieveResource.group_.groupName != valueof(v_updateRequest.primitiveContent.group_.groupName)){
setverdict(fail, __SCOPE__ & ": Error: groupName attribute not updated correctly")
- }
+ }
//Check attribute 2
if(v_primitiveContentRetrieveResource.group_.expirationTime != valueof(v_updateRequest.primitiveContent.group_.expirationTime)){
setverdict(fail, __SCOPE__ & ": Error: expirationTime attribute not updated correctly")
- }
+ }
//Check attribute 3
if(ispresent(v_primitiveContentRetrieveResource.group_.labels)){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
@@ -8408,8 +9329,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var SetOfAcrs v_privileges_2 := {accessControlRule_list := {valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
@@ -8426,9 +9348,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
//Check attribute 1
@@ -8446,6 +9371,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
//Check attribute 1
@@ -8464,8 +9391,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"To be deleted"};
var AttributeAux_list v_nullFields;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
@@ -8480,9 +9408,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
+ v_ae1.start(f_CSE_DMR_UPD_004(int18, v_createRequest, v_updateRequest, v_nullFields));//Schedule
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
//Check attribute 1
@@ -8500,6 +9431,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
//Check attribute 1
@@ -8518,8 +9451,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_004_PCH_LBL_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_PCH_LBL_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
var AttributeAux_list v_nullFields;
@@ -8535,9 +9469,12 @@ module OneM2M_Testcases {
v_nullFields := {{"labels", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
+ v_ae1.start(f_CSE_DMR_UPD_004(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
//Check attribute 1
@@ -8553,6 +9490,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(ispresent (v_primitiveContentRetrieveResource.pollingChannel.labels)){
@@ -8562,8 +9501,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var AttributeAux_list v_nullFields;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -8578,9 +9518,12 @@ module OneM2M_Testcases {
v_nullFields := {{"expirationCounter", omit}};
- v_responsePrimitive := f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
+ v_ae1.done;
- if(getverdict == pass){
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
//Check attribute 1
@@ -8598,6 +9541,8 @@ module OneM2M_Testcases {
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
//Check attribute 1
@@ -8616,27 +9561,26 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -8646,15 +9590,15 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request, p_nullFields));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -8663,7 +9607,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -8671,7 +9615,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- return v_response.primitive.responsePrimitive;
+ return vc_response.primitive.responsePrimitive;
}//end f_CSE_DMR_UPD_004
@@ -8683,8 +9627,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to update an attribute of a TARGET_RESOURCE_ADDRESS resource which does not exist
*
*/
- testcase TC_CSE_DMR_UPD_005_CNT_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_CNT_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -8693,11 +9638,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int3, v_createRequest, v_updateRequest);//Container
+ v_ae1.start(f_CSE_DMR_UPD_005(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_005_GRP_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_GRP_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -8706,11 +9653,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int9, v_createRequest, v_updateRequest);//Group
+ v_ae1.start(f_CSE_DMR_UPD_005(int9, v_createRequest, v_updateRequest));//Group
+ v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_005_ACP_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_ACP_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -8719,11 +9668,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int1, v_createRequest, v_updateRequest);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_UPD_005(int1, v_createRequest, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_005_SCH_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_SCH_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
@@ -8732,11 +9683,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int18, v_createRequest, v_updateRequest);//Schedule
+ v_ae1.start(f_CSE_DMR_UPD_005(int18, v_createRequest, v_updateRequest));//Schedule
+ v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_005_PCH_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_PCH_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter := 1;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
@@ -8745,11 +9698,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int15, v_createRequest, v_updateRequest);//PollingChannel
+ v_ae1.start(f_CSE_DMR_UPD_005(int15, v_createRequest, v_updateRequest));//PollingChannel
+ v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_005_SUB_MNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_SUB_MNI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -8758,15 +9713,15 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
- f_CSE_DMR_UPD_005(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_005(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
}
- function f_CSE_DMR_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
var integer v_ae2Index := -1;
var integer v_resourceIndex := -1;
@@ -8774,14 +9729,14 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive , v_aeIndex);
@@ -8824,46 +9779,55 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to update the attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource without having privileges for the UPDATE operation
*
*/
- testcase TC_CSE_DMR_UPD_006_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.container)) {
if(v_primitiveContentRetrieveResource.container.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
@@ -8873,75 +9837,91 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
if(v_primitiveContentRetrieveResource.accessControlPolicy.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest));//Schedule
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_006_PCH_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_PCH_LBL() runs on Tester system CseSystem {
// Local variable
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(v_primitiveContentRetrieveResource.pollingChannel.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
- f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(v_primitiveContentRetrieveResource.subscription.labels == v_labels_1){
setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
+ }
}
}
}
- function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
+ function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -8949,7 +9929,6 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
@@ -8959,7 +9938,7 @@ module OneM2M_Testcases {
}
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -8968,7 +9947,7 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -8995,7 +9974,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -9014,8 +9993,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to update a non-RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9023,19 +10003,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.container_update_invalid)) {
if(v_primitiveContentRetrieveResource.container_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9043,19 +10027,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_update_invalid)) {
if(v_primitiveContentRetrieveResource.group_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9063,19 +10051,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.aCP_update_invalid)) {
if(v_primitiveContentRetrieveResource.aCP_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9083,19 +10075,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest, v_primitiveContentRetrieveResource);//Schedule
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9103,19 +10099,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest, v_primitiveContentRetrieveResource);//PollingChannel
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -9123,38 +10123,40 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
- f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription_update_invalid)) {
if(v_primitiveContentRetrieveResource.subscription_update_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
- }
+ }
}
}
}
- function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
+ function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -9181,7 +10183,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -9199,8 +10201,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_008_CNT_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_CNT_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var AttributeAux_list v_nullFields;
@@ -9210,19 +10213,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields));//Container
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.container)) {
if(v_primitiveContentRetrieveResource.container.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var AttributeAux_list v_nullFields;
@@ -9232,19 +10239,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields));//Group
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var AttributeAux_list v_nullFields;
@@ -9254,19 +10265,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields));//AccessControlPolicy
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
if(v_primitiveContentRetrieveResource.accessControlPolicy.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var AttributeAux_list v_nullFields;
@@ -9276,19 +10291,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Schedule
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields));//Schedule
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
if(v_primitiveContentRetrieveResource.schedule.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var AttributeAux_list v_nullFields;
@@ -9298,19 +10317,23 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//PollingChannel
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields));//PollingChannel
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
if(v_primitiveContentRetrieveResource.pollingChannel.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var AttributeAux_list v_nullFields;
@@ -9320,38 +10343,40 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
- f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields));//Subscription
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(v_primitiveContentRetrieveResource.subscription.expirationTime == v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
+ }
}
}
}
- function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
+ function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -9378,7 +10403,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
// Postamble
f_cse_postamble_deleteResources();
@@ -9396,7 +10421,7 @@ module OneM2M_Testcases {
* @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
*
*/
- testcase TC_CSE_DMR_UPD_010() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -9465,7 +10490,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWEDâ€
*
*/
- testcase TC_CSE_DMR_UPD_011() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -9516,7 +10541,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
@@ -9541,7 +10566,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWEDâ€
*
*/
- testcase TC_CSE_DMR_UPD_012() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -9594,7 +10619,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
@@ -9619,7 +10644,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the UPDATE Request of an oldest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWEDâ€
*
*/
- testcase TC_CSE_DMR_UPD_013() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -9672,7 +10697,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
@@ -9696,8 +10721,9 @@ module OneM2M_Testcases {
* @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource.
*
*/
- testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
var Timestamp v_expirationTime_2 := "20401020T012345";
var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -9707,9 +10733,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_1;
v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest);//ACP
-
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -9722,8 +10751,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -9733,9 +10763,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest);//ACP
+ v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -9748,8 +10781,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_ACP_PV() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_ACP_PV() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_privileges_1;
var SetOfAcrs v_privileges_2;
var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -9762,9 +10796,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest);//ACP
+ v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -9777,8 +10814,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_ACP_PVS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_ACP_PVS() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_selfPrivileges_1;
var SetOfAcrs v_selfPrivileges_2;
var template RequestPrimitive v_createRequest := m_createAcpBase;
@@ -9791,9 +10829,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges_1;
v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest);//ACP
+ v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -9806,8 +10847,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_CNT_ACPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_ACPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
var ResponsePrimitive v_responsePrimitive;
@@ -9818,10 +10860,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9833,8 +10877,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
var Timestamp v_expirationTime_2 := "20401020T012345";
var ResponsePrimitive v_responsePrimitive;
@@ -9845,10 +10890,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.expirationTime := v_expirationTime_1;
v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9860,8 +10907,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var ResponsePrimitive v_responsePrimitive;
@@ -9872,10 +10920,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.labels := v_labels_1;
v_updateRequest.primitiveContent.container.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9887,8 +10937,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_MBS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_MBS() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
var ResponsePrimitive v_responsePrimitive;
@@ -9899,10 +10950,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9914,8 +10967,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_MIA() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_MIA() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
var ResponsePrimitive v_responsePrimitive;
@@ -9926,10 +10980,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_1;
v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9941,8 +10997,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_MNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_MNI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
var ResponsePrimitive v_responsePrimitive;
@@ -9953,10 +11010,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_1;
v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
-
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9968,8 +11027,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
var ResponsePrimitive v_responsePrimitive;
@@ -9980,10 +11040,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.container.ontologyRef := v_ontologyRef_1;
v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest);//Container
-
+ v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -9995,8 +11057,9 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10006,9 +11069,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10021,8 +11087,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var BatchNotify v_batchNotify_1 := {1, "PT1S"};
var BatchNotify v_batchNotify_2 := {2, "PT1S"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10032,9 +11099,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.batchNotify := v_batchNotify_1;
v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10047,8 +11117,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
var EventNotificationCriteria v_eventNotificationCriteria_2 := valueof(m_eventNotificationCriteria({int2}, -));
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10058,9 +11129,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_1;
v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10073,8 +11147,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
var Timestamp v_expirationTime_2 := "20401020T012345";
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10084,9 +11159,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.expirationTime := v_expirationTime_1;
v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10099,8 +11177,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter_1 := 10;
var XSD.PositiveInteger v_expirationCounter_2 := 20;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10110,9 +11189,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_1;
v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10125,8 +11207,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
var XSD.AnyURI v_groupID_2 := "MyGroupID_2";
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10136,9 +11219,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.groupID := v_groupID_1;
v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10151,8 +11237,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_LBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10162,9 +11249,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.labels := v_labels_1;
v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10177,8 +11267,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_latestNotify_1 := true;
var XSD.Boolean v_latestNotify_2 := false;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10188,9 +11279,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.latestNotify := v_latestNotify_1;
v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10203,8 +11297,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var NotificationContentType v_notificationContentType_1 := int1;
var NotificationContentType v_notificationContentType_2 := int2;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10214,9 +11309,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_1;
v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10229,8 +11327,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventCat v_notificationEventCat_1 := {alt_1 := 100};
var EventCat v_notificationEventCat_2 := {alt_1 := 101};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10240,9 +11339,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_1;
v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10255,8 +11357,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
var XSD.AnyURI v_notificationForwardingURI_2 := "MyForwardingURI_2";
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10266,9 +11369,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_1;
v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10281,8 +11387,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
var XSD.PositiveInteger v_notificationStoragePriority_2 := 2;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10292,9 +11399,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_1;
v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10307,8 +11417,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PendingNotification v_pendingNotification_1 := int1;
var PendingNotification v_pendingNotification_2 := int2;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10318,9 +11429,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_1;
v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10333,8 +11447,9 @@ module OneM2M_Testcases {
}
- testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RateLimit v_rateLimit_1 := {0, omit};
var RateLimit v_rateLimit_2 := {1, omit};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
@@ -10344,9 +11459,12 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.subscription.rateLimit := v_rateLimit_1;
v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
- v_responsePrimitive := f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest);//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
- if(getverdict == pass){
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10359,27 +11477,26 @@ module OneM2M_Testcases {
}
- function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester return ResponsePrimitive{
+ function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -10389,11 +11506,11 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -10407,9 +11524,7 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
-
- return v_response.primitive.responsePrimitive;
-
+
}//end f_CSE_DMR_UPD_014
} // end g_CSE_DMR_UPD_014
@@ -10419,17 +11534,21 @@ module OneM2M_Testcases {
/**
* @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
*/
- testcase TC_CSE_DMR_UPD_017_CSR_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
- var Labels v_labels := {"MyLabel"};
+ testcase TC_CSE_DMR_UPD_017_CSR_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Remote CSE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -10438,6 +11557,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.remoteCSE)) {
@@ -10448,17 +11568,21 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CSR_POA() runs on CseTester system CseSystem {
- var AcpType v_acpType;
- var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
+ testcase TC_CSE_DMR_UPD_017_CSR_POA() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Remote CSE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -10467,6 +11591,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.remoteCSE)) {
@@ -10477,17 +11602,21 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CSR_NL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
- var XSD.AnyURI v_nodeLink := "MyNodeId";
- var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- var ResponsePrimitive v_responsePrimitive;
- var PrimitiveContent v_primitiveContentRetrieveResource;
+ testcase TC_CSE_DMR_UPD_017_CSR_NL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var XSD.AnyURI v_nodeLink := "MyNodeId";
+ var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
+ var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Remote CSE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -10496,6 +11625,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.remoteCSE)) {
@@ -10506,8 +11636,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_NOD_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_NOD_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10515,8 +11645,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.node.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Node
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest));//Node
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
@@ -10525,6 +11659,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.node)) {
@@ -10535,41 +11670,49 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_NOD_ACPI() runs on CseTester system CseSystem {
- var AcpType v_acpType := {"NotInitialized"};
+ testcase TC_CSE_DMR_UPD_017_NOD_ACPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.node.accessControlPolicyIDs := v_acpType;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType, true);//Node
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, true));//Node
+ v_ae1.done;
+
+
+
if(getverdict == pass){
+ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
- if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.node)) {
- if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_primitiveContentRetrieveResource.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
}
}
}
}
- testcase TC_CSE_DMR_UPD_017_NOD_HCL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_017_NOD_HCL() runs on Tester system CseSystem {
/* TO BE DONE */
}
- testcase TC_CSE_DMR_UPD_017_AE_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_AE_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
@@ -10577,8 +11720,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.aE.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -10587,6 +11734,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
@@ -10597,44 +11745,54 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_AE_ACPI() runs on CseTester system CseSystem {
- var AcpType v_acpType := {"NotInitialized"};
+ testcase TC_CSE_DMR_UPD_017_AE_ACPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAE;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := v_acpType;
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, true));//AE
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource, v_acpType, true);//AE
- if(getverdict == pass){
+
+
+ if(getverdict == pass){
+ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
- if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_responsePrimitive.primitiveContent.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access control policy IDs attribute not updated correctly")
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has been udpated correctly
+ //Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
- if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_primitiveContentRetrieveResource.aE.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Access control policy IDs attribute not updated correctly")
}
}
}
}
- testcase TC_CSE_DMR_UPD_017_AE_APN() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_AE_APN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_appName := "MyAppName";
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.appName := v_appName;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -10643,6 +11801,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
@@ -10653,16 +11812,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_AE_POA() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_AE_POA() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -10671,6 +11834,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
@@ -10681,16 +11845,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_AE_OR() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_AE_OR() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -10699,6 +11867,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
@@ -10709,8 +11878,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10718,8 +11887,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10728,6 +11901,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10738,36 +11912,42 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_ACPI() runs on CseTester system CseSystem {
- var AcpType v_acpType := {"NotInitialized"};
+ testcase TC_CSE_DMR_UPD_017_CNT_ACPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_acpType;
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, true));//Container
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType, true);//Container
+
+
if(getverdict == pass){
+ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
- if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
- if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_primitiveContentRetrieveResource.container.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_MNI() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_MNI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10775,8 +11955,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10785,6 +11969,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10795,8 +11980,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_MBS() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_MBS() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxByteSize := 512;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10804,8 +11989,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10814,6 +12003,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10824,8 +12014,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_MIA() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_MIA() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxInstanceAge := 1;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10833,8 +12023,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10843,6 +12037,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10853,8 +12048,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_OR() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_OR() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10862,8 +12057,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10872,6 +12071,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10882,8 +12082,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_CNT_LI() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_CNT_LI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_locationID := "MyLocationID";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10891,8 +12091,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.locationID := v_locationID;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -10901,6 +12105,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -10911,8 +12116,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_ACP_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_ACP_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
@@ -10920,8 +12125,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -10930,6 +12139,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -10940,44 +12150,54 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_ACPI() runs on CseTester system CseSystem {
- var AcpType v_acpType := {"NotInitialized"};
+ testcase TC_CSE_DMR_UPD_017_SUB_ACPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_acpType;
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType, true);//Subscription
- if(getverdict == pass){
- //Check attribute 1
+
+
+ if(getverdict == pass){
+ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
+ //Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
- if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
- if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_primitiveContentRetrieveResource.subscription.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -10986,6 +12206,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -10996,16 +12217,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_ENC() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_ENC() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -));
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11014,6 +12239,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11024,16 +12250,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_EXC() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_EXC() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter:=10;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11042,6 +12272,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11052,16 +12283,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_GPI() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_GPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_groupID := "MyGroupID";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.groupID:=v_groupID;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11070,6 +12305,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11080,16 +12316,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_NFU() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_NFU() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11098,6 +12338,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11108,16 +12349,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_BN() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_BN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var BatchNotify v_batchNotify:= {1, "PT1S"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11126,6 +12371,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11136,16 +12382,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_RL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_RL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RateLimit v_rateLimit:= {2, "PT1S"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11154,6 +12404,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11164,16 +12415,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_PN() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_PN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PendingNotification v_pendingNotification:=int2;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11182,6 +12437,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11192,16 +12448,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_NSP() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_NSP() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_notificationStoragePriority:=10;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11210,6 +12470,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11220,16 +12481,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_LN() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_LN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_latestNotify:=true;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11238,6 +12503,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11248,16 +12514,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_SUB_NEC() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_SUB_NEC() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventCat v_eventCat:= {alt_1:= 300};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11266,6 +12536,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11276,16 +12547,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_GRP_LBL() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_GRP_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.labels := v_labels;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11294,6 +12569,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -11304,43 +12580,54 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_017_GRP_ACPI() runs on CseTester system CseSystem {
- var AcpType v_acpType := {"NotInitialized"};
+ testcase TC_CSE_DMR_UPD_017_GRP_ACPI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.group_.accessControlPolicyIDs := v_acpType;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType, true);//Group
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, true));//Group
+ v_ae1.done;
+
+
+
if(getverdict == pass){
+ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
- if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_responsePrimitive.primitiveContent.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has been udpated correctly
+ //Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_acpType)){
+ if(v_primitiveContentRetrieveResource.group_.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy IDs attribute not updated correctly")
}
}
}
}
- testcase TC_CSE_DMR_UPD_017_GRP_MACP() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_GRP_MACP() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11349,26 +12636,31 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has been udpated correctly
- if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+ //Check that the resource has been udpated correctly
+ if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
- }
+ }
}
}
}
- testcase TC_CSE_DMR_UPD_017_GRP_GN() runs on CseTester system CseSystem {
- var AcpType v_acpType;
+ testcase TC_CSE_DMR_UPD_017_GRP_GN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_groupName:="MyGroupName";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.groupName := v_groupName;
- v_responsePrimitive := f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource, v_acpType);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11377,6 +12669,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -11387,13 +12680,12 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource, out AcpType p_acpi, boolean p_secondAcp := false) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, boolean p_secondAcp := false) runs on AeSimu {
//Local variables
var MsgIn v_response;
- var RequestPrimitive v_request;
+ var AcpType v_acpi;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
var integer v_acpIndex := -1;
@@ -11401,7 +12693,11 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -11418,36 +12714,39 @@ module OneM2M_Testcases {
if(p_secondAcp) {//A second ACP is required
v_acpIndex := f_cse_createResource(int1, m_createAcpBase);
- p_acpi := {vc_resourcesList[v_acpIndex].resource.accessControlPolicy.resourceID};
+ v_acpi := {vc_resourcesList[v_acpIndex].resource.accessControlPolicy.resourceID};
- p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive, p_acpi);
+ p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive, v_acpi);
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
- v_resourceIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
//Test Body
- v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
+ vc_request.primitive.requestPrimitive := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- mcaPort.send(m_request(v_request)); //CSEBase
+ mcaPort.send(m_request(vc_request.primitive.requestPrimitive)); //CSEBase
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Error while updating optional attribute");
}
@@ -11456,7 +12755,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
//Postamble
f_cse_postamble_deleteResources();
@@ -11464,7 +12763,6 @@ module OneM2M_Testcases {
// Tear down
f_cf02Down();
- return v_response.primitive.responsePrimitive;
} // end function f_CSE_DMR_UPD_017
} // end group g_CSE_DMR_UPD_017
@@ -11474,7 +12772,8 @@ module OneM2M_Testcases {
/**
* @desc Check that the IUT updates successfully the value of the attribute MANDATORY_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
*/
- testcase TC_CSE_DMR_UPD_018_CSR_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_CSR_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11482,10 +12781,13 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
+ v_ae1.start(f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
+ v_ae1.done;
- if(getverdict == pass){
- //Check attribute 1
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ //Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
if(v_responsePrimitive.primitiveContent.remoteCSE.expirationTime != v_expirationTime){
@@ -11493,6 +12795,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.remoteCSE)) {
@@ -11503,16 +12806,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_CSR_RR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_CSR_RR() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_requestReachability := true;
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
+ v_ae1.done;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest, v_primitiveContentRetrieveResource);//Remote CSE
- if(getverdict == pass){
+
+
+ v_ae1.start(f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -11521,6 +12828,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.remoteCSE)) {
@@ -11531,7 +12839,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_NOD_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_NOD_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11539,8 +12848,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest));//Node
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
@@ -11549,6 +12862,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.node)) {
@@ -11559,7 +12873,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_NOD_NI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_NOD_NI() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
var XSD.Token v_targetId := "TARGET-ID";
var ResponsePrimitive v_responsePrimitive;
@@ -11567,8 +12882,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.node.nodeID := v_targetId;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest, v_primitiveContentRetrieveResource);//Node
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest));//Node
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
@@ -11577,6 +12896,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.node)) {
@@ -11587,7 +12907,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_AE_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_AE_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
@@ -11595,8 +12916,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -11605,7 +12930,8 @@ module OneM2M_Testcases {
}
}
}
-
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
if(v_primitiveContentRetrieveResource.aE.expirationTime != v_expirationTime){
@@ -11615,7 +12941,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_AE_RR() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_AE_RR() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_requestReachability := true;
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
@@ -11623,8 +12950,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest, v_primitiveContentRetrieveResource);//AE
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -11633,6 +12964,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.aE)) {
@@ -11643,7 +12975,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_CNT_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_CNT_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11651,8 +12984,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int3, m_createContainerBase, v_updateRequest, v_primitiveContentRetrieveResource);//Container
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int3, m_createContainerBase, v_updateRequest));//Container
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -11661,6 +12998,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -11671,7 +13009,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_ACP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_ACP_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11679,8 +13018,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -11689,6 +13032,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -11699,15 +13043,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_ACP_PV() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_ACP_PV() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -11716,6 +13065,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -11726,15 +13076,20 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_ACP_PVS() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_ACP_PVS() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest, v_primitiveContentRetrieveResource);//AccessControlPolicy
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -11743,6 +13098,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -11753,7 +13109,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_SUB_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_SUB_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11761,8 +13118,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11772,7 +13133,9 @@ module OneM2M_Testcases {
}
}
- //Check that the resource has been udpated correctly
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
+ //Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
if(v_primitiveContentRetrieveResource.subscription.expirationTime != v_expirationTime){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
@@ -11781,7 +13144,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_SUB_NU() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_SUB_NU() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11789,8 +13153,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11799,6 +13167,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11809,7 +13178,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_SUB_NCT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_SUB_NCT() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var NotificationContentType v_notificationContentType := int2;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11817,8 +13187,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest, v_primitiveContentRetrieveResource);//Subscription
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -11827,6 +13201,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -11837,7 +13212,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_GRP_ET() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_GRP_ET() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11845,8 +13221,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11855,6 +13235,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -11865,7 +13246,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_GRP_MNM() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_GRP_MNM() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_maxNrOfMembers := 10;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11873,8 +13255,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11883,7 +13269,8 @@ module OneM2M_Testcases {
}
}
}
-
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
if(v_primitiveContentRetrieveResource.group_.maxNrOfMembers != v_maxNrOfMembers){
@@ -11893,7 +13280,8 @@ module OneM2M_Testcases {
}
}
- testcase TC_CSE_DMR_UPD_018_GRP_MID() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_018_GRP_MID() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_memberIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11901,8 +13289,12 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
- v_responsePrimitive := f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest, v_primitiveContentRetrieveResource);//Group
- if(getverdict == pass){
+ v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group
+ v_ae1.done;
+
+
+
+ if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -11911,6 +13303,7 @@ module OneM2M_Testcases {
}
}
}
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -11921,20 +13314,23 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive {
+ function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var integer v_acpAuxIndex := -1;
// Test control
// Test component configuration
- f_cf02Up();
+ if (p_resourceType!=int16){ //ResourceType != RemoteCSE
+ f_cf01Up(true);
+ } else {
+ f_cf02Up();
+ }
// Test adapter configuration
@@ -11950,11 +13346,14 @@ module OneM2M_Testcases {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
- v_resourceIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
+ vc_cseSimu.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
+ vc_cseSimu.done;
+
+ v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
}
//Test Body
@@ -11963,15 +13362,15 @@ module OneM2M_Testcases {
mcaPort.send(m_request(v_request)); //CSEBase
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__, ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfully");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
}
@@ -11980,7 +13379,7 @@ module OneM2M_Testcases {
}
}
- p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+ vc_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
//Postamble
f_cse_postamble_deleteResources();
@@ -11988,7 +13387,6 @@ module OneM2M_Testcases {
// Tear down
f_cf02Down();
- return v_response.primitive.responsePrimitive;
} //end function f_CSE_DMR_UPD_018
} // end group g_CSE_DMR_UPD_018
@@ -12003,53 +13401,67 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the deletion of a RESOURCE_TYPE resource
*
*/
- testcase TC_CSE_DMR_DEL_001_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_DEL_001(int3, m_createContainerBase));//Container
+ v_ae1.done;
- if(getverdict == pass){
+ if(getverdict == pass){
//check if "MyRessource" container resource isn't present in the IUT (for exemple attempt to update the resource)
};
};
- testcase TC_CSE_DMR_DEL_001_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_DEL_001(int9, m_createGroupBase));//Group
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_001_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_DEL_001(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_001_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_DEL_001(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_001_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase);//PollingChannel
+ v_ae1.start(f_CSE_DMR_DEL_001(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_001_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_DEL_001(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_001_CIN() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_001_CIN() runs on AeSimu system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_001(int4, m_createContentInstanceBase);//ContentInstance
+ v_ae1.start(f_CSE_DMR_DEL_001(int4, m_createContentInstanceBase));//ContentInstance
+ v_ae1.done;
};
- function f_CSE_DMR_DEL_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_DEL_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12057,20 +13469,19 @@ module OneM2M_Testcases {
var integer v_parentIndex := -1;
var integer v_containerIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi)
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
@@ -12104,7 +13515,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if (f_isResourceNotPresent(v_aeIndex, f_getResourceName(vc_resourcesList[v_resourceIndex].resource))){
@@ -12129,44 +13540,56 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS without having privileges for the DELETE operation
*
*/
- testcase TC_CSE_DMR_DEL_002_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_DEL_002(int3, m_createContainerBase));//Container
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int9, m_createGroupBase);//Group
+ v_ae1.start(f_CSE_DMR_DEL_002(int9, m_createGroupBase));//Group
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int1, m_createAcpBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_DEL_002(int1, m_createAcpBase));//AccessControlPolicy
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int18, m_createScheduleBase);//Schedule
+ v_ae1.start(f_CSE_DMR_DEL_002(int18, m_createScheduleBase));//Schedule
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_PCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase);//PollingChannel
+ v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_002_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase);//Subscription
+ v_ae1.start(f_CSE_DMR_DEL_002(int23, m_createSubscriptionBase));//Subscription
+ v_ae1.done;
};
- function f_CSE_DMR_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_DEL_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12174,7 +13597,6 @@ module OneM2M_Testcases {
var integer v_acpAuxIndex := -1;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
var AccessControlRule v_accessControlRule_1 := valueof(m_createAcr({PX_SUPER_AE_ID}, int63));
var AccessControlRule v_accessControlRule_2;
@@ -12187,7 +13609,7 @@ module OneM2M_Testcases {
}
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -12195,7 +13617,7 @@ module OneM2M_Testcases {
v_acpAuxIndex := f_cse_preamble_createAcpAux(-,-);//c_CRDNDi);
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}, -);//c_CRUNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
//Update ACP Aux to remove DELETE operation rights to AE, keeping rights of SUPER USER to run postamble
v_accessControlRule_2 := valueof(m_createAcr({f_getResourceId(vc_resourcesList[v_aeIndex].resource)}, int55));
@@ -12239,7 +13661,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check if the resource has been deleted or not
if(f_isResourcePresent(v_resourceIndex)) {
@@ -12266,7 +13688,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS which does not exist
*
*/
- testcase TC_CSE_DMR_DEL_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -12285,7 +13707,7 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
// Test Body
- if(vc_addressingMethod == e_nonHierarchical and (vc_primitiveScope == e_cseRelative)) {
+ if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
v_request := valueof(m_delete(v_resourceIdOrName, f_getOriginator(v_aeIndex)));
} else {
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName, f_getOriginator(v_aeIndex)));
@@ -12326,63 +13748,73 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when AE tries to delete a child resource of a RESOURCE_TYPE resource when this resource has been already deleted
*
*/
- testcase TC_CSE_DMR_DEL_004_CNT() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_CNT() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase);//Container
+ v_ae1.start(f_CSE_DMR_DEL_004(int3, m_createContainerBase, int3, m_createContainerBase));//Container
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_004_GRP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_GRP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase);//Group
+ v_ae1.start(f_CSE_DMR_DEL_004(int9, m_createGroupBase, int23, m_createSubscriptionBase));//Group
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_004_ACP() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_ACP() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase);//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_DEL_004(int1, m_createAcpBase, int23, m_createSubscriptionBase));//AccessControlPolicy
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_004_SCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_SCH() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase);//Schedule
+ v_ae1.start(f_CSE_DMR_DEL_004(int18, m_createScheduleBase, int23, m_createSubscriptionBase));//Schedule
+ v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_004_PCH() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_PCH() runs on Tester system CseSystem {
// Local variables
// don't exist pollingChannel's child resource
- //f_CSE_DMR_DEL_004(int15, m_createPollingChannelBase, int23, m_createSubscriptionBase);//PollingChannel TODO ResourceType needed is PollingChannelURI
+ //v_ae1.start(f_CSE_DMR_DEL_004(int15, m_createPollingChannelBase, int23, m_createSubscriptionBase);//PollingChannel TODO ResourceType needed is PollingChannelURI
+// v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_004_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_004_SUB() runs on Tester system CseSystem {
// Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase);//Subscription
+ v_ae1.start(f_CSE_DMR_DEL_004(int23, m_createSubscriptionBase, int18, m_createScheduleBase));//Subscription
+ v_ae1.done;
};
- function f_CSE_DMR_DEL_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_createRequestPrimitiveChildResource) runs on CseTester {
+ function f_CSE_DMR_DEL_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_createRequestPrimitiveChildResource) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
@@ -12427,7 +13859,7 @@ module OneM2M_Testcases {
* @desc Check that the stateTag attribute of a container resource is increased when a child resource is deleted
*
*/
- testcase TC_CSE_DMR_DEL_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12455,7 +13887,6 @@ module OneM2M_Testcases {
// Test Body
mcaPort.send(m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
- mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -12519,7 +13950,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT decreases the field value of attribute currentNrOfInstances and currentByteSize of parent container when a latest contentInstance resource is deleted successfully
*
*/
- testcase TC_CSE_DMR_DEL_006() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -12544,7 +13975,7 @@ module OneM2M_Testcases {
if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
}
// Test Body
@@ -12554,7 +13985,7 @@ module OneM2M_Testcases {
if(not(ispresent(v_attributesContainer.container.currentNrOfInstances))) {
setverdict(fail, __SCOPE__ & ": Error the currentNrOfInstances attribute is empty");
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
}
if((v_attributesContainer.container.currentNrOfInstances > v_attributesContainer_afterDeletion.container.currentNrOfInstances) and
@@ -12579,7 +14010,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the DELETE Request of the latest contentInstance resource target to a container resource
*
*/
- testcase TC_CSE_DMR_DEL_007() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12627,7 +14058,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
@@ -12661,7 +14092,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the DELETE request of a latest resource in a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_DEL_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_008() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12719,7 +14150,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the DELETE Request of the oldest contentInstance resource target to a container resource
*
*/
- testcase TC_CSE_DMR_DEL_009() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12767,7 +14198,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
@@ -12801,7 +14232,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the DELETE request of a oldest resource in a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_DEL_010() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_DEL_010() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -12860,7 +14291,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_001{
- testcase TC_CSE_LOC_BV_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_LOC_BV_001() runs on AeSimu system CseSystem {
var integer v_aeIndex := -1;
var RequestPrimitive v_request;
@@ -12898,7 +14329,7 @@ module OneM2M_Testcases {
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -12918,7 +14349,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_002{
- testcase TC_CSE_LOC_BV_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_LOC_BV_002() runs on AeSimu system CseSystem {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
@@ -12945,6 +14376,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+ f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -12960,7 +14392,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
@@ -12982,7 +14414,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BO_003{
- testcase TC_CSE_LOC_BO_003() runs on CseTester system CseSystem {//the originator has no privileges to create a locationPolicy resource!!
+ testcase TC_CSE_LOC_BO_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;
@@ -13031,7 +14463,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -13052,7 +14484,7 @@ module OneM2M_Testcases {
}//end group g_CSE_LOC_BO_003
group g_CSE_LOC_BO_004{
- testcase TC_CSE_LOC_BO_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_LOC_BO_004() runs on AeSimu system CseSystem {
var integer v_aeIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
@@ -13092,7 +14524,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -13113,7 +14545,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BI_005{
- testcase TC_CSE_LOC_BI_005() runs on CseTester system CseSystem {//reject an invalid update request with invalid attribtue locationUpdatePeriod
+ testcase TC_CSE_LOC_BI_005() runs on AeSimu system CseSystem {//reject an invalid update request with invalid attribtue locationUpdatePeriod
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
@@ -13159,7 +14591,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//TODO: Check to see if the resource has been updated or not
@@ -13175,7 +14607,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_006 {
- testcase TC_CSE_LOC_BV_006() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_006() runs on AeSimu system CseSystem{
//TO RETRIEVE a <container> resource that has created in cse and linked with a <locationPolicy> resource (network-based case)
var integer v_aeAuxIndex := -1;
@@ -13227,7 +14659,7 @@ module OneM2M_Testcases {
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
// Postamble
f_cse_postamble_deleteResources();
@@ -13241,7 +14673,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_007 {
- testcase TC_CSE_LOC_BV_007() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_007() runs on AeSimu system CseSystem{
//TO create a <locationPolicy> resource with locationSource set to Device-based
var integer v_aeAuxIndex := -1;
@@ -13268,6 +14700,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+ f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -13283,7 +14716,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
@@ -13305,7 +14738,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_008 {
- testcase TC_CSE_LOC_BV_008() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_008() runs on AeSimu system CseSystem{
//TO create a <locationPolicy> resource with locationSource set to Share-based
var integer v_aeAuxIndex := -1;
@@ -13332,6 +14765,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+ f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -13347,7 +14781,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_resourceIndex)) {
@@ -13369,7 +14803,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_009 {
- testcase TC_CSE_LOC_BV_009_01() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_01() runs on AeSimu system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -13433,7 +14867,7 @@ module OneM2M_Testcases {
}//end testcase TC_CSE_LOC_BV_009_01
- testcase TC_CSE_LOC_BV_009_02() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_02() runs on AeSimu system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -13496,7 +14930,7 @@ module OneM2M_Testcases {
}//end testcase TC_CSE_LOC_BV_009_02
- testcase TC_CSE_LOC_BV_009_03() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_03() runs on AeSimu system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -13560,20 +14994,20 @@ module OneM2M_Testcases {
}//end group g_CSE_LOC_BV_009
/*group g_CSE_LOC_BV_007 {
- testcase TC_CSE_LOC_BV_007() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_007() runs on AeSimu system CseSystem{
//TODO
}//end testcase TC_CSE_LOC_BV_007
}//end group g_CSE_LOC_BV_007
group g_CSE_LOC_BV_008 {
- testcase TC_CSE_LOC_BV_008() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_008() runs on AeSimu system CseSystem{
//TODO
}//end testcase TC_CSE_LOC_BV_008
}//end group g_CSE_LOC_BV_008
*/
group g_CSE_LOC_BV_012 {
- testcase TC_CSE_LOC_BV_012() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_012() runs on AeSimu system CseSystem{
//To CREATE a <subscription> resource as a child resource of the created <container>
var integer v_aeAuxIndex := -1;
@@ -13633,7 +15067,7 @@ module OneM2M_Testcases {
group g_CSE_LOC_BV_013 {
- testcase TC_CSE_LOC_BV_013() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_013() runs on AeSimu system CseSystem{
//TO RETRIEVE a <locationPolicy> resource that has created in cse
var integer v_aeAuxIndex := -1;
@@ -13703,7 +15137,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the group resource when member ID exceed max number of members.
*
*/
- testcase TC_CSE_GMG_CRE_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_001() runs on AeSimu system CseSystem {
// Local constants
const XSD.NonNegativeInteger c_maxNrOfMembers := 1;
@@ -13714,7 +15148,9 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var ListOfURIs v_memberIDs;
var template RequestPrimitive v_createRequest;
-
+ var template RequestPrimitive v_createContainerRequest_1 := m_createContainer_noResourceName;
+ var template RequestPrimitive v_createContainerRequest_2 := m_createContainer_noResourceName;
+
// Test control
// Test component configuration
@@ -13725,8 +15161,8 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_containerIndex_1 := f_cse_createResource(int3, v_createContainerRequest_1, v_aeIndex); // AE child resource
+ v_containerIndex_2 := f_cse_createResource(int3, v_createContainerRequest_2, v_aeIndex); // AE child resource
v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
@@ -13756,7 +15192,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -13778,7 +15214,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the group resource when the memberType cannot be retrieved due to lack of privilege.
*
*/
- testcase TC_CSE_GMG_CRE_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -13832,7 +15268,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -13852,7 +15288,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT detects the presence of duplicate member IDs during the creation of the <group> resource and removes the duplicate member IDs prior to creation of the <group> resource.
*
*/
- testcase TC_CSE_GMG_CRE_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -13909,7 +15345,7 @@ module OneM2M_Testcases {
/**
* @desc Check that the IUT validates the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’.
*/
- testcase TC_CSE_GMG_CRE_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_004() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -13966,7 +15402,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
*
*/
- testcase TC_CSE_GMG_CRE_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_005() runs on AeSimu system CseSystem {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -14034,7 +15470,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER,.
*
*/
- testcase TC_CSE_GMG_CRE_006() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_006() runs on AeSimu system CseSystem {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -14106,7 +15542,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
*
*/
- testcase TC_CSE_GMG_CRE_007() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_CRE_007() runs on AeSimu system CseSystem {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -14158,213 +15594,6 @@ module OneM2M_Testcases {
f_cf01Down();
}
-
- group g_CSE_GMG_CRE_008 {
-
- /**
- * @desc Check that IUT generates a request primitive for each resource in memberIDs with no relative address appended to it.
- *
- */
- testcase TC_CSE_GMG_CRE_008_CRE() runs on CseTester system CseSystem { //Create
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc1;
-
- f_CSE_GMG_CRE_008(m_createContainerBase, v_contentResponse, int2001);
- }//end TC_CSE_GMG_CRE_008_CRE
-
- testcase TC_CSE_GMG_CRE_008_UPD() runs on CseTester system CseSystem { //Update
- var template RequestPrimitive v_updateRequest := m_updateAeBase;
- var template PrimitiveContent v_contentResponse;
- var Labels v_labels_1:= {"VALUE_1"};
- v_contentResponse.aE := m_contentAe_allOmit;
- v_contentResponse.aE.labels := ?;
- v_updateRequest.primitiveContent.aE.labels := v_labels_1;
-
- f_CSE_GMG_CRE_008(v_updateRequest, v_contentResponse, int2004);
- }//end TC_CSE_GMG_CRE_008_UPD
-
- testcase TC_CSE_GMG_CRE_008_RET() runs on CseTester system CseSystem { //Retrieve
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.aE := mw_contentAeBase;
-
- f_CSE_GMG_CRE_008(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000);
- }//end TC_CSE_GMG_CRE_008_RET
-
- testcase TC_CSE_GMG_CRE_008_DEL() runs on CseTester system CseSystem { //Delete
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.aE := mw_contentAeBase;// TODO see with wath should it be matched
-
- f_CSE_GMG_CRE_008(m_delete("Temporary", "Temporary"), v_contentResponse, int2002);
- }//end TC_CSE_GMG_CRE_008_DEL
-
- function f_CSE_GMG_CRE_008(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
- //Local constants
- const integer c_numberOfResponsePrimitive := 2;
-
- // Local variables
- var MsgIn v_response;
- var integer v_aeIndex := -1;
- var integer v_containerIndex_1 := -1;
- var integer v_containerIndex_2 := -1;
- var integer v_groupIndex := -1;
- var ListOfURIs v_memberIDs;
- var integer i;
-
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, -), v_aeIndex); // AE child resource
-
- p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
- p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
-
- // Test Body
-
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
-
- if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
- setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
- }
- else{
- if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
- setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
- }
- else{
- for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
- if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){
- setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
- }
- }
- }
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- } // end f_CSE_GMG_CRE_008
-
- } // end group g_CSE_GMG_CRE_008
-
-
- /**
- * @desc Check that IUT generates a request primitive for each resource in memberIDs with a relative address appended to it.
- *
- */
- testcase TC_CSE_GMG_CRE_009() runs on CseTester system CseSystem {
- //Local constants
- const integer c_numberOfResponsePrimitive := 2;
-
- // Local variables
- var MsgIn v_response;
- var integer v_aeIndex_1, v_aeIndex_2, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex := -1;
- var integer i;
- var ListOfURIs v_memberIDs;
- var ListOfURIs v_membersAcpIds;
- var RequestPrimitive v_createRequest := valueof(m_createContentInstance("NotInitialized", "Value1"));
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
- var template PrimitiveContent v_contentResponse;
-
- v_contentResponse.contentInstance := mw_contentContentInstanceBase;
-
- // Test control
- if(not(PICS_ACP_SUPPORT)) {
- setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
- stop;
- }
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
- v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_1); // AE1 child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_2); // AE2 child resource
- v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
- v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersAcpIds, -), -);
-
- v_createRequest.to_ := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName;
- v_createRequest.from_ := f_getOriginator(v_groupIndex); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
-
- // Test Body
-
- mcaPort.send(m_request(v_createRequest));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
-
- if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
- setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
- }
- else{
- if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
- setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
- }
- else{
- for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
- if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
- setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
- }
- }
- }
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- } // end TC_CSE_GMG_CRE_009
} // end group Create
@@ -14374,21 +15603,22 @@ module OneM2M_Testcases {
* @desc Check that the IUT generates a request primitive for each resource in memberIDs with a relative address appended to fanOutPoint that includes a virtual resource.
*
*/
- testcase TC_CSE_GMG_RET_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_RET_001() runs on AeSimu system CseSystem {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
// Local variables
var MsgIn v_response;
- var integer v_aeIndex_1, v_aeIndex_2, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex, v_contentInstanceIndex_1, v_contentInstanceIndex_2 := -1;
+ var integer v_aeIndex_1, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex, v_contentInstanceIndex_1, v_contentInstanceIndex_2 := -1;
var integer i;
var ListOfURIs v_memberIDs;
var ListOfURIs v_membersAcpIds;
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
+ var RequestPrimitive v_containerRequestPrimitive := m_createContainer_noResourceName;
- v_contentResponse.container := mw_contentContainerBase;
+ v_contentResponse.contentInstance := mw_contentContentInstanceBase;
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -14403,17 +15633,17 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_1); // AE1 child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_2); // AE2 child resource
+ v_containerRequestPrimitive := f_setAcpId(v_containerRequestPrimitive, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)});
+ v_containerIndex_1 := f_cse_createResource(int3, v_containerRequestPrimitive, v_aeIndex_1); // AE1 child resource
+ v_containerIndex_2 := f_cse_createResource(int3, v_containerRequestPrimitive, v_aeIndex_1); // AE2 child resource
v_contentInstanceIndex_1 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex_1); // Container_1 child resource
v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex_2); // Container_2 child resource
- v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
+ v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersAcpIds), -1);
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), -1);
- v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName & "/" & c_resourceShortNameLatest;
+ v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest;
// Test Body
mcaPort.send(m_request(m_retrieveResource(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
@@ -14468,7 +15698,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the update of the group resource when the memberType cannot be retrieved due to lack of privilege.
*
*/
- testcase TC_CSE_GMG_UPD_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -14495,11 +15725,12 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
- v_containerCreateRequest.primitiveContent.container.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_containerIndex_2 := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource
v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource)}, omit, int3, -, - , -), v_aeIndex);
+ v_containerCreateRequest := f_setAcpId(v_containerCreateRequest, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)});
+ v_containerIndex_2 := f_cse_createResource(int3, v_containerCreateRequest, v_aeIndex); // AE child resource
+
v_updateRequest.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
v_request := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest); // creating group
@@ -14537,7 +15768,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT detects the presence of duplicate member IDs during an update of the <group> resource and removes the duplicate member IDs prior to updating the <group> resource.
*
*/
- testcase TC_CSE_GMG_UPD_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -14602,7 +15833,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.group_)){
if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_2){
setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not updated");
@@ -14621,7 +15852,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT validates the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’.
*
*/
- testcase TC_CSE_GMG_UPD_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -14678,7 +15909,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.group_)){
if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not updated");
@@ -14697,7 +15928,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
*
*/
- testcase TC_CSE_GMG_UPD_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_004() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -14718,7 +15949,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
- v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
v_subGroupIndex := f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
@@ -14740,8 +15971,8 @@ module OneM2M_Testcases {
setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not provided");
}
else {
- if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != false) {
- setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be FALSE");
+ if(v_response.primitive.responsePrimitive.primitiveContent.group_.memberTypeValidated != true) {
+ setverdict(fail, __SCOPE__, ": Error, memberTypeValidated must be TRUE");
}
}
@@ -14770,7 +16001,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.group_)){
if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not updated");
@@ -14793,7 +16024,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER.
*
*/
- testcase TC_CSE_GMG_UPD_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -14814,7 +16045,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
- v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
v_subGroupIndex := f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
@@ -14869,7 +16100,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.group_)){
if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not updated");
@@ -14892,7 +16123,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
*
*/
- testcase TC_CSE_GMG_UPD_006() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_006() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -14912,7 +16143,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi
- v_containerIndex := f_cse_createResource(int3, m_createContainer("NotInitialized", "MyContainer"), v_aeIndex);
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
v_subGroupIndex := f_cse_createResource(int9, m_createGroupBase, v_aeIndex);
v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex].resource);
v_memberId_2 := f_getResourceId(vc_resourcesList[v_subGroupIndex].resource);
@@ -14953,7 +16184,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT detects when the number of memberIDs exceeds the limitation of maxNrOfMembers.
*
*/
- testcase TC_CSE_GMG_UPD_007() runs on CseTester system CseSystem
+ testcase TC_CSE_GMG_UPD_007() runs on AeSimu system CseSystem
{
//Local constants
const integer c_maxNrOfMembers := 2;
@@ -15015,7 +16246,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrievedResource.group_)) {
if(v_primitiveContentRetrievedResource.group_.memberIDs == v_memberIDs){
@@ -15035,7 +16266,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT detects when the value provided for maxNrOfMembers attribute is less than the value of the currentNrOfMembers attribute.
*
*/
- testcase TC_CSE_GMG_UPD_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_GMG_UPD_008() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -15087,7 +16318,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrievedResource.group_)) {
if(v_primitiveContentRetrievedResource.group_.maxNrOfMembers == v_maxNrOfMembers){
@@ -15107,7 +16338,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles validation of the resource type during an UPDATE of the <group> resource when memberIDs contains a sub-group on a temporarily unreachable Hosting CSE.
*
*/
- testcase TC_CSE_GMG_UPD_009() runs on CseTester system CseSystem
+ testcase TC_CSE_GMG_UPD_009() runs on AeSimu system CseSystem
{
//Local constants
const integer c_maxNrOfMembers := 2;
@@ -15187,7 +16418,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.group_)){
if(v_primitiveContentRetrievedResource.group_.memberTypeValidated != false){
setverdict(fail, __SCOPE__, ": Error, memberTypeValidated attribute not updated");
@@ -15210,7 +16441,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT handles validation of the resource type during an UPDATE of the group resource when memberIDs contains a sub-group on a a previously unreachable Hosting CSE that has become reachable
* @verdict
*/
- testcase TC_CSE_GMG_UPD_010() runs on CseTester system CseSystem
+ testcase TC_CSE_GMG_UPD_010() runs on AeSimu system CseSystem
{
//Local constants
const ResourceType c_ResourceTypeGroup := int9;
@@ -15232,12 +16463,10 @@ module OneM2M_Testcases {
var XSD.AnyURI v_memberId_1;
var XSD.AnyURI v_memberId_2;
- var CseTester v_notifyHandler;
-
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -15256,7 +16485,7 @@ module OneM2M_Testcases {
v_subscriptionIndex := f_cse_createResource(int23,m_createSubscriptionBase, v_groupIndex);
- v_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_aeIndex));
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
//Test Body
v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
@@ -15301,26 +16530,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT allows a <group>/fanoutPoint OPERATION when the Originator has OPERATION_PERMISSION specified in membersAccessControlPolicyIDs attribute in the group resource.
*
*/
- testcase TC_CSE_GMG_001_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_GMG_001(m_createContainerBase, int2001);
+ testcase TC_CSE_GMG_001_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_001(m_createContainerBase, int2001));
+ v_ae1.done;
}//end TC_CSE_GMG_001_CRE
- testcase TC_CSE_GMG_001_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_GMG_001_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_GMG_001(v_updateRequest, int2004);
+
+ v_ae1.start(f_CSE_GMG_001(v_updateRequest, int2004));
+ v_ae1.done;
}//end TC_CSE_GMG_001_UPD
- testcase TC_CSE_GMG_001_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_GMG_001(m_retrieveResource("Temporary", "Temporary"), int2000);
+ testcase TC_CSE_GMG_001_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_001(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
}//end TC_CSE_GMG_001_RET
- testcase TC_CSE_GMG_001_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_GMG_001(m_delete("Temporary", "Temporary"), int2002);
+ testcase TC_CSE_GMG_001_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_001(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
}//end TC_CSE_GMG_001_DEL
- function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
+ function f_CSE_GMG_001(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -15355,7 +16596,8 @@ module OneM2M_Testcases {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
-
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+
// Test Body
mcaPort.send(m_request(valueof(p_requestPrimitive)));
@@ -15405,26 +16647,38 @@ module OneM2M_Testcases {
* @desc Check that IUT denies a <group>/fanOutPoint OPERATION when the Originator does not have OPERATION_PERMISSION specified in membersAccessControlPolicyIDs in the group resource.
*
*/
- testcase TC_CSE_GMG_002_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_GMG_002(m_createContainerBase, int62); //c_RUDNDi
+ testcase TC_CSE_GMG_002_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_002(m_createContainerBase, int62)); //c_RUDNDi
+ v_ae1.done;
}//end TC_CSE_GMG_002_CRE
- testcase TC_CSE_GMG_002_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_GMG_002_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_GMG_002(v_updateRequest, int59);//c_CRDNDi
+
+ v_ae1.start(f_CSE_GMG_002(v_updateRequest, int59));//c_CRDNDi
+ v_ae1.done;
}//end TC_CSE_GMG_002_UPD
- testcase TC_CSE_GMG_002_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_GMG_002(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
+ testcase TC_CSE_GMG_002_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_002(m_retrieveResource("Temporary", "Temporary"), int61));//c_CUDNDi
+ v_ae1.done;
}//end TC_CSE_GMG_002_RET
- testcase TC_CSE_GMG_002_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_GMG_002(m_delete("Temporary", "Temporary"), int55); //c_CRUNDi
+ testcase TC_CSE_GMG_002_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_002(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi
+ v_ae1.done;
}//end TC_CSE_GMG_002_DEL
- function f_CSE_GMG_002(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
+ function f_CSE_GMG_002(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -15446,18 +16700,241 @@ module OneM2M_Testcases {
f_cf01Up();
// Test adapter configuration
-
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+ v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
+ v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+ v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
+
+ p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
+ p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+
+ // Test Body
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Update failed due to lack of privilege");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while executing operation");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ } // end f_CSE_GMG_002
+
+ } // end group g_CSE_GMG_002
+
+ group g_CSE_GMG_003 {
+
+ /**
+ * @desc Check that the IUT allows a <group>/fanoutPoint OPERATION when the Originator has OPERATION_PERMISSION specified in accessControlPolicyIDs and the membersAccessControlPolicyIDs is empty in the <group> resource.
+ * @verdict
+ */
+ testcase TC_CSE_GMG_003_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_003(m_createContainerBase, int2001));
+ v_ae1.done;
+ }//end TC_CSE_GMG_003_CRE
+
+ testcase TC_CSE_GMG_003_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.container.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_GMG_003(v_updateRequest, int2004));
+ v_ae1.done;
+ }//end TC_CSE_GMG_003_UPD
+
+ testcase TC_CSE_GMG_003_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_003(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
+ }//end TC_CSE_GMG_003_RET
+
+ testcase TC_CSE_GMG_003_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_003(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
+ }//end TC_CSE_GMG_003_DEL
+
+ function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var integer v_containerIndex_1 := -1;
+ var integer v_containerIndex_2 := -1;
+ var integer v_groupIndex := -1;
+ var integer i;
+ var ListOfURIs v_memberIDs;
+ var ListOfURIs v_membersAcpIds;
+ var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+
+ // Test control
+ if(not(PICS_ACP_SUPPORT)) {
+ setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
+ stop;
+ }
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+ v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
+ v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
+ v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
+
+ p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
+ p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
+
+ // Test Body
+
+ mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
+
+ if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
+ setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+ }
+ else {
+ for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
+ if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
+ setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+ }
+ }
+ }
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while creating resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ } // end f_CSE_GMG_003
+
+ } // end group g_CSE_GMG_003
+
+ group g_CSE_GMG_004 {
+
+ /**
+ * @desc Check that IUT rejects a <group>/fanOutPoint OPERATION when the Originator does not have OPERATION_PERMISSION specified in accessControlPolicyIDs and the membersAccessControlPolicyIDs is empty in the group resource.
+ *
+ */
+ testcase TC_CSE_GMG_004_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_004(m_createContainerBase, int62)); //c_RUDNDi
+ v_ae1.done;
+ }//end TC_CSE_GMG_004_CRE
+
+ testcase TC_CSE_GMG_004_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ v_updateRequest.primitiveContent.container.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_GMG_004(v_updateRequest, int59));//c_CRDNDi
+ v_ae1.done;
+ }//end TC_CSE_GMG_004_UPD
+
+ testcase TC_CSE_GMG_004_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_004(m_retrieveResource("Temporary", "Temporary"), int61));//c_CUDNDi
+ v_ae1.done;
+ }//end TC_CSE_GMG_004_RET
+
+ testcase TC_CSE_GMG_004_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_004(m_delete("Temporary", "Temporary"), int55)); //c_CRUNDi
+ v_ae1.done;
+ }//end TC_CSE_GMG_004_DEL
+
+ function f_CSE_GMG_004(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on AeSimu {
+ // Local variables
+ var MsgIn v_response;
+ var integer v_aeIndex := -1;
+ var integer v_acpIndex := -1;
+ var integer v_containerIndex_1 := -1;
+ var integer v_containerIndex_2 := -1;
+ var integer v_groupIndex := -1;
+ var ListOfURIs v_memberIDs;
+ var AcpType v_acpIDs;
+ var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, p_accessControlOperations);
+
+ // Test control
+ if(not(PICS_ACP_SUPPORT)) {
+ setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
+ stop;
+ }
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
- v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
+ v_acpIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, v_acpIDs, int3), v_aeIndex); // AE child resource
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
// Test Body
@@ -15480,60 +16957,79 @@ module OneM2M_Testcases {
setverdict(fail, __SCOPE__ & ": No answer while executing operation");
}
}
-
+
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
- } // end f_CSE_GMG_002
+ } // end f_CSE_GMG_004
- } // end group g_CSE_GMG_002
-
- group g_CSE_GMG_003 {
+ } // end group g_CSE_GMG_004
+
+ group g_CSE_GMG_005 {
/**
- * @desc Check that the IUT allows a <group>/fanoutPoint OPERATION when the Originator has OPERATION_PERMISSION specified in accessControlPolicyIDs and the membersAccessControlPolicyIDs is empty in the <group> resource.
- * @verdict
+ * @desc Check that IUT generates a request primitive for each resource in memberIDs with no relative address appended to it.
+ *
*/
- testcase TC_CSE_GMG_003_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_GMG_003(m_createContainerBase, int2001);
- }//end TC_CSE_GMG_003_CRE
+ testcase TC_CSE_GMG_005_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainer_rc1;
+
+ v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
+ v_ae1.done;
+ }//end TC_CSE_GMG_005_CRE
- testcase TC_CSE_GMG_003_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_GMG_005_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var template PrimitiveContent v_contentResponse;
var Labels v_labels_1:= {"VALUE_1"};
+ v_contentResponse.container := mw_contentContainerBase;
+ v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_GMG_003(v_updateRequest, int2004);
- }//end TC_CSE_GMG_003_UPD
+
+ v_ae1.start(f_CSE_GMG_005(v_updateRequest, v_contentResponse, int2004));
+ v_ae1.done;
+ }//end TC_CSE_GMG_005_UPD
- testcase TC_CSE_GMG_003_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_GMG_003(m_retrieveResource("Temporary", "Temporary"), int2000);
- }//end TC_CSE_GMG_003_RET
+ testcase TC_CSE_GMG_005_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainerBase;
+
+ v_ae1.start(f_CSE_GMG_005(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.done;
+ }//end TC_CSE_GMG_005_RET
- testcase TC_CSE_GMG_003_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_GMG_003(m_delete("Temporary", "Temporary"), int2002);
- }//end TC_CSE_GMG_003_DEL
+ testcase TC_CSE_GMG_005_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
+
+ v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
+ v_ae1.done;
+ }//end TC_CSE_GMG_005_DEL
- function f_CSE_GMG_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
- // Local variables
+ function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+ //Local constants
+ const integer c_numberOfResponsePrimitive := 2;
+
+ // Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
- var integer v_acpIndex := -1;
var integer v_containerIndex_1 := -1;
var integer v_containerIndex_2 := -1;
var integer v_groupIndex := -1;
- var integer i;
var ListOfURIs v_memberIDs;
- var ListOfURIs v_membersAcpIds;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var integer i;
+ var template RequestPrimitive v_createContainerRequest_1 := m_createContainer_noResourceName;
+ var template RequestPrimitive v_createContainerRequest_2 := m_createContainer_noResourceName;
// Test control
- if(not(PICS_ACP_SUPPORT)) {
- setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
- stop;
- }
// Test component configuration
f_cf01Up();
@@ -15542,15 +17038,14 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
+ v_containerIndex_1 := f_cse_createResource(int3, v_createContainerRequest_1, v_aeIndex); // AE child resource
+ v_containerIndex_2 := f_cse_createResource(int3, v_createContainerRequest_2, v_aeIndex); // AE child resource
v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
- v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, v_membersAcpIds), v_aeIndex); // AE child resource
-
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int3, -, -), v_aeIndex); // AE child resource
+
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
- p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
+ p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
// Test Body
@@ -15560,17 +17055,22 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
-
+
if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
}
- else {
- for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
- if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
- setverdict(fail, __SCOPE__, ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+ else{
+ if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
+ setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+ }
+ else{
+ for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
+ if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, p_contentResponse)){
+ setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+ }
}
}
- }
+ }
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
@@ -15591,47 +17091,76 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end f_CSE_GMG_003
+ } // end f_CSE_GMG_005
- } // end group g_CSE_GMG_003
+ } // end group g_CSE_GMG_005
- group g_CSE_GMG_004 {
+ group g_CSE_GMG_006 {
/**
- * @desc Check that IUT rejects a <group>/fanOutPoint OPERATION when the Originator does not have OPERATION_PERMISSION specified in accessControlPolicyIDs and the membersAccessControlPolicyIDs is empty in the group resource.
+ * @desc Check that IUT generates a request primitive for each resource in memberIDs with no relative address appended to it.
*
*/
- testcase TC_CSE_GMG_004_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_GMG_004(m_createContainerBase, int62); //c_RUDNDi
- }//end TC_CSE_GMG_004_CRE
+ testcase TC_CSE_GMG_006_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainer_rc1;
+
+ v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
+ v_ae1.done;
+ }//end TC_CSE_GMG_006_CRE
- testcase TC_CSE_GMG_004_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_GMG_006_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+ var template PrimitiveContent v_contentResponse;
var Labels v_labels_1:= {"VALUE_1"};
+ v_contentResponse.container := mw_contentContainerBase;
+ v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_GMG_004(v_updateRequest, int59);//c_CRDNDi
- }//end TC_CSE_GMG_004_UPD
-
- testcase TC_CSE_GMG_004_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_GMG_004(m_retrieveResource("Temporary", "Temporary"), int61);//c_CUDNDi
- }//end TC_CSE_GMG_004_RET
+
+ v_ae1.start(f_CSE_GMG_006(v_updateRequest, v_contentResponse, int2004));
+ v_ae1.done;
+ }//end TC_CSE_GMG_006_UPD
- testcase TC_CSE_GMG_004_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_GMG_004(m_delete("Temporary", "Temporary"), int55); //c_CRUNDi
- }//end TC_CSE_GMG_004_DEL
+ testcase TC_CSE_GMG_006_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainerBase;
+
+ v_ae1.start(f_CSE_GMG_006(m_retrieveResource("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.done;
+ }//end TC_CSE_GMG_006_RET
- function f_CSE_GMG_004(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_accessControlOperations) runs on CseTester {
- // Local variables
+ testcase TC_CSE_GMG_006_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template PrimitiveContent v_contentResponse;
+ v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
+
+ v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
+ v_ae1.done;
+ }//end TC_CSE_GMG_006_DEL
+
+ /**
+ * @desc Check that IUT generates a request primitive for each resource in memberIDs with a relative address appended to it.
+ *
+ */
+ function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+ //Local constants
+ const integer c_numberOfResponsePrimitive := 2;
+
+ // Local variables
var MsgIn v_response;
- var integer v_aeIndex := -1;
- var integer v_acpIndex := -1;
- var integer v_containerIndex_1 := -1;
- var integer v_containerIndex_2 := -1;
- var integer v_groupIndex := -1;
+ var integer v_aeIndex_1, v_aeIndex_2, v_acpIndex, v_containerIndex_1, v_containerIndex_2, v_groupIndex := -1;
+ var integer i;
var ListOfURIs v_memberIDs;
- var AcpType v_acpIDs;
- var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, p_accessControlOperations);
-
+ var ListOfURIs v_membersAcpIds;
+ var RequestPrimitive v_createRequest := valueof(m_createContentInstance("NotInitialized", "Value1"));
+ var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
+ var template PrimitiveContent v_contentResponse;
+
+ v_contentResponse.contentInstance := mw_contentContentInstanceBase;
+
// Test control
if(not(PICS_ACP_SUPPORT)) {
setverdict(inconc, __SCOPE__ & ": AccessControlPolicy support is required to run this test case");
@@ -15642,50 +17171,67 @@ module OneM2M_Testcases {
f_cf01Up();
// Test adapter configuration
-
+
// Preamble
- v_aeIndex := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
- v_acpIndex := f_cse_createResource(int1, v_createAcp, v_aeIndex); // AE child resource
- v_containerIndex_1 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
- v_memberIDs := {f_getResourceId(vc_resourcesList[v_containerIndex_1].resource), f_getResourceId(vc_resourcesList[v_containerIndex_2].resource)};
- v_acpIDs := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
- v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, v_acpIDs, int3), v_aeIndex); // AE child resource
+ v_aeIndex_1 := f_cse_preamble_registerAe(-, -); //c_CRUDNDi
+ v_aeIndex_2 := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", omit), -1); // AE2 is registred
+ v_acpIndex := f_cse_createResource(int1, v_createAcp, -1); // AE child resource
+ v_containerIndex_1 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_1); // AE1 child resource
+ v_containerIndex_2 := f_cse_createResource(int3, m_createContainerBase, v_aeIndex_2); // AE2 child resource
+ v_memberIDs := {f_getResourceId(vc_resourcesList[v_aeIndex_1].resource), f_getResourceId(vc_resourcesList[v_aeIndex_2].resource)};
+ v_membersAcpIds := {f_getResourceId(vc_resourcesList[v_acpIndex].resource)};
+ v_groupIndex := f_cse_createResource(int9, m_createGroup(2, v_memberIDs, omit, int2, -, v_membersAcpIds, -), -);
- p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
- p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
+ v_createRequest.to_ := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName;
+ v_createRequest.from_ := f_getOriginator(v_groupIndex); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+ v_createRequest.requestIdentifier := v_createRequest.requestIdentifier & f_rnd(1, 1000000);
// Test Body
- mcaPort.send(m_request(valueof(p_requestPrimitive)));
+ mcaPort.send(m_request(v_createRequest));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Update failed due to lack of privilege");
+ setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
+
+ if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
+ setverdict(fail, __SCOPE__, ": Error, aggregatedResponse attribute not provided");
+ }
+ else{
+ if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list) != c_numberOfResponsePrimitive){
+ setverdict(fail, __SCOPE__, ": Error, length of aggregatedResponse is not valid");
+ }
+ else{
+ for(i:=0; i<c_numberOfResponsePrimitive; i:=i+1){
+ if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i].primitiveContent, v_contentResponse)){
+ setverdict(fail, __SCOPE__, ": Error, aggregatedResponse doesn't match with template expected");
+ }
+ }
+ }
+ }
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error operation successful while doesn't have privileges");
+ setverdict(fail, __SCOPE__ & ": Error while creating resource");
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while executing operation");
+ setverdict(fail, __SCOPE__ & ": No answer while creating resource");
}
}
-
+
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
- } // end f_CSE_GMG_004
-
- } // end group g_CSE_GMG_004
+ } // end f_CSE_GMG_006
+ }//end group g_CSE_GMG_006
}// End of Basic_Operations
@@ -15697,7 +17243,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully a list all discovered resource addresses
*
*/
- testcase TC_CSE_DIS_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_001() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -15749,7 +17295,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns the empty address list when no result matching with filter criteria is discovered
*
*/
- testcase TC_CSE_DIS_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -15778,8 +17324,7 @@ module OneM2M_Testcases {
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
- log("sizeof: " & int2str(sizeof(v_response.primitive.responsePrimitive.primitiveContent.uRIList)));
- if(sizeof(v_response.primitive.responsePrimitive.primitiveContent.uRIList) == 0){
+ if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.uRIList) == 0){
setverdict(pass, __SCOPE__ & ": No Content is present");
}
else
@@ -15811,7 +17356,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT returns successfully a list of discovered resource addresses with Non-hierarchical addressing form when the Discovery Result Type is provided in the request
*
*/
- testcase TC_CSE_DIS_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_004() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -15839,7 +17384,7 @@ module OneM2M_Testcases {
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
- while (v_i_cont<sizeof(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
+ while (v_i_cont<lengthof(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
if (f_isNonHierarchical(v_response.primitive.responsePrimitive.primitiveContent.uRIList[v_i_cont])) {
setverdict(pass, __SCOPE__ & ": Non-hierarchical address form present in URIList[" & int2str(v_i_cont) & "] element");
} else {
@@ -15872,7 +17417,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the discovery requests to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery request for the resource TARGET_RESOURCE_ADDRESS
*
*/
- testcase TC_CSE_DIS_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_005() runs on AeSimu system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -15931,7 +17476,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE sends requests to discover the resource TARGET_RESOURCE_ADDRESS which does not exist in the Hosting CSE
*
*/
- testcase TC_CSE_DIS_006() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_006() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -15987,7 +17532,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds the originator with an error when the originator sends a request including an invalid format of filter criteria to discover the resource TARGET_RESOURCE_ADDRESS
*
*/
- testcase TC_CSE_DIS_007() runs on CseTester system CseSystem {
+ testcase TC_CSE_DIS_007() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16049,27 +17594,26 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable.
*
*/
- testcase TC_CSE_SUB_CRE_001_SUB() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_001_SUB() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription resource is created
@@ -16096,7 +17640,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16113,7 +17657,7 @@ module OneM2M_Testcases {
} // end TC_CSE_SUB_CRE_001_SUB
- testcase TC_CSE_SUB_CRE_001_CIN() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_001_CIN() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16122,7 +17666,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- v_createRequest.primitiveContent.subscription.resourceName := omit;
// Test control
// Test component configuration
@@ -16160,7 +17703,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16181,7 +17724,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the originator does not have privileges for retrieving the subscribed-to resource.
*
*/
- testcase TC_CSE_SUB_CRE_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16228,7 +17771,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16249,7 +17792,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT cannot send the Notify request to the notificationURI
*
*/
- testcase TC_CSE_SUB_CRE_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16290,7 +17833,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16311,32 +17854,45 @@ module OneM2M_Testcases {
* @desc Check that the IUT stores Originator ID in the notification creator attribute when a <SUBSCRIPTION> creation request which needs verification is received and the notificationURI is not the Originator.
*
*/
- testcase TC_CSE_SUB_CRE_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_004() runs on AeSimu system CseSystem {
//Local variables
var template RequestPrimitive v_request := m_createSubscriptionBase;
+ var RequestPrimitive v_notificationRequest;
var integer v_aeIndex := -1;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
-
+ var integer v_resourceIndex := -1;
+
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_request, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_request, int23);
- // Test Body
v_request := f_getCreateRequestPrimitive(int23, m_createSubscriptionBase, v_aeIndex);
v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
- mcaPort.send(m_request(valueof(v_request)));
+ v_resourceIndex := f_cse_createResource(int23, v_request, v_aeIndex);//Subscription
+
+ if(vc_ae2.running) {
+ vc_ae2.stop;
+ };
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
+ // Test Body
+ v_notificationRequest := f_getRequestPrimitive(vc_ae2);
+
+ if(f_compareURIs(v_aeIndex, v_notificationRequest.primitiveContent.notification.creator)) {
+ setverdict(pass, __SCOPE__ & ": Creator set to originator of the subscription creation primitive");
+ } else {
+ setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
+ }
// Postamble
f_cse_postamble_deleteResources();
@@ -16350,7 +17906,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Create_of_Direct_Child_Resource" and an create operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_CRE_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_CRE_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
@@ -16359,13 +17915,12 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template PrimitiveContent v_contentNotification := {container := mw_contentContainer_rc1};// all attributes expected
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -16374,18 +17929,18 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int3}), -, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
v_request:= f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -16407,8 +17962,8 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
-
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
//Postamble
f_cse_postamble_deleteResources();
@@ -16424,26 +17979,25 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE
*
*/
- testcase TC_CSE_SUB_NTF_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_NTF_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23, int4101);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int4101);
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
@@ -16469,7 +18023,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16490,26 +18044,25 @@ module OneM2M_Testcases {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE
*
*/
- testcase TC_CSE_SUB_NTF_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_NTF_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe(omit,omit);//c_CUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23, int5205);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23, int5205);
// Test Body
v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription
@@ -16535,7 +18088,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Check to see if the resource is NOT present
if(f_isResourceNotPresent(v_aeIndex, f_getResourceName(v_request.primitiveContent))){
@@ -16556,7 +18109,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends aggregated notification to the subscriber resource when the duration value of the batchNotify attribute is set to TIME_LIMIT and when this timer expires
*
*/
- testcase TC_CSE_SUB_NTF_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_NTF_003() runs on AeSimu system CseSystem {
// Local variables
const integer numberOfAggregatedNotification := 2;
var Labels v_labels_1:= {"VALUE_1"};
@@ -16567,7 +18120,6 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -16575,25 +18127,25 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, int2);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 2)); // check that no notification is received
+ vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, 2)); // check that no notification is received
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -16605,11 +18157,11 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
-
+
//Tear down
f_cf01Down();
@@ -16623,7 +18175,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends Notify request to the subscriber resource when an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
@@ -16633,31 +18185,30 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
v_request.primitiveContent.aE.labels := v_labels_1;
@@ -16682,7 +18233,7 @@ module OneM2M_Testcases {
}
};
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -16696,7 +18247,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “modified attributes†and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16706,13 +18257,12 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -16721,19 +18271,20 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int2, omit); //notificationContentType ="modified attributes"
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); //Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
//TODO Use f_getTemplateFromPrimitiveContent() which needs to be modified to receive the template in which the output template will be built upon
v_contentResponse.aE.labels := ?;// only modified attribute expected
+ v_contentResponse.aE.lastModifiedTime := ?;// only modified attribute expected //TODO Get it automatically into the expected content template
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -16759,7 +18310,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -16773,7 +18324,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “ResourceID†and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16783,35 +18334,34 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- v_contentResponse.aE := m_contentAe_allOmit; // only modified attribute expected
- v_contentResponse.aE.resourceID := ?;
+ v_contentResponse.uRI := ?;
+
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit, omit, int3, omit); // notificationContentType ="ResourceID"
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
-
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+
+ v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -16833,6 +18383,8 @@ module OneM2M_Testcases {
}
}
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
//Postamble
f_cse_postamble_deleteResources();
@@ -16845,7 +18397,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT decreases the expirationCounter attribute of a subscription resource when the Hosting CSE of the subscribed-to resource successfully sends the notification request to subscriber resource(s)
*
*/
- testcase TC_CSE_SUB_UPD_004() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_004() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16856,7 +18408,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
var template PrimitiveContent v_retrieveContentResponse;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -16866,31 +18417,30 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 3, omit, omit, omit, -, omit); //expirationCounter set to 3
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex); // Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
- //TODO See if we keep this f_is_component_done, it assure that the retrieve operation is executed after having sent and received the Notification
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
@@ -16918,7 +18468,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -16932,7 +18482,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT deletes the subscription resource when the the expirationCounter meets zero
*
*/
- testcase TC_CSE_SUB_UPD_005() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_005() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -16942,7 +18492,6 @@ module OneM2M_Testcases {
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -16951,30 +18500,29 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, 1, omit, omit, omit, -, omit); //expirationCounter set to 1
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);// Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // AE update request
f_cse_updateResource(v_request); // AE update
- //TODO See if we keep this f_is_component_done, it assure that the retrieve operation is executed after having sent and received the Notification
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
@@ -16997,7 +18545,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17011,17 +18559,16 @@ module OneM2M_Testcases {
* @desc Check that the IUT doesn’t send a Notify request to the subscriber resource when the “attribute†condition tag of eventNotificationCriteria attribute is set to LIST_OF_ATTRIBUTE and doesn’t contain the ATTRIBUTE_NAME attribute updated.
*
*/
- testcase TC_CSE_SUB_UPD_006() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_006() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
- var AttributeList_1 v_attributeList := {"appName"};
+ var AttributeList_1 v_attributeList := {"apn"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -17029,14 +18576,14 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
@@ -17044,12 +18591,12 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
+ vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -17071,7 +18618,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17085,7 +18632,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends aggregated notification to the subscriber resource when the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
*
*/
- testcase TC_CSE_SUB_UPD_007() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_007() runs on AeSimu system CseSystem {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
@@ -17097,7 +18644,6 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -17105,25 +18651,25 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), omit, omit, -, omit );
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
+ vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, numberOfAggregatedNotification)); // check that no notification is received
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -17137,7 +18683,7 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17151,7 +18697,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends the latest notification to the subscriber resource when latestNotify is set to TRUE, the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
*
*/
- testcase TC_CSE_SUB_UPD_008() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_008() runs on AeSimu system CseSystem {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
@@ -17163,7 +18709,6 @@ module OneM2M_Testcases {
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_contentResponse.aE := mw_contentAeBase; // all attributes expected
@@ -17171,14 +18716,14 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)},omit,omit,m_batchNotify(numberOfAggregatedNotification), true, omit, -, omit);
@@ -17188,12 +18733,12 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
@@ -17207,8 +18752,8 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
f_cse_updateResource(v_request);
- f_is_component_done(v_notifyHandler);
-
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
//Postamble
f_cse_postamble_deleteResources();
@@ -17221,18 +18766,17 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the “attribute†condition tag of eventNotificationCriteria attribute is set to ATTRIBUTE_NAME and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_009() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_UPD_009() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
- var AttributeList_1 v_attributeList := {"labels"};
+ var AttributeList_1 v_attributeList := {"lbl"};
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
var template PrimitiveContent v_contentResponse;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
@@ -17241,14 +18785,14 @@ module OneM2M_Testcases {
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int1}, v_attributeList), omit, omit, omit, omit, -, omit);
@@ -17256,12 +18800,12 @@ module OneM2M_Testcases {
v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -17283,7 +18827,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17303,27 +18847,28 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the AE2_RESOURCE_ADDRESS of the subscriberURI attribute when the SUBSCRIPTION_RESOURCE_ADDRESS <subscription> resource is deleted
*
*/
- testcase TC_CSE_SUB_DEL_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_DEL_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
var RequestPrimitive v_request;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
+ var template Notification v_notificationContent := mw_contentNotificationBase;
+ var RequestPrimitive v_notificationRequest;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, omit, omit, omit, omit,f_getResourceAddress(v_ae2Index), -, omit); // SubscriberURI ="ResourceID"
@@ -17331,12 +18876,14 @@ module OneM2M_Testcases {
v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))); // Subscription resource deletion request
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
// Test Body
- v_notifyHandler.start(f_CSE_SUB_DEL_001(f_getResourceAddress(v_resourceIndex))); // check that no notification is received
+ v_notificationContent.subscriptionReference := ?;
+ v_notificationContent.notificationEvent := omit;
+ vc_ae2.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_notificationContent)); // check that no notification is received
mcaPort.send(m_request(v_request));
tc_ac.start;
@@ -17358,7 +18905,15 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
+
+ v_notificationRequest := f_getRequestPrimitive(vc_ae2);
+
+ if(f_compareURIs(v_resourceIndex, v_notificationRequest.primitiveContent.notification.subscriptionReference)) {
+ setverdict(pass, __SCOPE__ & ": Creator set to originator of the subscription creation primitive");
+ } else {
+ setverdict(fail, __SCOPE__ & ": Creator not set to originator of the subscription creation primitive");
+ }
//Postamble
f_cse_postamble_deleteResources();
@@ -17368,58 +18923,24 @@ module OneM2M_Testcases {
} // end TC_CSE_SUB_DEL_001
- function f_CSE_SUB_DEL_001(in XSD.AnyURI p_subscriptionReference) runs on CseTester {
- // Local variables
- var MsgIn v_response;
- var template Notification v_notificationRequest := mw_contentNotificationBase;
-
- v_notificationRequest.subscriptionDeletion := true;
- v_notificationRequest.subscriptionReference := p_subscriptionReference;
-
-
- map(self:mcaPort, system:mcaPort);
- map(self:acPort, system:acPort);
-
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_request(mw_notify(v_notificationRequest))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Notification received");
- }
- [] mcaPort.receive{
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error, unexpected message received");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No notification received");
- }
- }
-
- unmap(self:mcaPort, system:mcaPort);
- unmap(self:acPort, system:acPort);
-
- } //end f_CSE_SUB_DEL_001
-
-
/**
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Resource" and an delete operation has been performed the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_DEL_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_DEL_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_subscriptionResourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
- var template PrimitiveContent v_contentNotification := {aE:= mw_contentAeBase}; // all attributes expected;
+ var template PrimitiveContent v_notificationContent;
var RequestPrimitive v_deleteRequest;
- var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
// Test control
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -17428,16 +18949,18 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int2}, -), omit, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex );//Subscription
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
//Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ v_notificationContent := {aE:= mw_contentAeBase}; // all attributes expected;
+
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
@@ -17463,7 +18986,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17477,7 +19000,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Direct_Child_Resource" and an delete operation has been performed on a child resource of the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_DEL_003() runs on CseTester system CseSystem {
+ testcase TC_CSE_SUB_DEL_003() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -17485,12 +19008,11 @@ module OneM2M_Testcases {
var integer v_containerResourceIndex := -1;
var template RequestPrimitive v_createRequest := omit;
var RequestPrimitive v_deleteRequest;
- var template PrimitiveContent v_contentNotification := {container := mw_contentContainer_rc1}; // all attributes expected in notification;
- var CseTester v_notifyHandler;
+ var template PrimitiveContent v_notificationContent;
var integer v_ae2Index := -1;
// Test component configuration
- f_cf01Up();
+ f_cf01Up(true);
// Test adapter configuration
@@ -17501,16 +19023,18 @@ module OneM2M_Testcases {
v_createRequest := m_createSubscriptionAdvanced(f_getResourceAddress(v_aeIndex), -, {f_getResourceAddress(v_ae2Index)}, m_eventNotificationCriteria({int4}, -), omit, omit, omit, omit, -, omit);
- f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, v_createRequest, int23);
+ f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
v_subscriptionResourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription (with name attribute omitted)
- if(v_notifyHandler.running) {
- v_notifyHandler.stop;
+ if(vc_ae2.running) {
+ vc_ae2.stop;
};
//Test Body
- v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
+ v_notificationContent := {container := mw_contentContainer_rc1}; // all attributes expected;
+
+ vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_notificationContent)); // check if the notification is well received and if its content matchs
v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
@@ -17534,7 +19058,7 @@ module OneM2M_Testcases {
}
}
- f_is_component_done(v_notifyHandler);
+ f_checkComponentDoneAndGetVerdict(vc_ae2);
//Postamble
f_cse_postamble_deleteResources();
@@ -17558,7 +19082,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having multiple access control rules
*
*/
- testcase TC_CSE_SEC_ACP_CRE_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -17595,6 +19119,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
+ f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1, v_aeIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -17610,7 +19135,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
@@ -17630,7 +19155,7 @@ module OneM2M_Testcases {
/**
* @desc Check that the IUT accepts the creation of a accessControlPolicy resource with selfPrivileges attribute having multiple access control rules
*/
- testcase TC_CSE_SEC_ACP_CRE_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -17667,6 +19192,7 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
+ f_checkAttributesToBeSaved(c_accessControlPolicyType, v_createRequest, v_response.primitive.responsePrimitive);
v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, c_accessControlPolicyType, v_aeIndex);
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -17682,7 +19208,7 @@ module OneM2M_Testcases {
}
}
- f_checkCseTesterStatus();
+ f_checkAeSimuStatus();
//Check to see if the resource is present or not
if(f_isResourcePresent(v_acpIndex)) {
@@ -17707,13 +19233,14 @@ module OneM2M_Testcases {
* @desc Check that the IUT updates successfully the accessControlPolicyIDs attribute of the <AE> resource when the AE has privileges for UPDATE operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
*
*/
- testcase TC_CSE_SEC_ACP_UPD_001() runs on CseTester system CseSystem {
+ testcase TC_CSE_SEC_ACP_UPD_001() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
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_createRequestAcp1 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
+ var RequestPrimitive v_createRequestAcp2 := valueof(m_createAcp(f_getResourceAddress(-1), omit));
var RequestPrimitive v_updateRequest := valueof(m_updateAeBase);
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
@@ -17729,9 +19256,9 @@ module OneM2M_Testcases {
// Test adapter configuration
// Preamble
- v_acpIndex1 := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ v_acpIndex1 := f_cse_createResource(int1, v_createRequestAcp1); // CSE child resource
- v_acpIndex2 := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ v_acpIndex2 := f_cse_createResource(int1, v_createRequestAcp2); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex1].resource)}, -);
@@ -17768,7 +19295,7 @@ module OneM2M_Testcases {
}
v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
- if(getverdict == pass){
+ if(getverdict == pass){
if(ischosen(v_primitiveContentRetrievedResource.aE)) {
if(not match (f_resourceIdCleaner(v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs[0]), v_updateRequest.primitiveContent.aE.accessControlPolicyIDs[0])){
setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute not updated correctly");
@@ -17788,14 +19315,15 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when the AE tries an UPDATE operation on the accessControlPolicyIDs attribute without having privileges for such operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
*
*/
- testcase TC_CSE_SEC_ACP_UPD_002() runs on CseTester system CseSystem {
+ testcase TC_CSE_SEC_ACP_UPD_002() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
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_updateRequest := valueof(m_updateAeBase);
+ 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_updateRequest;
var AccessControlRule v_accessControlRule_1;
var AccessControlRule v_accessControlRule_2;
var SetOfAcrs v_setOfArcs_1;
@@ -17810,9 +19338,9 @@ module OneM2M_Testcases {
// Test adapter configuration
// Preamble
- v_acpIndex1 := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ v_acpIndex1 := f_cse_createResource(int1, v_createRequestAcp1); // CSE child resource
- v_acpIndex2 := f_cse_createResource(int1, v_createRequest); // CSE child resource
+ v_acpIndex2 := f_cse_createResource(int1, v_createRequestAcp2); // CSE child resource
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[v_acpIndex1].resource)}, -);
@@ -17825,6 +19353,7 @@ module OneM2M_Testcases {
f_cse_updateResource(v_updateRequest);
// Test Body
+ v_updateRequest := valueof(m_updateAeBase);
v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)};
v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest);
@@ -17875,26 +19404,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when an ORIGINATOR tries an OPERATION without having privileges for performing the OPERATION on the TARGET_RESOURCE_TYPE resource.
*
*/
- testcase TC_CSE_SEC_ACP_001_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_001(m_createContainerBase);
+ testcase TC_CSE_SEC_ACP_001_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_001(m_createContainerBase));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_001_CRE
- testcase TC_CSE_SEC_ACP_001_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_001_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- f_CSE_SEC_ACP_001(v_updateRequest);
+
+ v_ae1.start(f_CSE_SEC_ACP_001(v_updateRequest));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_001_UPD
- testcase TC_CSE_SEC_ACP_001_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_001(m_retrieveResource("Temporary", "Temporary"));
+ testcase TC_CSE_SEC_ACP_001_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_001(m_retrieveResource("Temporary", "Temporary")));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_001_RET
- testcase TC_CSE_SEC_ACP_001_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_001(m_delete("Temporary", "Temporary"));
+ testcase TC_CSE_SEC_ACP_001_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_001(m_delete("Temporary", "Temporary")));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_001_DEL
- function f_CSE_SEC_ACP_001(template RequestPrimitive p_requestPrimitive) runs on CseTester {
+ function f_CSE_SEC_ACP_001(template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -17924,6 +19465,7 @@ module OneM2M_Testcases {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -17965,26 +19507,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds successfully when the AE tries an OPERATION on its <AE> resource which has multiple accessControlPolicyID attribute
*
*/
- testcase TC_CSE_SEC_ACP_002_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_002(m_createContainerBase, int2001);
+ testcase TC_CSE_SEC_ACP_002_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_002(m_createContainerBase, int2001));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_002_CRE
- testcase TC_CSE_SEC_ACP_002_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_002_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- f_CSE_SEC_ACP_002(v_updateRequest, int2004);
+
+ v_ae1.start(f_CSE_SEC_ACP_002(v_updateRequest, int2004));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_002_UPD
- testcase TC_CSE_SEC_ACP_002_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_002(m_retrieveResource("Temporary", "Temporary"), int2000);
+ testcase TC_CSE_SEC_ACP_002_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_002(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_002_RET
- testcase TC_CSE_SEC_ACP_002_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002);
+ testcase TC_CSE_SEC_ACP_002_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_002(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_002_DEL
- function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
+ function f_CSE_SEC_ACP_002(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -18023,6 +19577,7 @@ module OneM2M_Testcases {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -18062,26 +19617,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds successfully when an allowed DOMAIN tries an OPERATION on a AE_RESOURCE_TYPE resource.
*
*/
- testcase TC_CSE_SEC_ACP_003_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_003(m_createContainerBase, int2001);
+ testcase TC_CSE_SEC_ACP_003_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_003(m_createContainerBase, int2001));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_003_CRE
- testcase TC_CSE_SEC_ACP_003_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_003_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- f_CSE_SEC_ACP_003(v_updateRequest, int2004);
+
+ v_ae1.start(f_CSE_SEC_ACP_003(v_updateRequest, int2004));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_003_02
- testcase TC_CSE_SEC_ACP_003_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_003(m_retrieveResource("Temporary", "Temporary"), int2000);
+ testcase TC_CSE_SEC_ACP_003_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_003(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_003_03
- testcase TC_CSE_SEC_ACP_003_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002);
+ testcase TC_CSE_SEC_ACP_003_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_003(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_003_04
- function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester{
+ function f_CSE_SEC_ACP_003(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -18107,6 +19674,7 @@ module OneM2M_Testcases {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "testDomain";
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -18165,26 +19733,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds successfully when any ORIGINATOR tries an OPERATION on a AE_RESOURCE_TYPE resource for which all originators are allowed
*
*/
- testcase TC_CSE_SEC_ACP_004_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_004(m_createContainerBase, int2001);
+ testcase TC_CSE_SEC_ACP_004_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_004(m_createContainerBase, int2001));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_004_CRE
- testcase TC_CSE_SEC_ACP_004_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_004_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- f_CSE_SEC_ACP_004(v_updateRequest, int2004);
+
+ v_ae1.start(f_CSE_SEC_ACP_004(v_updateRequest, int2004));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_004_UPD
- testcase TC_CSE_SEC_ACP_004_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_004(m_retrieveResource("Temporary", "Temporary"), int2000);
+ testcase TC_CSE_SEC_ACP_004_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_004(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_004_RET
- testcase TC_CSE_SEC_ACP_004_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002);
+ testcase TC_CSE_SEC_ACP_004_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_004(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_004_DEL
- function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester{
+ function f_CSE_SEC_ACP_004(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu{
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -18207,6 +19787,7 @@ module OneM2M_Testcases {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -18245,26 +19826,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds successfully when the AE tries an OPERATION on its child <container> resource whose accessControlPolicyID attribute is not set and AE has privileges for such OPERATION on its associated accessControlPolicy resource
*
*/
- testcase TC_CSE_SEC_ACP_011_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_011(m_createContainerBase, int2001);
+ testcase TC_CSE_SEC_ACP_011_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_011(m_createContainerBase, int2001));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_011_CRE
- testcase TC_CSE_SEC_ACP_011_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_011_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_SEC_ACP_011(v_updateRequest, int2004);
+
+ v_ae1.start(f_CSE_SEC_ACP_011(v_updateRequest, int2004));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_011_UPD
- testcase TC_CSE_SEC_ACP_011_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_011(m_retrieveResource("Temporary", "Temporary"), int2000);
+ testcase TC_CSE_SEC_ACP_011_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_011(m_retrieveResource("Temporary", "Temporary"), int2000));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_011_RET
- testcase TC_CSE_SEC_ACP_011_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002);
+ testcase TC_CSE_SEC_ACP_011_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_011(m_delete("Temporary", "Temporary"), int2002));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_011_DEL
- function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on CseTester {
+ function f_CSE_SEC_ACP_011(template RequestPrimitive p_requestPrimitive, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -18284,6 +19877,7 @@ module OneM2M_Testcases {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
+ p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -18321,26 +19915,38 @@ module OneM2M_Testcases {
* @desc Check that the IUT responds with an error when an ORIGINATOR tries an OPERATION on a <Container> resource with no accessControlPolicyID associated and such ORIGINATOR having no privileges for performing the OPERATION on the <Container> resource.
*
*/
- testcase TC_CSE_SEC_ACP_012_CRE() runs on CseTester system CseSystem { //Create
- f_CSE_SEC_ACP_012(m_createContainerBase, int62);
+ testcase TC_CSE_SEC_ACP_012_CRE() runs on Tester system CseSystem { //Create
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_012(m_createContainerBase, int62));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_012_CRE
- testcase TC_CSE_SEC_ACP_012_UPD() runs on CseTester system CseSystem { //Update
+ testcase TC_CSE_SEC_ACP_012_UPD() runs on Tester system CseSystem { //Update
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var Labels v_labels_1:= {"VALUE_1"};
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- f_CSE_SEC_ACP_012(v_updateRequest, int59);
+
+ v_ae1.start(f_CSE_SEC_ACP_012(v_updateRequest, int59));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_012_UPD
- testcase TC_CSE_SEC_ACP_012_RET() runs on CseTester system CseSystem { //Retrieve
- f_CSE_SEC_ACP_012(m_retrieveResource("Temporary", "Temporary"), int61);
+ testcase TC_CSE_SEC_ACP_012_RET() runs on Tester system CseSystem { //Retrieve
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_012(m_retrieveResource("Temporary", "Temporary"), int61));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_012_RET
- testcase TC_CSE_SEC_ACP_012_DEL() runs on CseTester system CseSystem { //Delete
- f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55);
+ testcase TC_CSE_SEC_ACP_012_DEL() runs on Tester system CseSystem { //Delete
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55));
+ v_ae1.done;
}//end TC_CSE_SEC_ACP_012_DEL
- function f_CSE_SEC_ACP_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on CseTester {
+ function f_CSE_SEC_ACP_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;