diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 07b6bae2d0d9f66997aadc3b43db65c4ea3e3b78..9b4d759f98403b95376613410dda3dfc813ff2a2 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2374,15 +2374,15 @@ 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(template UtTriggerPrimitive p_utRequest := m_create) runs on CseSimu return integer {
+ function f_ae_preamble_registerAe(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
var MsgIn v_request;
var integer v_localResourceIndex, v_parentIndex;
var charstring v_action := "Please, register the AE on the Tester";
- p_utRequest.to_ := f_getLocalResourceAddress(-,-,-);
- if(not(ispresent(p_utRequest.primitiveContent))) {
- p_utRequest.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-,-,-);
+ if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
+ p_utRequest.requestPrimitive.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
}
f_sendUtPrimitive(p_utRequest, v_action);
@@ -2416,7 +2416,7 @@ module OneM2M_Functions {
* @return Internal resource index of Container or -1 in case of failure
* @verdict inconc if no Container create request is received
*/
- function f_ae_preamble_createContainer(template UtTriggerPrimitive p_utRequest := m_create) runs on CseSimu return integer {
+ function f_ae_preamble_createContainer(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
@@ -2424,8 +2424,8 @@ module OneM2M_Functions {
var RequestPrimitive v_rp;
var charstring v_action := "Please, create a Container resource on the Tester";
- if(not(ispresent(p_utRequest.primitiveContent))) {
- p_utRequest.primitiveContent.container := m_contentCreateContainer;
+ if(not(ispresent(p_utRequest.requestPrimitive.primitiveContent))) {
+ p_utRequest.requestPrimitive.primitiveContent.container := m_contentCreateContainer;
}
f_sendUtPrimitive(p_utRequest, v_action);
@@ -3549,8 +3549,7 @@ module OneM2M_Functions {
if (PX_UT_IMPLEMENTED){
- p_utRequest.from_ := "UNINITIALIZED";
- p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+ p_utRequest.requestPrimitive.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
deactivate;
utPort.send(valueof(p_utRequest));
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index dc5f292b3c442245694f706d71d9d061213dc7f1..8b7f1a53aa5ea1e6e5f3afbd1037bddcf494750f 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3773,131 +3773,165 @@ module OneM2M_Templates {
group UpperTester {
template (value) UtTriggerPrimitive m_utCreate := {
- operation := int1,
- to_ := "NotInitialized",
- from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- role := omit,
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit
+ requestPrimitive := {
+ operation := int1,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ role := omit,
+ originatingTimestamp := omit,
+ requestExpirationTimestamp := omit,
+ resultExpirationTimestamp := omit,
+ operationExecutionTime := omit,
+ responseType := omit,
+ resultPersistence := omit,
+ resultContent := omit,
+ eventCategory := omit,
+ deliveryAggregation := omit,
+ groupRequestIdentifier := omit,
+ filterCriteria := omit,
+ discoveryResultType := omit
+ },
+ forcedFields := omit
};
template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
- requestIdentifier := testcasename() & "-m_utCreateAe" & f_rnd(1, 1000000),
- resourceType := int2,
- primitiveContent := {aE := m_contentAe_allOmit}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utCreateAe" & f_rnd(1, 1000000),
+ resourceType := int2,
+ primitiveContent := {aE := m_contentAe_allOmit}
+ }
}
template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
- requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
- resourceType := int3,
- primitiveContent := {container := m_contentContainer_allOmit}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
+ resourceType := int3,
+ primitiveContent := {container := m_contentContainer_allOmit}
+ }
}
template (value) UtTriggerPrimitive m_utCreateContentInstance modifies m_utCreate := {
- requestIdentifier := testcasename() & "-m_utCreateContentInstance" & f_rnd(1, 1000000),
- resourceType := int4,
- primitiveContent := {contentInstance := m_contentContentInstance_allOmit}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utCreateContentInstance" & f_rnd(1, 1000000),
+ resourceType := int4,
+ primitiveContent := {contentInstance := m_contentContentInstance_allOmit}
+ }
}
template (value) UtTriggerPrimitive m_utCreateSubscription modifies m_utCreate := {
- requestIdentifier := testcasename() & "-m_utCreateSubscription" & f_rnd(1, 1000000),
- resourceType := int23,
- primitiveContent := {subscription := m_contentSubscription}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utCreateSubscription" & f_rnd(1, 1000000),
+ resourceType := int23,
+ primitiveContent := {subscription := m_contentSubscription}
+ }
}
template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
- requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
- resourceType := int16,
- primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
+ resourceType := int16,
+ primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
+ }
}
template (value) UtTriggerPrimitive m_utRetrieve(XSD.ID p_targetResourceAddress) := {
- operation := int2,
- to_ := p_targetResourceAddress,
- from_ := "UNINITIALIZED",
- requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- role := omit,
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit
+ requestPrimitive := {
+ operation := int2,
+ to_ := p_targetResourceAddress,
+ from_ := "UNINITIALIZED",
+ requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ role := omit,
+ originatingTimestamp := omit,
+ requestExpirationTimestamp := omit,
+ resultExpirationTimestamp := omit,
+ operationExecutionTime := omit,
+ responseType := omit,
+ resultPersistence := omit,
+ resultContent := omit,
+ eventCategory := omit,
+ deliveryAggregation := omit,
+ groupRequestIdentifier := omit,
+ filterCriteria := omit,
+ discoveryResultType := omit
+ },
+ forcedFields := omit
};
template (value) UtTriggerPrimitive m_utUpdate := {
- operation := int3,
- to_ := "NotInitialized",
- from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- role := omit,
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit
+ requestPrimitive := {
+ operation := int3,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ role := omit,
+ originatingTimestamp := omit,
+ requestExpirationTimestamp := omit,
+ resultExpirationTimestamp := omit,
+ operationExecutionTime := omit,
+ responseType := omit,
+ resultPersistence := omit,
+ resultContent := omit,
+ eventCategory := omit,
+ deliveryAggregation := omit,
+ groupRequestIdentifier := omit,
+ filterCriteria := omit,
+ discoveryResultType := omit
+ },
+ forcedFields := omit
};
+ template (value) UtTriggerPrimitive m_utUpdateAe modifies m_utUpdate := {
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utUpdateContainer" & f_rnd(1, 1000000),
+ resourceType := int2,
+ primitiveContent := {aE := m_contentUpdateAe}
+ }
+ }
+
template (value) UtTriggerPrimitive m_utUpdateContainer modifies m_utUpdate := {
- requestIdentifier := testcasename() & "-m_utUpdateContainer" & f_rnd(1, 1000000),
- resourceType := int3,
- primitiveContent := {container := m_contentUpdateContainer}
+ requestPrimitive := {
+ requestIdentifier := testcasename() & "-m_utUpdateContainer" & f_rnd(1, 1000000),
+ resourceType := int3,
+ primitiveContent := {container := m_contentUpdateContainer}
+ }
}
template (value) UtTriggerPrimitive m_utDelete := {
- operation := int4,
- to_ := "NotInitialized",
- from_ := "UNINITIALIZED",
- requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- role := omit,
- originatingTimestamp := omit,
- requestExpirationTimestamp := omit,
- resultExpirationTimestamp := omit,
- operationExecutionTime := omit,
- responseType := omit,
- resultPersistence := omit,
- resultContent := omit,
- eventCategory := omit,
- deliveryAggregation := omit,
- groupRequestIdentifier := omit,
- filterCriteria := omit,
- discoveryResultType := omit
+ requestPrimitive := {
+ operation := int4,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ role := omit,
+ originatingTimestamp := omit,
+ requestExpirationTimestamp := omit,
+ resultExpirationTimestamp := omit,
+ operationExecutionTime := omit,
+ responseType := omit,
+ resultPersistence := omit,
+ resultContent := omit,
+ eventCategory := omit,
+ deliveryAggregation := omit,
+ groupRequestIdentifier := omit,
+ filterCriteria := omit,
+ discoveryResultType := omit
+ },
+ forcedFields := omit
};
template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress) modifies m_utDelete := {
- to_ := p_targetResourceAddress
+ requestPrimitive := {
+ to_ := p_targetResourceAddress
+ }
};
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index ee5cfceb033988a0f02c7809767cc7c68edc41e5..d8026b6c725b1163f924603da216334ff47a68f9 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -4151,7 +4151,10 @@ module OneM2M_Types {
encode "adapter";
}
- type RequestPrimitive UtTriggerPrimitive
+ type record UtTriggerPrimitive {
+ RequestPrimitive requestPrimitive,
+ AttributeAux_list forcedFields optional
+ }
with {
encode "UpperTester"
}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 5f479536bca76401bd7361c68fbe6f54120c993e..3e3a136df27460911b63e1e2117d0aaf774be5f6 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -48,12 +48,12 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest, v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
@@ -93,13 +93,13 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
@@ -145,12 +145,12 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -190,12 +190,12 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -247,7 +247,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
@@ -294,7 +294,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
@@ -339,12 +339,12 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -384,13 +384,13 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
@@ -429,8 +429,8 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- p_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
- p_request.to_ := p_utRequest.to_;
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -483,8 +483,8 @@ module OneM2M_PermutationFunctions {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_containerIndex := f_setLocalResource(v_localResource, int3);
- p_utRequest.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
- p_request.to_ := p_utRequest.to_;
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -524,8 +524,8 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//send triggering primitive to SUT
- p_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
- p_request.to_ := p_utRequest.to_;
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -562,7 +562,7 @@ module OneM2M_PermutationFunctions {
group Update {
- function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody, in universal charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu {
+ function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, in universal charstring p_action, template RequestPrimitive p_expectedUpdateRequest) runs on CseSimu {
//primitives for mcaPortIn
var MsgIn v_request;
@@ -577,8 +577,8 @@ module OneM2M_PermutationFunctions {
v_aeIndex := f_ae_preamble_registerAe();
//Send Trigger Message
- p_utRequestTestBody.to_ := f_getLocalResourceAddress(v_aeIndex);
- f_sendUtPrimitive(p_utRequestTestBody,p_action);
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_aeIndex);
+ f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -661,7 +661,7 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := p_resourceType;
+ v_utRequest.requestPrimitive.resourceType := p_resourceType;
f_sendUtPrimitive(v_utRequest,p_action);
//Test behavior
@@ -1730,7 +1730,7 @@ module OneM2M_PermutationFunctions {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
- v_utRequest.to_ := f_getResourceAddress();
+ v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
f_sendUtPrimitive(v_utRequest, v_action);
// Test Body
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 72fe9806e3634b6f8e9a430b25347c7faa305a29..a3911150636559d57fc4968ca7d55985e2c19c6d 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -394,8 +394,8 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
- v_requestPrimitive.to_ := v_utRequest.to_;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest, v_action);
//Test behavior
@@ -435,7 +435,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
- v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -445,8 +445,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
- v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED"
- v_createAe.primitiveContent.aE.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
+ v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
+ v_createAe.primitiveContent.aE.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -455,7 +456,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
- v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -465,7 +466,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
- v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -475,7 +476,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
- v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -485,7 +486,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
- v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -495,7 +496,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
- v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -505,7 +506,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
- v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -515,8 +516,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
- v_utRequest.primitiveContent.aE.requestReachability := true;//TODO It should be sent "UNINITIALIZED"
- v_createAe.primitiveContent.aE.requestReachability := ?;//TODO Match correct value
+ v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
+ v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
+ v_createAe.primitiveContent.aE.requestReachability := ?;//Check value other than UNINITIALIZED, done by typing
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -525,8 +527,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
- v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};//TODO It should be sent "UNINITIALIZED"
- v_createAe.primitiveContent.aE.contentSerialization := ?;//TODO Match correct value
+ v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
+ v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
+ v_createAe.primitiveContent.aE.contentSerialization := ?;//Check value other than UNINITIALIZED, done by typing
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -604,8 +607,8 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
- v_requestPrimitive.to_ := v_utRequest.to_;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
@@ -653,8 +656,8 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_containerIndex := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
- v_requestPrimitive.to_ := v_utRequest.to_;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
@@ -697,7 +700,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
- v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -706,7 +709,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
- v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -715,8 +718,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
- v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED"
- v_request.primitiveContent.contentInstance.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
+ v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.contentInstance.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -724,7 +728,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
- v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -733,7 +737,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
- v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -752,7 +756,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
- v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -761,8 +765,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
- v_utRequest.primitiveContent.container.maxNrOfInstances := 1;//TODO It should be "UNINITIALIZED"
- v_request.primitiveContent.container.maxNrOfInstances := ?;//TODO It should be "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
+ v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -770,8 +775,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
- v_utRequest.primitiveContent.container.maxByteSize := 1;//TODO It should be "UNINITIALIZED"
- v_request.primitiveContent.container.maxByteSize := ?;//TODO It should be "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
+ v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -779,8 +785,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
- v_utRequest.primitiveContent.container.maxInstanceAge := 1;//TODO It should be "UNINITIALIZED"
- v_request.primitiveContent.container.maxInstanceAge := ?;//TODO It should be "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
+ v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -788,7 +795,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
- v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -797,7 +804,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
- v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -806,8 +813,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
- v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED";
- v_request.primitiveContent.container.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
+ v_utRequest.forcedFields := {{name := "expirationTime", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.expirationTime := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -815,7 +823,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
- v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -824,7 +832,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
- v_utRequest.primitiveContent.container.creator := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -845,9 +853,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_expectedUpdateRequestAe;
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
- v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
+ v_utRequest.requestPrimitive.primitiveContent.aE.expirationTime := "20301231T012345";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.expirationTime := ?;
@@ -857,10 +865,10 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
- v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
@@ -872,10 +880,10 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_APN() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
- v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
@@ -886,13 +894,13 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_POA() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
- v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := ?;//TODO Check value other than "UNINITIALIZED"
+ v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED", *});
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -900,10 +908,10 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_OR() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
- v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
@@ -914,10 +922,10 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_NL() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
- v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
@@ -927,28 +935,30 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_UPD_001_RR() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
- v_utRequest.primitiveContent.aE.requestReachability := true;//It should sent "UNINITIALIZED"
-
+ v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
+ v_utRequest.forcedFields := {{name := "requestReachability", value_ := "UNINITIALIZED"}};
+
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//TODO Check value other than "UNINITIALIZED"
+ v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
var template RequestPrimitive v_expectedUpdateRequestAe;
- var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
+ var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
- v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};//It should sent "UNINITIALIZED"
-
+ v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
+ v_utRequest.forcedFields := {{name := "contentSerialization", value_ := "UNINITIALIZED"}};
+
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//TODO Check value other than "UNINITIALIZED"
+ v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//Check value other than "UNINITIALIZED", done by typing
- f_AE_DMR_UPD_001(v_utRequestTestBody,v_action, v_expectedUpdateRequestAe);
+ f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
}//End of subgroup AE_DMR_UPD_001
@@ -965,8 +975,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
v_request.primitiveContent.container.expirationTime := ?;
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -977,8 +987,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -989,9 +999,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxNrOfInstances := 1;//TODO It should be sent "UNINITIALIZED"
- v_request.primitiveContent.container.maxNrOfInstances := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
+ v_utRequest.forcedFields := {{name := "maxNrOfInstances", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxNrOfInstances := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1001,9 +1012,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxByteSize := 1;//TODO It should be sent "UNINITIALIZED"
- v_request.primitiveContent.container.maxByteSize := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
+ v_utRequest.forcedFields := {{name := "maxByteSize", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxByteSize := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1013,9 +1025,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxInstanceAge := 1;//TODO It should be sent "UNINITIALIZED"
- v_request.primitiveContent.container.maxInstanceAge := ?;//TODO Check value other than "UNINITIALIZED"
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
+ v_utRequest.forcedFields := {{name := "maxInstanceAge", value_ := "UNINITIALIZED"}};
+ v_request.primitiveContent.container.maxInstanceAge := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1072,13 +1085,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameOldest;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameOldest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_ ))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
@@ -1123,13 +1136,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameLatest;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameLatest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
@@ -1174,13 +1187,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
@@ -1225,13 +1238,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
v_auxInteger := f_setLocalResource(v_localResource, int4);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
@@ -1280,13 +1293,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameOldest;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameOldest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
@@ -1331,13 +1344,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameLatest;
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger) & "/" & c_resourceShortNameLatest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
@@ -1382,13 +1395,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
@@ -1433,13 +1446,13 @@ module OneM2M_Testcases_AE_Release_1 {
//send triggering primitive to SUT
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
v_auxInteger := f_setLocalResource(v_localResource, int4);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_ ))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_ ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
@@ -1485,7 +1498,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -1530,9 +1543,9 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1546,14 +1559,15 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_requestT := mw_createSubscription;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";//TODO It should be sent "UNINITIALIZED";
-
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
+ v_utRequest.forcedFields := {{name := "createdBefore", value_ := "UNINITIALIZED"}};
+
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
- v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;//TODO Check value other than "UNINITIALIZED"
+ v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1564,13 +1578,14 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.expirationCounter := 1;//TODO It should be sent "UNINITIALIZED"
-
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
+ v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
+
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
- v_requestT.primitiveContent.subscription.expirationCounter := ?;//TODO Check value other than "UNINITIALIZED"
+ v_requestT.primitiveContent.subscription.expirationCounter := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1581,9 +1596,9 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1598,13 +1613,14 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.notificationContentType := int1;//TODO It should be "UNINITIALIZED"
-
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
+ v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
+
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
- v_requestT.primitiveContent.subscription.notificationContentType := ?;//TODO Check value other than "UNINITIALIZED"
+ v_requestT.primitiveContent.subscription.notificationContentType := ?;//Check value other than "UNINITIALIZED", done by typing
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1615,13 +1631,14 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//TODO It should be sent "UNINITIALIZE"
-
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
+ v_utRequest.forcedFields := {{name := "alt_1", value_ := "UNINITIALIZED"}};
+
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
- v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//TODO Check value other than "UNINITIALIZED"
+ v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//Check value other than "UNINITIALIZED", done by typing
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1632,9 +1649,9 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
@@ -1662,7 +1679,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -1692,7 +1709,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress();
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -1753,7 +1770,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_cf03Up();
@@ -1783,7 +1800,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress();
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 2c6aa4a3ef228f7b45e45f0d8107f3b20f543039..1b0cc4b1339625fbe58f1d47b3af855a0dc766e8 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -1633,7 +1633,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
- v_utRequest.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
v_request.primitiveContent.remoteCSE.resourceName := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -1642,7 +1642,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
- v_utRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
v_request.primitiveContent.remoteCSE.expirationTime := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -1651,7 +1651,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
- v_utRequest.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
v_request.primitiveContent.remoteCSE.labels := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -1660,7 +1660,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
- v_utRequest.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -1669,7 +1669,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
- v_utRequest.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
v_request.primitiveContent.remoteCSE.nodeLink := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -1678,7 +1678,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
- v_utRequest.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
+ v_utRequest.requestPrimitive.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
v_request.primitiveContent.remoteCSE.cseType := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
}
@@ -2314,8 +2314,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Send Trigger Message
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
- v_utRequest.from_ := "UNINITIALIZED";
- f_sendUtPrimitive(v_utRequest, v_action);
+ f_sendUtPrimitive(v_utRequest, v_action);
tc_ac.start;
alt {
@@ -2767,8 +2766,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Send Trigger Message
v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,-,-))), int16);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
- v_utRequest.from_ := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.to_ := f_getResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest, v_action);
// Test Body