diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 1040f31bc85429f3b64fc0e80e252d78aad33447..5ed86f83d3a67d95e41ea0f3dc0c6f4b5b3bad8b 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1242,15 +1242,15 @@ module OneM2M_Functions {
* @verdict
*/
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 {
-
+
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(v_request, p_nullFields)));
+
+ mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_request), p_nullFields)));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index df3a37e81a8a21c5a4e5d5a94a144f54670924b1..40005e5acd4c9fa9479725175f6c9728f02af30d 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -575,7 +575,8 @@ 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.done;
+
v_cse1.start(f_CSE_REG_CRE_003());
v_cse1.done;
@@ -595,7 +596,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
vc_ae1.done;
vc_ae1.start(f_cse_preamble_registerAe());
-
+ vc_ae1.done;
}
@@ -6498,7 +6499,6 @@ 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(int3, v_containerIndex, v_updateRequest);
mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex)))));
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 6c2b4c7b7ade6af30b20c394e9692591884d3263..73d10d41fb82ad840318424f6f31f45164882ce8 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2232,7 +2232,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2245,7 +2245,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2257,7 +2257,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;
@@ -2270,7 +2270,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2283,7 +2283,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2296,7 +2296,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2309,7 +2309,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2322,7 +2322,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
@@ -2397,8 +2397,7 @@ module OneM2M_Testcases_CSE_Release_2 {
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;
-
+ var XSD.NonNegativeInteger v_contentSize := 512;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
@@ -2428,13 +2427,12 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var RequestPrimitive v_requestPrimitive;
- var XSD.PositiveInteger v_maxNrOfMembers := 10;
-
+ var XSD.PositiveInteger v_maxNrOfMembers := 10;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
- v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
+ v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};
v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
v_ae1.done;
@@ -2489,11 +2487,11 @@ module OneM2M_Testcases_CSE_Release_2 {
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";
+ 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 := {PX_CSE1_ID};
- v_createRequest.primitiveContent.mgmtResource.description := description;
+ 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
@@ -2503,7 +2501,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");
@@ -2521,7 +2519,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!!!
@@ -5171,6 +5169,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}
}
+ } // end g_CSE_DMR_UPD_006
testcase TC_CSE_DMR_UPD_006_TS_LBL() runs on Tester system CseSystem {
// Local variable
@@ -9252,12 +9251,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;
- f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 1
t_batchNotificationTimer.start;
v_updateRequest := m_updateAeBase;
v_updateRequest.primitiveContent.aE.appName := "MyAppName2";
- f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
+ f_cse_updateResource(int2, v_aeIndex, v_updateRequest); // Update request 2
vc_ae2.done;
v_elapsedTime := t_batchNotificationTimer.read;