From 5666f9b9cf7e642cbfa696637e2d92d96b0f1d3d Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 13 Aug 2018 12:36:13 +0200
Subject: [PATCH] f_cse_updateResource updated to include
f_getUpdateRequestPrimitive in it
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 11 +-
OneM2M_PermutationFunctions.ttcn | 15 +--
OneM2M_Testcases_CSE_Release_1.ttcn | 14 +--
OneM2M_Testcases_CSE_Release_2.ttcn | 164 +++++++++-------------------
4 files changed, 73 insertions(+), 131 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 80f8d89..6826285 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1004,9 +1004,16 @@ module OneM2M_Functions {
* @param p_requestPrimitive UPDATE request primitive to be used
* @verdict
*/
- function f_cse_updateResource(in RequestPrimitive p_requestPrimitive) runs on AeSimu {
+ function f_cse_updateResource(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
- mcaPort.send(f_getMsgOutPrimitive(m_request(p_requestPrimitive)));
+ var RequestPrimitive v_request;
+
+ //Activate defaults when running on a PTC
+ f_cse_activateDefaults_ae();
+
+ v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
+
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_request))));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 8284a1f..d258f17 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -4891,8 +4891,7 @@ module OneM2M_PermutationFunctions {
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1, v_accessControlRule_2};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, vc_acpAuxIndex, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, vc_acpAuxIndex, v_updateRequest);
//Adjustments for ACP resource type
if(p_resourceType == int1) {
@@ -5617,8 +5616,7 @@ module OneM2M_PermutationFunctions {
v_accessControlRule_1 := valueof(m_createAcr({ f_getOriginator(v_aeIndex), PX_SUPER_AE_ID}, int63));
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex, v_updateRequest);
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -5684,14 +5682,12 @@ module OneM2M_PermutationFunctions {
v_accessControlRule_1 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int3)); // c_CR
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex1, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex1, v_updateRequest);
v_accessControlRule_1 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, int60)); // c_UDNDi
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex2, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex2, v_updateRequest);
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
@@ -6306,8 +6302,7 @@ module OneM2M_PermutationFunctions {
v_accessControlRule_2 := valueof(m_createAcr({f_getOriginator(v_aeIndex)}, p_acor));
v_setOfArcs.accessControlRule_list := {v_accessControlRule_1, v_accessControlRule_2};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, -));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex, v_updateRequest);
// Test Body
v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex);
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 803130d..c03d666 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -95,7 +95,6 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_ae1.done;
v_ae1.start(f_CSE_GEN_CRE_001(e_cseRelative));
v_ae1.done;
@@ -565,6 +564,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+ v_cse1.done;
v_cse1.start(f_CSE_REG_CRE_003());
@@ -583,8 +583,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_remoteCseIndex := f_cse_registrationRemoteCse();
vc_ae1 := AeSimu.create("AE1") alive;
vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
+ vc_ae1.done;
vc_ae1.start(f_cse_preamble_registerAe());
-
+ vc_ae1.done;
}
@@ -6488,8 +6489,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) {
- v_updateRequest := f_getUpdateRequestPrimitive(int3, v_containerIndex, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
@@ -9695,8 +9695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_setOfArcs_1.accessControlRule_list := {v_accessControlRule_1};
v_setOfArcs_2.accessControlRule_list := {v_accessControlRule_2};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs_1, v_setOfArcs_2));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex1, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex1, v_updateRequest);
// Test Body
v_updateRequest := valueof(m_updateAeBase);
@@ -9790,8 +9789,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_setOfArcs_1.accessControlRule_list := {v_accessControlRule_1};
v_setOfArcs_2.accessControlRule_list := {v_accessControlRule_2};
v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs_1, v_setOfArcs_2));
- v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex1, v_updateRequest);
- f_cse_updateResource(v_updateRequest);
+ f_cse_updateResource(int1, v_acpIndex1, v_updateRequest);
// Test Body
v_updateRequest := valueof(m_updateAeBase);
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 8ea4023..1170fd1 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1317,7 +1317,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createAcpBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int1, v_createRequest, mw_createAccessControlPolicyAnnc));//AccessControlPolicy
v_ae1.done;
@@ -1330,7 +1330,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int3, v_createRequest, mw_createContainerAnncBase));//Container
v_ae1.done;
@@ -1342,7 +1342,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int4, v_createRequest, mw_createContentInstanceAnncBase));//ContentInstance
v_ae1.done;
@@ -1355,7 +1355,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int9, v_createRequest, mw_createGroupAnncBase));//Group
v_ae1.done;
@@ -1368,7 +1368,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int10, v_createRequest, mw_createLocationPolicyAnncBase));//LocationPolicy
v_ae1.done;
@@ -1381,7 +1381,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int13, v_createRequest, mw_createMgmtObjAnncBase));//MgmtObj
v_ae1.done;
@@ -1394,7 +1394,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createNodeBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int14, v_createRequest, mw_createNodeAnnc));//Node
v_ae1.done;
@@ -1407,7 +1407,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createScheduleBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_DMR_CRE_020(int18, v_createRequest, mw_createScheduleAnncBase));//Schedule
v_ae1.done;
@@ -1427,13 +1427,12 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var RequestPrimitive v_requestPrimitive;
- var XSD.NonNegativeInteger maxByteSize := 512; //Correct value? Shall be indicated in TP?
+ var XSD.NonNegativeInteger v_maxByteSize := 512; //Correct value? Shall be indicated in TP?
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- //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_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
+ v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
v_ae1.done;
@@ -1442,7 +1441,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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){
+ if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != v_maxByteSize){
setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
}else{
setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
@@ -1459,13 +1458,13 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var RequestPrimitive v_requestPrimitive;
- var XSD.NonNegativeInteger v_contentSize := 512; //Correct value? Shall be indicated in TP?
+ var XSD.NonNegativeInteger v_contentSize := 512;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
//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_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"}; //Correct value? Shall be indicated in TP?
v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
v_ae1.done;
@@ -1491,12 +1490,12 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createGroupBase;
var RequestPrimitive v_requestPrimitive;
- var XSD.PositiveInteger maxNrOfMembers := 10; //Correct value? Shall be indicated in TP?
+ var XSD.PositiveInteger v_maxNrOfMembers := 10;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
- v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
- v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"}; //Correct value? Shall be indicated in TP?
+ v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
+ v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
v_ae1.done;
@@ -1505,7 +1504,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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){
+ if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != v_maxNrOfMembers){
setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
}else{
setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
@@ -1522,12 +1521,12 @@ module OneM2M_Testcases_CSE_Release_2 {
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?
+ var LocationSource v_locationSource := int1;//Network-based
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
- v_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
- v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"}; //Correct value? Shall be indicated in TP?
+ v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
+ v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
v_ae1.done;
@@ -1536,7 +1535,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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){
+ if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != v_locationSource){
setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
}else{
setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
@@ -1553,12 +1552,12 @@ module OneM2M_Testcases_CSE_Release_2 {
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?
+ var XSD.String v_description := "Description of mgmtObj";
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
- v_createRequest.primitiveContent.mgmtResource.description := description;
- v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"}; //Correct value? Shall be indicated in TP?
+ v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.mgmtResource.description := v_description;
+ v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
v_ae1.done;
@@ -1567,7 +1566,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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){
+ if(v_requestPrimitive.primitiveContent.announcedMgmtResource.description != v_description){
setverdict(fail, __SCOPE__ & ": Error: Value of description has not been announced successfully");
}else{
setverdict(pass, __SCOPE__ & ": Value of description has been announced successfully");
@@ -1586,7 +1585,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_requestPrimitive;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.node.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.node.announceTo := {PX_CSE1_ID};
//TODO node to be done. hostedCSELink attribute (OA) to be added!!!
@@ -1600,12 +1599,12 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var RequestPrimitive v_requestPrimitive;
- var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 *"}};
+ var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 *"}};
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
- 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_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+ v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
+ v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
v_ae1.done;
@@ -1614,7 +1613,7 @@ module OneM2M_Testcases_CSE_Release_2 {
//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){
+ if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != v_scheduleElement){
setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
}else{
setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
@@ -1763,16 +1762,6 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_RET_003_PCH() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
-
- v_ae1.start(f_CSE_DMR_RET_003(int15, m_createPollingChannelBase));//PollingChannel
- v_ae1.done;
- }
-
} // end g_CSE_DMR_RET_003
group g_CSE_DMR_RET_004 {
@@ -3812,35 +3801,8 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
}
+ } // end g_CSE_DMR_UPD_006
- 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_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
- v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
-
- 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")
- }
- }
- }
- }
-
- } // end g_CSE_DMR_UPD_006
-
-
group g_CSE_DMR_UPD_007{
/**
@@ -5184,16 +5146,6 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
};
- testcase TC_CSE_DMR_DEL_002_PCH() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
-
- v_ae1.start(f_CSE_DMR_DEL_002(int15, m_createPollingChannelBase));//PollingChannel
- v_ae1.done;
- };
-
};//end of group g_CSE_DMR_DEL_002
group g_CSE_DMR_DEL_003{
@@ -6698,14 +6650,12 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_ae2.start(f_cse_notifyProcedure_aggregatedNoficationHandler(v_contentResponse, c_numberOfAggregatedNotification));
v_updateRequest.primitiveContent.aE.labels := v_labels_1;
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 1
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
t_batchNotificationTimer.start;
v_updateRequest := m_updateAeBase;
v_updateRequest.primitiveContent.aE.appName := "MyAppName2";
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
vc_ae2.done;
v_elapsedTime := t_batchNotificationTimer.read;
@@ -6959,8 +6909,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
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
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
@@ -7053,8 +7002,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Test Body
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
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // AE update request
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
@@ -7230,16 +7178,13 @@ module OneM2M_Testcases_CSE_Release_2 {
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
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
v_updateRequest.primitiveContent.aE.labels := v_labels_2;
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
v_updateRequest.primitiveContent.aE.labels := v_labels_3;
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
@@ -7311,16 +7256,13 @@ module OneM2M_Testcases_CSE_Release_2 {
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
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
v_updateRequest.primitiveContent.aE.labels := v_labels_2;
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 2
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
v_updateRequest.primitiveContent.aE.labels := v_labels_3;
- v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request 3
- f_cse_updateResource(v_request);
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 3
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
@@ -7632,7 +7574,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+ v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, omit, v_updateRequest));//AccessControlPolicy
v_ae1.done;
@@ -7646,7 +7588,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.accessControlPolicy.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.accessControlPolicy.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int1, v_createRequestAnnc, v_createRequest, omit));//AccessControlPolicy
v_ae1.done;
@@ -7660,7 +7602,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+ v_updateRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, omit, v_updateRequest));//Container
v_ae1.done;
@@ -7674,7 +7616,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int3, v_createRequestAnnc, v_createRequest, omit));//Container
v_ae1.done;
@@ -7688,7 +7630,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_updateRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
+ v_updateRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, omit, v_updateRequest));//Group
v_ae1.done;
@@ -7702,7 +7644,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int9, v_createRequestAnnc, v_createRequest, omit));//Group
v_ae1.done;
@@ -7716,7 +7658,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnncBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
+ v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
v_ae1.start(f_CSE_ANNC_001(int4, v_createRequestAnnc, v_createRequest, omit));//ContentInstance
v_ae1.done;
--
GitLab