diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 7a791a0a855ee20b5b7a9f81531bfa92aeeb58cc..2d76cd1bd62d3cd5e0ad03d94783999f1d249f38 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -8721,6 +8721,8 @@ 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){
@@ -8755,6 +8757,8 @@ 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){
@@ -8789,6 +8793,8 @@ 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){
@@ -8898,6 +8904,8 @@ 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)) {
@@ -8940,6 +8948,8 @@ 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)) {
@@ -8982,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)) {
@@ -9024,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)) {
@@ -9066,6 +9080,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)) {
@@ -9108,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)) {
@@ -9228,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
@@ -9289,6 +9309,8 @@ 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
@@ -9349,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
@@ -9407,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
@@ -9464,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)){
@@ -9513,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
@@ -11506,15 +11536,14 @@ module OneM2M_Testcases {
*/
testcase TC_CSE_DMR_UPD_017_CSR_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
- var Labels v_labels := {"MyLabel"};
+ 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_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_acpType));//Remote CSE
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
v_ae1.done;
@@ -11541,15 +11570,14 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CSR_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
- var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"};
+ 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_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_acpType));//Remote CSE
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
v_ae1.done;
@@ -11576,15 +11604,14 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CSR_NL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- 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;
+ 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_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest, v_acpType));//Remote CSE
+ v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
v_ae1.done;
@@ -11611,7 +11638,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_NOD_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateNodeBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11619,7 +11645,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.node.labels := v_labels;
- v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, v_acpType));//Node
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest));//Node
v_ae1.done;
@@ -11646,32 +11672,34 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_NOD_ACPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType := {"NotInitialized"};
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_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, 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);
+ 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);
+ 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")
}
}
@@ -11685,7 +11713,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_AE_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAE;
var ResponsePrimitive v_responsePrimitive;
@@ -11693,7 +11720,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.aE.labels := v_labels;
- v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_acpType));//AE
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.done;
@@ -11720,32 +11747,32 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_AE_ACPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType := {"NotInitialized"};
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, v_acpType, true));//AE
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, true));//AE
v_ae1.done;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ 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")
}
}
@@ -11754,14 +11781,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_AE_APN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_acpType));//AE
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.done;
@@ -11788,14 +11814,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_AE_POA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_acpType));//AE
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.done;
@@ -11822,14 +11847,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_AE_OR() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, v_acpType));//AE
+ v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.done;
@@ -11856,7 +11880,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11864,7 +11887,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.labels := v_labels;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -11891,23 +11914,23 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_ACPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType := {"NotInitialized"};
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, v_acpType, true));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, true));//Container
v_ae1.done;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ 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")
}
}
@@ -11916,7 +11939,7 @@ module OneM2M_Testcases {
//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")
}
}
@@ -11925,7 +11948,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_MNI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11933,7 +11955,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -11960,7 +11982,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_MBS() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var XSD.NonNegativeInteger v_maxByteSize := 512;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -11968,7 +11989,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -11995,7 +12016,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_MIA() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var XSD.NonNegativeInteger v_maxInstanceAge := 1;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -12003,7 +12023,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -12030,7 +12050,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_OR() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -12038,7 +12057,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -12065,7 +12084,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_CNT_LI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var XSD.AnyURI v_locationID := "MyLocationID";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
@@ -12073,7 +12091,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.container.locationID := v_locationID;
- v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, v_acpType));//Container
+ v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
@@ -12100,7 +12118,6 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_ACP_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
@@ -12108,7 +12125,7 @@ module OneM2M_Testcases {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
- v_ae1.start(f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest, v_acpType));//AccessControlPolicy
+ v_ae1.start(f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
v_ae1.done;
@@ -12135,23 +12152,23 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_ACPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType := {"NotInitialized"};
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, v_acpType, true));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
v_ae1.done;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
- //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")
}
}
@@ -12160,7 +12177,7 @@ module OneM2M_Testcases {
//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")
}
}
@@ -12169,14 +12186,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12203,14 +12219,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_ENC() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12237,14 +12252,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_EXC() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12271,14 +12285,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_GPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12305,14 +12318,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_NFU() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12339,14 +12351,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_BN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12373,14 +12384,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_RL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12407,14 +12417,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_PN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12441,14 +12450,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_NSP() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12475,14 +12483,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_LN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12509,14 +12516,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_SUB_NEC() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, v_acpType));//Subscription
+ v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
v_ae1.done;
@@ -12543,14 +12549,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_GRP_LBL() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_acpType));//Group
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
v_ae1.done;
@@ -12577,31 +12582,32 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_GRP_ACPI() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType := {"NotInitialized"};
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_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, 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);
+ 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")
}
}
@@ -12610,14 +12616,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_GRP_MACP() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_acpType));//Group
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
v_ae1.done;
@@ -12644,14 +12649,13 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_017_GRP_GN() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var AcpType v_acpType;
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_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, v_acpType));//Group
+ v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group
v_ae1.done;
@@ -12676,10 +12680,10 @@ module OneM2M_Testcases {
}
}
- function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, inout AcpType p_acpi, boolean p_secondAcp := false) runs on AeSimu {
+ 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 integer v_ae2Index := -1;
@@ -12710,9 +12714,9 @@ 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);
}
@@ -12729,9 +12733,9 @@ module OneM2M_Testcases {
}
//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 vc_response {
@@ -13129,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")
@@ -13881,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 {
@@ -17261,8 +17266,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
@@ -17322,7 +17326,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 {