diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 2bfda7718bb832d04ffb1ecf7110850be114cdec..938b5f04ca5d4b87db8745178128e66cfbccbc72 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -39,7 +39,7 @@ module OneM2M_Functions {
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf01());
+ vc_a_cse := activate(a_cse_cf01());
// Initialize AE2
if(p_auxiliaryAe2Required) {
@@ -88,7 +88,7 @@ module OneM2M_Functions {
map(self:utPort, system:utPort);
}
activate(a_default());
- activate(a_cse_cf02_ae1());
+ vc_a_cse := activate(a_cse_cf02_ae1());
vc_cse1.start(f_cf02UpCse1());
vc_cse1.done;
@@ -142,7 +142,7 @@ module OneM2M_Functions {
map(self:mccPortIn, system:mccPortIn);
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf02_cse1());
+ vc_a_cse := activate(a_cse_cf02_cse1());
vc_ae1.start(f_cf02UpAe1());
vc_ae1.done;
@@ -192,7 +192,7 @@ module OneM2M_Functions {
map(self:utPort, system:utPort);
}
activate(a_default());
- activate(a_ae_cf03());
+ vc_a_ae := activate(a_ae_cf03());
// Connect
@@ -219,7 +219,7 @@ module OneM2M_Functions {
map(self:mccPortIn, system:mccPortIn);
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf04());
+ vc_a_cse := activate(a_cse_cf04());
// Connect
@@ -1667,23 +1667,23 @@ module OneM2M_Functions {
if (ischosen(p_primitiveContent.aE)){
log("Representation contains AE resource representation");
- if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE)) {
+ if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE)) {
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.aE, p_primitiveContent.aE);
log("Expected primitiveContent");
}
- else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) {
+ else if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE)) {
v_matchResult :=match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE);
}
- else if (ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification)) {
+ else if (isvalue(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list)) {
v_matchResult := true;
v_numberOfAggregatedNotification := lengthof(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list);
for(i := 0; i< v_numberOfAggregatedNotification; i := i + 1){
- if(ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource)) {
+ if(isvalue(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource.aE)) {
if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.resource.aE, p_primitiveContent.aE))){
v_matchResult := false;
}
}
- else if(ischosen(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive)) {
+ else if(isvalue(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE)) {
if(not (match(p_requestPrimitive.primitiveContent.aggregatedNotification.notification_list[i].notificationEvent.representation.responsePrimitive.primitiveContent.aE, p_primitiveContent.aE))){
v_matchResult := false;
}
@@ -1697,10 +1697,10 @@ module OneM2M_Functions {
}
if (ischosen(p_primitiveContent.container)){
- if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container)) {
+ if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container)) {
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.resource.container, p_primitiveContent.container)
}
- else if(ischosen(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive)) {
+ else if(isvalue(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container)) {
v_matchResult := match(p_requestPrimitive.primitiveContent.notification.notificationEvent.representation.responsePrimitive.primitiveContent.container, p_primitiveContent.container)
}
}
@@ -2357,12 +2357,20 @@ module OneM2M_Functions {
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value v_request {
//Send response
- v_responsePrimitive := valueof(m_responseNotification(int2001, omit));
+ v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
mcaPortIn.send(m_response(v_responsePrimitive));
log(__SCOPE__&": WARNING: Unexpected Notification message received");
repeat;
}
+ [] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value v_request {
+ //Send response
+ v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
+ v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
+ log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received");
+ repeat;
+ }
}
/**
@@ -2520,16 +2528,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 PrimitiveContent v_modifiedResource;
- var integer v_resourceIndex, v_parentIndex;
- var RequestPrimitive v_rp;
+ var integer v_localResourceIndex, v_parentIndex;
var charstring v_action := "Please, register the AE on the Tester";
-
- 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);
@@ -2539,18 +2546,10 @@ module OneM2M_Functions {
[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
tc_ac.stop;
- v_rp := v_request.primitive.requestPrimitive;
- v_parentIndex := f_getResourceIndex(v_rp.to_);
- v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
- v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
- if(v_resourceIndex != -1) {
- mcaPortIn.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
- setverdict(pass, __SCOPE__&":INFO: Application registered successfuly");
- }
- else {
- mcaPortIn.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
- setverdict(inconc, __SCOPE__&":INFO: AE registration failed");
- }
+ v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
+
+ mcaPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+
}
[] tc_ac.timeout {
@@ -2561,7 +2560,7 @@ module OneM2M_Functions {
f_checkCseSimuStatus();
- return v_resourceIndex;
+ return v_localResourceIndex;
}//end function f_ae_preamble_register
@@ -2571,7 +2570,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;
@@ -2579,8 +2578,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);
@@ -2677,7 +2676,7 @@ module OneM2M_Functions {
// Error
return p_resource;
}
-
+
} // end helpingFunctions
group altstepFunctions {
@@ -3260,7 +3259,7 @@ module OneM2M_Functions {
* @return Resource address for the given resource
* @verdict
*/
- function f_getLocalResourceAddress(integer p_targetResourceIndex := -1, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
+ function f_getLocalResourceAddress(integer p_targetResourceIndex := 0, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
var XSD.ID v_resourceAddress;
if(p_primitiveScope == e_cseRelative) {
@@ -3352,7 +3351,7 @@ module OneM2M_Functions {
* @return Internal resource index of the saved resource
* @verdict
*/
- function f_setLocalResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer p_parentIndex := -1) runs on CseSimu return integer {
+ function f_setLocalResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer p_parentIndex) runs on CseSimu return integer {
var integer v_newIndex := -1;
if(isbound(vc_localResourcesList)) {
vc_localResourcesList[lengthof(vc_localResourcesList)] := {p_parentIndex, p_resourceType, p_resource};
@@ -3450,6 +3449,35 @@ module OneM2M_Functions {
} // end f_getAnnouncedResourceType
+
+ /**
+ * @desc Proccessing of the request primitive
+ * @param p_request Request primitive to be processed
+ * @return p_response Response primitive to be sent back
+ */
+ function f_processCreateRequestPrimitive(in RequestPrimitive p_request) runs on CseSimu return integer {
+ var integer v_parentIndex := -1;
+ var integer v_localResourceIndex := -1;
+ var PrimitiveContent v_localResource;
+
+ v_parentIndex := f_getResourceIndex(p_request.to_);
+ if(v_parentIndex == -1) {
+ setverdict(inconc,__SCOPE__&": ERROR: Target resource not found");
+ vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
+
+ } else {
+ setverdict(pass, __SCOPE__&":INFO: Resource created successfuly");
+ v_localResource := f_ae_generateLocalResource(p_request.primitiveContent, v_parentIndex, p_request.resourceType);
+ v_localResourceIndex := f_setLocalResource(v_localResource, p_request.resourceType, v_parentIndex);
+
+ vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
+ vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_localResourceIndex].resource;
+ }
+ vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
+ vc_response.primitive.responsePrimitive.to_ := p_request.from_;
+
+ return v_localResourceIndex;
+ }
}//end group getSetFunctions
@@ -3675,9 +3703,9 @@ 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));
tc_wait.start;
@@ -3694,7 +3722,21 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
-
+
+ activate(a_default());
+ if(vc_config == e_cf01) {
+ vc_a_cse := activate(a_cse_cf01());
+ } else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
+ if(vc_testSystemRole == e_ae) {
+ vc_a_cse := activate(a_cse_cf02_ae1());
+ } else if (vc_testSystemRole == e_cse) {
+ vc_a_cse := activate(a_cse_cf02_cse1());
+ }
+ } else if (vc_config == e_cf03) {
+ vc_a_ae := activate(a_ae_cf03());
+ } else if (vc_config == e_cf04) {
+ vc_a_cse := activate(a_cse_cf04());
+ }
}else{
action(p_action);
diff --git a/LibOneM2M/OneM2M_Pics.ttcn b/LibOneM2M/OneM2M_Pics.ttcn
index 2b4a6cd68159cbf29eb702860e1210b4b8a1172e..106a24ee341fa525210d276dac077e2df44f4462 100644
--- a/LibOneM2M/OneM2M_Pics.ttcn
+++ b/LibOneM2M/OneM2M_Pics.ttcn
@@ -18,24 +18,38 @@ module OneM2M_Pics {
* @see oneM2M TS-0017 A.5.5.1/1
*/
modulepar boolean PICS_ACP_SUPPORT := true;
+
+ /**
+ * @desc Node role
+ * @see oneM2M TS-0017 A.5.1.2
+ */
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_MN_CSE := true;
modulepar boolean PICS_ASN_CSE := true;
+
+ /**
+ * @desc Resource Addressing methods
+ * @see oneM2M TS-0017 A.5.2.1
+ */
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
-
modulepar boolean PICS_PRIMITIVE_SCOPE_CSE_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
group ResourceOptionalAttributes {
- //AccessControlPolicy optional attributes
-
+ /**
+ * @desc Optional attributes of AccessControlPolicy resource
+ * @see oneM2M TS-0017 A.5.7.4
+ */
group AccessControlPolicyOptionalAttributes {
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
}
- //AE optional attributes
+ /**
+ * @desc Optional attributes of AE resource
+ * @see oneM2M TS-0017 A.5.7.3
+ */
group AeOptionalAttributes {
modulepar boolean PICS_AE_LBL := true;
modulepar boolean PICS_AE_APN := true;
@@ -45,8 +59,11 @@ module OneM2M_Pics {
modulepar boolean PICS_AE_OR := true;
modulepar boolean PICS_AE_ACPI := true;
}
- //Container optional attributes
- group ContainerOptionalAttributes {
+ /**
+ * @desc Optional attributes of Container resource
+ * @see oneM2M TS-0017 A.5.7.5
+ */
+ group ContainerOptionalAttributes {
modulepar boolean PICS_CNT_ACPI := true;
modulepar boolean PICS_CNT_MNI := true;
modulepar boolean PICS_CNT_MBS := true;
@@ -58,7 +75,10 @@ module OneM2M_Pics {
modulepar boolean PICS_CNT_LBL := true;
modulepar boolean PICS_CNT_CR := true;
}
- //ContentInstance optional attributes
+ /**
+ * @desc Optional attributes of ContentInstance resource
+ * @see oneM2M TS-0017 A.5.7.6
+ */
group ContentInstanceOptionalAttributes {
modulepar boolean PICS_CIN_CNF := true;
modulepar boolean PICS_CIN_RN := true;
@@ -67,19 +87,28 @@ module OneM2M_Pics {
modulepar boolean PICS_CIN_CR := true;
modulepar boolean PICS_CIN_OR := true;
}
- //CSEBase optional attributes
+ /**
+ * @desc Optional attributes of CSEBase resource
+ * @see oneM2M TS-0017 A.5.7.1
+ */
group CSEBaseOptionalAttributes {
modulepar boolean PICS_CB_CST := true;
modulepar boolean PICS_CB_NL := true;
}
- //Group optional attributes
+ /**
+ * @desc Optional attributes of group resource
+ * @see oneM2M TS-0017 A.5.7.8
+ */
group GroupOptionalAttributes {
modulepar boolean PICS_GRP_LBL := true;
modulepar boolean PICS_GRP_GN := true;
modulepar boolean PICS_GRP_ACPI := true;
modulepar boolean PICS_GRP_MACP := true;
}
- //RemoteCSE optional attributes
+ /**
+ * @desc Optional attributes of remoteCSE resource
+ * @see oneM2M TS-0017 A.5.7.2
+ */
group RemoteCSEOptionalAttributes {
modulepar boolean PICS_CSR_LBL := true;
modulepar boolean PICS_CSR_CST := true;
@@ -89,7 +118,10 @@ module OneM2M_Pics {
modulepar boolean PICS_CSR_ET := true;
modulepar boolean PICS_CSR_RR := true;
}
- //Subscription optional attributes
+ /**
+ * @desc Optional attributes of AE resource
+ * @see oneM2M TS-0017 A.5.7.7
+ */
group SubscriptionOptionalAttributes {
modulepar boolean PICS_SUB_ACPI := true;
modulepar boolean PICS_SUB_ENC := true;
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 691c0dffae8d8b08a5e7c2b54b3437b38f854945..5549f3f1566535e89f134e59cc67f2d61ab3b759 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -21,14 +21,29 @@ module OneM2M_Pixits {
group IutParameters {
+ /**
+ * @desc IUT CSE IN role
+ */
modulepar boolean PX_IN_CSE := true;
-
+
+ /**
+ * @desc IUT CSE MN role
+ */
modulepar boolean PX_MN_CSE := false;
-
+
+ /**
+ * @desc IUT CSE ASN role
+ */
modulepar boolean PX_ASN_CSE:= false;
+ /**
+ * @desc IUT IP address and port
+ */
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
+ /**
+ * @desc IUT Upper Tester interface support
+ */
modulepar boolean PX_UT_IMPLEMENTED := false;
/**
@@ -60,42 +75,86 @@ module OneM2M_Pixits {
* @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
-
+
+ /**
+ * @desc Allowed AE-IDs starting with C
+ */
modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C-AllowedAeId"};
-
+
+ /**
+ * @desc Not allowed AE-IDs starting with C
+ */
modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"C-NotAllowedAeId"};
-
+
+ /**
+ * @desc Allowed AE-IDs starting with S
+ */
modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S-AllowedAeId"};
+ /**
+ * @desc Not allowed AE-IDs starting with S
+ */
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
+ /**
+ * @desc Not allowed App-ID
+ */
modulepar XSD.ID PX_NOT_ALLOWED_APP_ID := "NotAllowedAppId";
+ /**
+ * @desc Addressing method to use during test execution
+ */
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+ /**
+ * @desc Primitive scope to use during test execution
+ */
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
+ /**
+ * @desc Serialization to use during test execution
+ */
modulepar charstring PX_SERIALIZATION := "XML";
+ /**
+ * @desc Protocolo binding to use during test execution
+ */
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
+ /**
+ * @desc Namespace composed of "prefix" = "xml namespace" to use during test execution
+ */
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
+ /**
+ * @desc Character to indicate "all originators" for AccessControlOriginators element
+ */
modulepar ListOfURIs PX_ACOR := {"all"};
+ /**
+ * @desc Time given for configuring IUT when required (i.e. when UT not implemented)
+ */
modulepar float PX_TCONFIG_IUT := 10.0;
}
group TesterParameters {
+ /**
+ * @desc AE1 IP address and listening port
+ */
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141";
+ /**
+ * @desc AE2 IP address and listening port
+ */
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142";
+ /**
+ * @desc CSE1 IP address and listening port
+ */
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:4141";
-
/**
* @desc Test System CSE1 Name
*/
@@ -140,8 +199,14 @@ module OneM2M_Pixits {
group ExecutionParameters {
+ /**
+ * @desc Resources to be deleted by TC_DELETE_RESOURCES
+ */
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
+ /**
+ * @desc To enable run postamble (for debugging)
+ */
modulepar boolean PX_RUN_POSTAMBLE := true;
}
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index a1d16c1a5145597b258864380a19106b0b636396..21a305b6179a97e3966d062dca9b9af73a998299 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -124,7 +124,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -154,7 +156,9 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenRequestIndicator := *
+ tokenRequestIndicator := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
/**
@@ -185,7 +189,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -217,7 +223,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -426,7 +434,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
@@ -453,7 +463,9 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenRequestIndicator := *
+ tokenRequestIndicator := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
/**
@@ -485,7 +497,6 @@ module OneM2M_Templates {
* @desc Base Reception template for update Container
*/
template RequestPrimitive mw_updateContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
- resourceType := int3,
primitiveContent := {container := ?}
};
@@ -624,7 +635,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
@@ -654,7 +667,9 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenRequestIndicator := *
+ tokenRequestIndicator := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
}
/**
@@ -800,6 +815,15 @@ module OneM2M_Templates {
resourceType := int3,
primitiveContent := {container := m_contentCreateContainer}
};
+
+ /**
+ * @desc Base CREATE request primitive for Container resource using Container_update_invalid
+ */
+ template (value) RequestPrimitive m_createContainerBaseInvalid modifies m_create := {
+ requestIdentifier := testcasename() & "-m_createContainer",
+ resourceType := int3,
+ primitiveContent := {container_update_invalid := m_contentCreateContainerInvalid}
+ };
/**
* @desc Base CREATE request primitive for remoteCSE resource
@@ -1059,7 +1083,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
- primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 *"}})}
+ primitiveContent := {schedule := m_contentCreateSchedule ({{"1,2,3,0-5/4,*/8 10,10-11/8 */9 * * 0,4-5/3 2000-2007/8,2000-2000/9,2500-2000/3,2000"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
@@ -1239,7 +1263,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
template RequestPrimitive mw_delete(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
@@ -1265,7 +1291,9 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenRequestIndicator := *
+ tokenRequestIndicator := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
}//end group Delete
@@ -1298,7 +1326,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -1327,7 +1357,9 @@ module OneM2M_Templates {
tokens := omit,
tokenIDs := omit,
localTokenIDs := omit,
- tokenRequestIndicator := omit
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -1356,7 +1388,9 @@ module OneM2M_Templates {
tokens := *,
tokenIDs := *,
localTokenIDs := *,
- tokenRequestIndicator := *
+ tokenRequestIndicator := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
/**
@@ -1432,6 +1466,7 @@ module OneM2M_Templates {
requestReachability := true,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
+ supportedReleaseVersions := {"2a"}, //M
choice := omit//NP
};
@@ -1463,6 +1498,7 @@ module OneM2M_Templates {
requestReachability := *,//OA
contentSerialization := *,//OA
e2eSecInfo := ?, //MA
+ supportedReleaseVersions := ?, //MA
choice := omit//NA
};
@@ -1523,6 +1559,7 @@ module OneM2M_Templates {
requestReachability := true,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O
+ supportedReleaseVersions := {"2a"}, //M
choice := omit//NP
};
@@ -1621,6 +1658,7 @@ module OneM2M_Templates {
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
+ supportedReleaseVersions := {"2a"},
choice := omit
};
@@ -2069,7 +2107,38 @@ module OneM2M_Templates {
};
/**
- * @desc Base primitiveContent for CREATE operation for Container resource
+ * @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
+ * @param p_name Resource name
+ */
+ template (value) Container_update_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
+ resourceName := p_name,//O
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ expirationCounter := omit,//Field not existing in container resource
+ labels := omit,//O
+ accessControlPolicyIDs := omit,//O
+ expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit,//O
+ announceTo := omit,//O
+ announcedAttribute := omit,//O
+ stateTag := omit,//NP
+ creator := omit,//O
+ maxNrOfInstances := omit,//O
+ maxByteSize := omit,//O
+ maxInstanceAge := omit,//O
+ currentNrOfInstances := omit,//NP
+ currentByteSize := omit,//NP
+ locationID := omit,//O
+ ontologyRef := omit,//O
+ disableRetrieval := omit,//O
+ choice := omit//NP
+ };
+
+ /**
+ * @desc Base primitiveContent for CREATE operation for RemoteCSE resource
* @param p_name Resource name
*/
template (value) RemoteCSE_optional m_contentCreateRemoteCSE (in template (omit) XSD.String p_name := c_defaultRemoteCSEResourceName, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.AnyURI p_cSEBase := PX_CSE1_ID, in template (omit) XSD.ID p_cSE_ID := PX_CSE1_ID):= {
@@ -2095,6 +2164,7 @@ module OneM2M_Templates {
nodeLink := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
+ supportedReleaseVersions := {"2a"}, //M
choice := omit//O
};
@@ -2213,6 +2283,9 @@ module OneM2M_Templates {
subscriptionReference := p_subReference,
creator := omit,
notificationForwardingURI := p_notifForwardingURI,
+ notificationTarget := omit,
+ targetRemovalRequest := omit,
+ targetRemovalAllowance := omit,
iPEDiscoveryRequest := omit
};
@@ -2230,6 +2303,9 @@ module OneM2M_Templates {
subscriptionReference := omit,
creator := omit,
notificationForwardingURI := omit,
+ notificationTarget := omit,
+ targetRemovalRequest := omit,
+ targetRemovalAllowance := omit,
iPEDiscoveryRequest := omit
};
/**
@@ -2397,6 +2473,7 @@ module OneM2M_Templates {
requestReachability := omit,//O
contentSerialization := omit,//O
e2eSecInfo := omit, //O
+ supportedReleaseVersions := {"2a"},//M
choice := omit//NP
};
@@ -2473,6 +2550,7 @@ module OneM2M_Templates {
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := omit,
+ supportedReleaseVersions := {"2a"},//M
choice := omit
};
@@ -2659,6 +2737,7 @@ module OneM2M_Templates {
nodeLink := omit,
triggerReferenceNumber := omit,
e2eSecInfo := omit,
+ supportedReleaseVersions := omit,//M
choice := omit
}
@@ -2683,6 +2762,7 @@ module OneM2M_Templates {
requestReachability := omit,
contentSerialization := omit,
e2eSecInfo := omit,
+ supportedReleaseVersions := omit,
choice := omit
}
@@ -2793,6 +2873,7 @@ module OneM2M_Templates {
requestReachability := ?,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
+ supportedReleaseVersions := omit,//M
choice := *//O
};
@@ -2818,6 +2899,7 @@ module OneM2M_Templates {
requestReachability := omit,//M
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
+ supportedReleaseVersions := omit,//M
choice := omit//O
};
@@ -2843,6 +2925,7 @@ module OneM2M_Templates {
requestReachability := *,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
+ supportedReleaseVersions := ?,//M
choice := *//O
};
@@ -3198,6 +3281,7 @@ module OneM2M_Templates {
nodeLink := omit,//O
triggerReferenceNumber := omit,//O
e2eSecInfo := omit,//O
+ supportedReleaseVersions := omit,//M
choice := omit//O
};
@@ -3234,6 +3318,7 @@ module OneM2M_Templates {
nodeLink := *,//O
triggerReferenceNumber := *,//O
e2eSecInfo := *,//O
+ supportedReleaseVersions := ?,//M
choice := *//O
};
@@ -3715,6 +3800,9 @@ module OneM2M_Templates {
subscriptionReference := omit,
creator := omit,
notificationForwardingURI := omit,
+ notificationTarget := omit,
+ targetRemovalRequest := omit,
+ targetRemovalAllowance := omit,
iPEDiscoveryRequest := omit
};
@@ -3725,6 +3813,9 @@ module OneM2M_Templates {
subscriptionReference := *,
creator := *,
notificationForwardingURI := *,
+ notificationTarget := *,
+ targetRemovalRequest := *,
+ targetRemovalAllowance := *,
iPEDiscoveryRequest := *
};
@@ -3736,6 +3827,9 @@ module OneM2M_Templates {
subscriptionReference := *,//M //TODO Put it back to ? subscriptionReference is mandatory
creator := *,//O
notificationForwardingURI := *,//O
+ notificationTarget := *,
+ targetRemovalRequest := *,
+ targetRemovalAllowance := *,
iPEDiscoveryRequest := *//O
};
@@ -3790,6 +3884,7 @@ module OneM2M_Templates {
nodeLink := *,//O
dynamicAuthorizationConsultationIDs := omit,
e2eSecInfo := *,//O
+ supportedReleaseVersions := ?,//M
choice := *//O
};
@@ -3824,6 +3919,7 @@ module OneM2M_Templates {
requestReachability := omit,//M
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
+ supportedReleaseVersions := {"2a"},//M
choice := omit//O
};
@@ -3849,6 +3945,7 @@ module OneM2M_Templates {
requestReachability := omit,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
+ supportedReleaseVersions := {"2a"},//M
choice := *//O
};
@@ -4028,7 +4125,9 @@ module OneM2M_Templates {
contentStatus := omit,
contentOffset := omit,
assignedTokenIdentifiers := omit,
- tokenRequestInformation := omit
+ tokenRequestInformation := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
/**
@@ -4056,7 +4155,10 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
+
};
template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
@@ -4071,7 +4173,10 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
+
};
template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
@@ -4086,7 +4191,9 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
template ResponsePrimitive mw_responsePrimitiveKO := {
@@ -4101,7 +4208,9 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
@@ -4116,7 +4225,9 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,
+ vendorInformation := *
};
template ResponsePrimitive m_responseNotification(ResponseStatusCode p_statusCode, in template(omit) PrimitiveContent p_notification := omit) := {
@@ -4131,7 +4242,9 @@ module OneM2M_Templates {
contentStatus := omit,
contentOffset := omit,
assignedTokenIdentifiers := omit,
- tokenRequestInformation := omit
+ tokenRequestInformation := omit,
+ releaseVersionIndicator := "2a",
+ vendorInformation := omit
};
group InfoPortTemplates {
@@ -4145,142 +4258,189 @@ module OneM2M_Templates {
group UpperTester {
template (value) UtTriggerPrimitive m_utCreate := {
- operation := int1,
- to_ := "NotInitialized",
- from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- roleIDs := 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,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := omit,
- tokenRequestIndicator := omit
+ requestPrimitive := {
+ operation := int1,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ roleIDs := 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,
+ tokens := omit,
+ tokenIDs := omit,
+ localTokenIDs := omit,
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",//FIXME
+ vendorInformation := omit
+ },
+ forcedFields := omit
};
+ template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
+ 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_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
- operation := int2,
- to_ := p_targetResourceAddress,
- from_ := p_originator,
- requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- roleIDs := 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,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := omit,
- tokenRequestIndicator := omit
+ template (value) UtTriggerPrimitive m_utRetrieve(XSD.ID p_targetResourceAddress) := {
+ requestPrimitive := {
+ operation := int2,
+ to_ := p_targetResourceAddress,
+ from_ := "UNINITIALIZED",
+ requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ roleIDs := omit,
+ originatingTimestamp := omit,
+ requestExpirationTimestamp := omit,
+ resultExpirationTimestamp := omit,
+ operationExecutionTime := omit,
+ responseType := omit,
+ resultPersistence := omit,
+ resultContent := omit,
+ eventCategory := omit,
+ filterCriteria := omit,
+ deliveryAggregation := omit,
+ groupRequestIdentifier := omit,
+ discoveryResultType := omit,
+ tokens := omit,
+ tokenIDs := omit,
+ localTokenIDs := omit,
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",//FIXME
+ vendorInformation := omit
+ },
+ forcedFields := omit
};
template (value) UtTriggerPrimitive m_utUpdate := {
- operation := int3,
- to_ := "NotInitialized",
- from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- roleIDs := 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,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := omit,
- tokenRequestIndicator := omit
+ requestPrimitive := {
+ operation := int3,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ roleIDs := 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,
+ tokens := omit,
+ tokenIDs := omit,
+ localTokenIDs := omit,
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",//FIXME
+ vendorInformation := 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_utDeleteRequest := {
- operation := int4,
- to_ := "NotInitialized",
- from_ := "NotInitialized",
- requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- roleIDs := 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,
- tokens := omit,
- tokenIDs := omit,
- localTokenIDs := omit,
- tokenRequestIndicator := omit
+ template (value) UtTriggerPrimitive m_utDelete := {
+ requestPrimitive := {
+ operation := int4,
+ to_ := "NotInitialized",
+ from_ := "UNINITIALIZED",
+ requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
+ roleIDs := 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,
+ tokens := omit,
+ tokenIDs := omit,
+ localTokenIDs := omit,
+ tokenRequestIndicator := omit,
+ releaseVersionIndicator := "2a",//FIXME
+ vendorInformation := omit
+ },
+ forcedFields := omit
};
- template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_utDeleteRequest := {
- to_ := p_targetResourceAddress,
- from_ := p_originator
+ template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress) modifies m_utDelete := {
+ requestPrimitive := {
+ to_ := p_targetResourceAddress
+ }
};
@@ -4297,7 +4457,10 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,//FIXME
+ vendorInformation := *
+
}
template UtTriggerAckPrimitive mw_utResponseKO := {
@@ -4312,7 +4475,9 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,//FIXME
+ vendorInformation := *
}
@@ -4328,7 +4493,9 @@ module OneM2M_Templates {
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
- tokenRequestInformation := *
+ tokenRequestInformation := *,
+ releaseVersionIndicator := ?,//FIXME
+ vendorInformation := *
}
}
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 920cbb3da0a89f0d702be1ffd654542925e3ee0f..916183ef8fa5a118c8aa8671b0b294ac16813ccb 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -40,6 +40,8 @@ module OneM2M_TestSystem {
var AccessControlPolicy_optional vc_acpAux;
var MsgIn vc_request;
var MsgIn vc_response;
+ var default vc_a_ae := null;
+ var default vc_a_cse := null;
};
type component AeSimu extends Tester {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 6e155537f6632af6393ceb9791a2a1cbb4c50198..099a05bfb707f60c20b943edeb5013abfaee4db6 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -28,7 +28,7 @@ type record AccessControlPolicy
Labels labels optional,
Timestamp expirationTime,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
SetOfAcrs privileges,
SetOfAcrs selfPrivileges,
union {
@@ -98,7 +98,7 @@ type record ActiveCmdhPolicy
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -126,7 +126,7 @@ type record AE
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.String appName optional,
XSD.String app_ID,
XSD.ID aE_ID,
@@ -136,6 +136,7 @@ type record AE
XSD.Boolean requestReachability,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -191,6 +192,7 @@ type record AEAnnc
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -725,7 +727,7 @@ type record AreaNwkDeviceInfo
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -809,7 +811,7 @@ type record AreaNwkInfo
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -883,7 +885,7 @@ type record Battery
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -957,7 +959,7 @@ type record CmdhBuffer
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -987,7 +989,7 @@ type record CmdhDefaults
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1017,7 +1019,7 @@ type record CmdhDefEcValue
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1052,7 +1054,7 @@ type record CmdhEcDefParamValues
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1087,7 +1089,7 @@ type record CmdhLimits
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1134,7 +1136,7 @@ type record CmdhNetworkAccessRules
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1165,7 +1167,7 @@ type record CmdhNwAccessRule
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1198,7 +1200,7 @@ type record CmdhPolicy
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1345,7 +1347,13 @@ with {
};
-type record length(1 .. infinity) of XSD.String PoaList
+type XSD.AnyURI PointOfAccess //TODO fixme (pattern "(http|HTTP|coap|COAP|mqtt|MQTT|ws|WS)(s|S)#(0,1)://[\w/!#$\^_.+\q{0, 0, 0, 38}&\-:;=]+")
+with {
+ variant "name as uncapitalized";
+};
+
+
+type record length(1 .. infinity) of PointOfAccess PoaList
with {
variant "name as uncapitalized";
variant "list";
@@ -1489,7 +1497,9 @@ with {
};
-type XSD.String ScheduleEntry //FIXME To be fixed (pattern "(([*]|[1-5]#(0,1)\d([,-/][1-5]#(0,1)\d)*)[\q{0,0,0,20}\q{0,0,0,10}\t\r]+)#(2)([*]|((1#(0,1)\d|2[0-3])([,-/](1#(0,1)\d|2[0-3]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1\d|2\d|3[01])([,-/]([1-9]|1\d|2\d|3[01]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|(([1-9]|1[0-2])([,-/]([1-9]|1[0-2]))*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([0-6]([,-/][0-6])*))[\q{0,0,0,20}\q{0,0,0,10}\t\r]+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]#(0,1)[\d]#(0,1)[\d]#(0,1)[\d])#(0,1))*))")
+type XSD.String ScheduleEntry (pattern "(((([*]|(([1-5]#(0,1)\d)\-([1-5]#(0,1)\d)))(\/([1-5]#(0,1)\d))#(0,1)|([1-5]#(0,1)\d))\,)#(0,)((([*]|(([1-5]#(0,1)\d)\-([1-5]#(0,1)\d)))(\/([1-5]#(0,1)\d))#(0,1))|([1-5]#(0,1)\d))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))#2((([*]|((1#(0,1)\d|2[0-3])\-(1#(0,1)\d|2[0-3])))(\/1#(0,1)\d|2[0-3])#(0,1)|(1#(0,1)\d|2[0-3]))\,)#(0,)((([*]|((1#(0,1)\d|2[0-3])\-(1#(0,1)\d|2[0-3])))(\/1#(0,1)\d|2[0-3])#(0,1))|(1#(0,1)\d|2[0-3]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])#(0,1)|([1-9]|1\d|2\d|3[01]))\,)#(0,)((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])#(0,1))|([1-9]|1\d|2\d|3[01]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])#(0,1)|([1-9]|1[0-2]))\,)#(0,)((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])#(0,1))|([1-9]|1[0-2]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([0-6])\-([0-6])))(\/[0-6])#(0,1)|([0-6]))\,)#(0,)((([*]|(([0-6])\-([0-6])))(\/[0-6])#(0,1))|([0-6]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1)|([2-9]\d\d\d))\,)#(0,)((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1))|([2-9]\d\d\d))")
+
+//"(([*]|[1-5]#(0,1)\d([,\-\/][1-5]#(0,1)\d)#(0,))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))#2([*]|((1#(0,1)\d|2[0-3])([,\-\/](1#(0,1)\d|2[0-3]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|(([1-9]|1\d|2\d|3[01])([,\-\/]([1-9]|1\d|2\d|3[01]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|(([1-9]|1[0-2])([,\-\/]([1-9]|1[0-2]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|([0-6]([,\-\/][0-6])#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*](/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1))|(([2-9]\d\d\d)([,\-][2-9]\d\d\d[,]#(0,1))#(0,1)([/]\d#(0,1)\d#(0,1)\d#(0,1)\d[,]#(0,1))#(0,1))#(0,)")
with {
variant "name as uncapitalized";
};
@@ -1502,14 +1512,14 @@ with {
};
-type record of XSD.Duration ListOfDuration
+type record length(1 .. infinity) of XSD.Duration ListOfDuration
with {
variant "name as uncapitalized";
variant "list";
};
-type record of XSD.NCName AttributeList_1
+type record length(1 .. infinity) of XSD.NCName AttributeList_1
with {
variant "name as 'attributeList'";
variant "list";
@@ -1535,7 +1545,7 @@ with {
};
-type XSD.String E2eCompactJWS (pattern "([a-zA-Z0-9\-_=]+).([a-zA-Z0-9\-_=]*).([A-Za-z0-9\-_=])+")
+type XSD.String E2eCompactJWS (pattern "([a-zA-Z0-9\-_=]+).([a-zA-Z0-9\-_=]#(0,)).([A-Za-z0-9\-_=])+")
with {
variant "name as uncapitalized";
};
@@ -1560,7 +1570,7 @@ with {
};
-type XSD.String ResourceName (pattern "[a-zA-Z0-9]([a-zA-Z0-9.\-,_]*)")
+type XSD.String ResourceName (pattern "[a-zA-Z0-9]([a-zA-Z0-9.\-,_]#(0,))")
with {
variant "name as uncapitalized";
};
@@ -1581,10 +1591,23 @@ with {
};
+type XSD.String ReleaseVersion (pattern "2a")
+with {
+ variant "name as uncapitalized";
+};
+type XSD.String ApplicableReleaseVersion (pattern "2a")
+with {
+ variant "name as uncapitalized";
+};
+type record length(1 .. infinity) of ApplicableReleaseVersion SupportedReleaseVersions
+with {
+ variant "name as uncapitalized";
+ variant "list";
+};
type record DeliveryMetaData
@@ -1634,11 +1657,13 @@ type record MetaInformation
XSD.String groupRequestIdentifier optional,
FilterCriteria filterCriteria optional,
DiscResType discoveryResultType optional,
- record length(1 .. infinity) of RoleID roleIDs,
+ record length(1 .. infinity) of RoleID roleIDs optional,
XSD.Boolean tokenRequestIndicator optional,
- record length(1 .. infinity) of DynAuthJWT tokens,
- record length(1 .. infinity) of TokenID tokenIDs,
- record length(1 .. infinity) of XSD.NCName localTokenIDs
+ record length(1 .. infinity) of DynAuthJWT tokens optional,
+ record length(1 .. infinity) of TokenID tokenIDs optional,
+ record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
+ ReleaseVersion releaseVersionIndicator,
+ XSD.String vendorInformation optional
}
with {
variant "name as uncapitalized";
@@ -1986,8 +2011,8 @@ type record AccessControlRule
record of record {
record of ScheduleEntry accessControlWindow_list,
record {
- record length(1 .. infinity) of Ipv4 ipv4Addresses optional,//TODO It must be optional
- record length(1 .. infinity) of Ipv6 ipv6Addresses optional //TODO It must be optional
+ record length(1 .. infinity) of Ipv4 ipv4Addresses optional,
+ record length(1 .. infinity) of Ipv6 ipv6Addresses optional
} accessControlIpAddresses optional,
LocationRegion accessControlLocationRegion optional
} accessControlContexts_list,
@@ -2034,7 +2059,7 @@ with {
type record ResponseTypeInfo
{
ResponseType responseTypeValue,
- record of XSD.AnyURI notificationURI
+ record of XSD.AnyURI notificationURI optional
}
with {
variant "name as uncapitalized";
@@ -2164,7 +2189,7 @@ with {
type record E2eSecInfo
{
record length(1 .. infinity) of Suid supportedE2ESecFeatures,
- record length(1 .. infinity) of XSD.Base64Binary certificates,
+ record length(1 .. infinity) of XSD.Base64Binary certificates optional,
ReceiverESPrimRandObject sharedReceiverESPrimRandObject optional
}
with {
@@ -2178,7 +2203,7 @@ type record TokenPermission
{
ListOfM2MID resourceIDs optional,
SetOfAcrs privileges optional,
- record length(1 .. infinity) of RoleID roleIDs
+ record length(1 .. infinity) of RoleID roleIDs optional
}
with {
variant "name as uncapitalized";
@@ -2269,12 +2294,12 @@ type record DynAuthDasRequest
Ipv6 ipv6Address optional
} originatorIP optional,
LocationRegion originatorLocation optional,
- record length(1 .. infinity) of RoleID originatorRoleIDs,
+ record length(1 .. infinity) of RoleID originatorRoleIDs optional,
AbsRelTimestamp requestTimestamp optional,
XSD.AnyURI targetedResourceID optional,
AbsRelTimestamp proposedPrivilegesLifetime optional,
- record length(1 .. infinity) of RoleID roleIDsFromACPs,
- record length(1 .. infinity) of TokenID tokenIDs
+ record length(1 .. infinity) of RoleID roleIDsFromACPs optional,
+ record length(1 .. infinity) of TokenID tokenIDs optional
}
with {
variant "name as uncapitalized";
@@ -2381,7 +2406,7 @@ type record AnnounceableResource
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional
}
with {
variant "name as uncapitalized";
@@ -2421,7 +2446,7 @@ type record AnnounceableSubordinateResource
Labels labels optional,
Timestamp expirationTime,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional
}
with {
variant "name as uncapitalized";
@@ -2478,7 +2503,7 @@ type record MgmtResource
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -2806,7 +2831,7 @@ type record Container
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -2905,7 +2930,7 @@ type record ContentInstance
Labels labels optional,
Timestamp expirationTime,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
ContentInfo contentInfo optional,
@@ -2981,6 +3006,7 @@ type record CSEBase
XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -3002,7 +3028,7 @@ type record CSEBase
M2mServiceSubscriptionProfile m2mServiceSubscriptionProfile,
ServiceSubscribedAppRule serviceSubscribedAppRule,
Role role,
- XSD.Token token,
+ Token token,
Sg_flexContainerResource_group sg_flexContainerResource
} choice_list
} choice optional
@@ -3073,7 +3099,7 @@ type record DeviceCapability
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3171,7 +3197,7 @@ type record DeviceInfo
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3429,6 +3455,7 @@ type enumerated ResponseStatusCode
int2002(2002),
int2004(2004),
int4000(4000),
+ int4001(4001),
int4004(4004),
int4005(4005),
int4008(4008),
@@ -3740,7 +3767,14 @@ type enumerated MgmtDefinition
int1016(1016),
int1017(1017),
int1018(1018),
- int1019(1019)
+ int1019(1019),
+ int1020(1020),
+ int1021(1021),
+ int1022(1022),
+ int1023(1023),
+ int1024(1024),
+ int1025(1025),
+ int1026(1026)
}
with {
variant "useNumber";
@@ -4085,7 +4119,7 @@ type record EventConfig
EventType eventType,
Timestamp eventStart optional,
Timestamp eventEnd optional,
- record of Operation operationType,
+ record of Operation operationType optional,
XSD.NonNegativeInteger dataSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -4118,7 +4152,7 @@ type record EventLog
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -4246,7 +4280,7 @@ type record Firmware
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -4504,12 +4538,12 @@ type record Group
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.ID creator optional,
MemberType memberType,
XSD.NonNegativeInteger currentNrOfMembers,
XSD.PositiveInteger maxNrOfMembers,
- ListOfURIs memberIDs,
+ record of XSD.AnyURI memberIDs,
ListOfURIs membersAccessControlPolicyIDs optional,
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
@@ -4528,6 +4562,7 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
+ variant (memberIDs) "list";
//variant (memberTypeValidated) "text 'true' as '1'";
//variant (memberTypeValidated) "text 'false' as '0'";
//variant (semanticSupportIndicator) "text 'true' as '1'";
@@ -4556,7 +4591,7 @@ type record GroupAnnc
MemberType memberType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
XSD.PositiveInteger maxNrOfMembers optional,
- record of XSD.AnyURI memberIDs,
+ record of XSD.AnyURI memberIDs optional,
ListOfURIs membersAccessControlPolicyIDs optional,
XSD.Boolean memberTypeValidated optional,
ConsistencyStrategy consistencyStrategy optional,
@@ -4601,7 +4636,7 @@ type record LocationPolicy
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
LocationSource locationSource,
ListOfDuration locationUpdatePeriod optional,
LocationTargetID locationTargetID optional,
@@ -4702,7 +4737,7 @@ type record Memory
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -4819,7 +4854,7 @@ type record Node
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
NodeID nodeID,
XSD.ID hostedCSELink optional,
XSD.String mgmtClientAddress optional,
@@ -4997,22 +5032,9 @@ with {
variant (notification_list[-]) "name as 'notification'";
};
-
-//FIXME To be added
-type union Representation {
- Resource_2 resource,
- ResponsePrimitive responsePrimitive,
- XSD.AnyURI uRI
-}
-with {
- variant "name as 'representation'";
- variant (uRI) "name as capitalized";
- };
-
type record Notification_1
{
record {
- //XSD.AnyType representation optional, Use Representation instead
Representation representation optional,
record {
Operation operation optional,
@@ -5025,6 +5047,9 @@ type record Notification_1
XSD.AnyURI subscriptionReference optional,
XSD.ID creator optional,
XSD.AnyURI notificationForwardingURI optional,
+ XSD.ID notificationTarget optional,
+ XSD.Boolean targetRemovalRequest optional,
+ XSD.Boolean targetRemovalAllowance optional,
record {
XSD.ID originator,
FilterCriteria filterCriteria
@@ -5036,6 +5061,10 @@ with {
//variant (verificationRequest) "text 'false' as '0'";
//variant (subscriptionDeletion) "text 'true' as '1'";
//variant (subscriptionDeletion) "text 'false' as '0'";
+ //variant (targetRemovalRequest) "text 'true' as '1'";
+ //variant (targetRemovalRequest) "text 'false' as '0'";
+ //variant (targetRemovalAllowance) "text 'true' as '1'";
+ //variant (targetRemovalAllowance) "text 'false' as '0'";
variant (iPEDiscoveryRequest) "name as capitalized";
};
@@ -5082,7 +5111,7 @@ type record DynAuthDasResponse
SetOfAcrs grantedPrivileges optional,
AbsRelTimestamp privilegesLifetime optional
} dynamicACPInfo optional,
- record length(1 .. infinity) of DynAuthJWT tokens
+ record length(1 .. infinity) of DynAuthJWT tokens optional
}
with {
variant "name as uncapitalized";
@@ -5090,6 +5119,33 @@ with {
};
+//FIXME To replace Representation type by this
+type union Representation {
+ Resource_2 resource,
+ ResponsePrimitive responsePrimitive,
+ XSD.AnyURI uRI
+}
+with {
+ variant "name as 'representation'";
+ variant (uRI) "name as capitalized";
+ };
+
+//type record Representation
+//{
+// union {
+// XSD.String elem,
+// XSD.String elem_1
+// } choice optional
+//}
+//with {
+// variant "name as uncapitalized";
+// variant (choice) "untagged";
+// variant (choice.elem) "anyElement from 'http://www.onem2m.org/xml/protocols'";
+// variant (choice.elem_1) "name as 'elem'";
+// variant (choice.elem_1) "anyElement except unqualified, 'http://www.onem2m.org/xml/protocols'";
+//};
+
+
type record PolicyDeletionRules
{
ResourceName resourceName,
@@ -5121,21 +5177,10 @@ with {
};
-type record PollingChannel
-{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- Timestamp expirationTime
-}
+type SubordinateResource PollingChannel
with {
variant "name as uncapitalized";
variant "element";
- variant (resourceName) "attribute";
};
@@ -5152,7 +5197,7 @@ type record Reboot
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -5234,7 +5279,7 @@ type record RemoteCSE
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
XSD.AnyURI cSEBase,
@@ -5245,6 +5290,7 @@ type record RemoteCSE
XSD.AnyURI nodeLink optional,
XSD.UnsignedInt triggerReferenceNumber optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -5308,6 +5354,7 @@ type record RemoteCSEAnnc
XSD.Boolean requestReachability optional,
XSD.AnyURI nodeLink optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -5356,7 +5403,7 @@ type record RequestPrimitive
RequestID requestIdentifier,
ResourceType resourceType optional,
PrimitiveContent primitiveContent optional,
- record length(1 .. infinity) of RoleID roleIDs optional,//TODO it must be optional
+ record length(1 .. infinity) of RoleID roleIDs optional,
Timestamp originatingTimestamp optional,
AbsRelTimestamp requestExpirationTimestamp optional,
AbsRelTimestamp resultExpirationTimestamp optional,
@@ -5369,10 +5416,12 @@ type record RequestPrimitive
XSD.String groupRequestIdentifier optional,
FilterCriteria filterCriteria optional,
DiscResType discoveryResultType optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,//TODO it must be optional
- record length(1 .. infinity) of TokenID tokenIDs optional,//TODO it must be optional
- record length(1 .. infinity) of XSD.NCName localTokenIDs optional,//TODO it must be optional
- XSD.Boolean tokenRequestIndicator optional
+ record length(1 .. infinity) of DynAuthJWT tokens optional,
+ record length(1 .. infinity) of TokenID tokenIDs optional,
+ record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
+ XSD.Boolean tokenRequestIndicator optional,
+ ReleaseVersion releaseVersionIndicator,
+ XSD.String vendorInformation optional
}
with {
variant "name as uncapitalized";
@@ -5450,7 +5499,9 @@ type record ResponsePrimitive
ContentStatus contentStatus optional,
XSD.PositiveInteger contentOffset optional,
DynAuthLocalTokenIdAssignments assignedTokenIdentifiers optional,
- DynAuthTokenReqInfo tokenRequestInformation optional
+ DynAuthTokenReqInfo tokenRequestInformation optional,
+ ReleaseVersion releaseVersionIndicator,
+ XSD.String vendorInformation optional
}
with {
variant "name as uncapitalized";
@@ -5598,7 +5649,7 @@ type record Schedule
Labels labels optional,
Timestamp expirationTime,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
ScheduleEntries scheduleElement,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -5653,7 +5704,7 @@ type record SemanticDescriptor
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.ID creator optional,
DescriptorRepresentation descriptorRepresentation optional,
Sparql semanticOpExec optional,
@@ -5728,7 +5779,7 @@ type record ServiceSubscribedAppRule
ListOfM2MID applicableCredIDs optional,
ListOfM2MID allowedApp_IDs optional,
ListOfM2MID allowedAEs optional,
- record length(1 .. infinity) of RoleID allowedRole_IDs,
+ record length(1 .. infinity) of RoleID allowedRole_IDs optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
@@ -5763,7 +5814,7 @@ type record ServiceSubscribedNode
ListOfURIs dynamicAuthorizationConsultationIDs optional,
NodeID nodeID,
XSD.ID cSE_ID optional,
- record of DeviceID deviceIdentifier,
+ record of DeviceID deviceIdentifier optional,
ListOfURIs ruleLinks optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -5797,7 +5848,7 @@ type record Software
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6041,8 +6092,8 @@ with {
type record BatchNotify
{
- XSD.NonNegativeInteger number,
- XSD.Duration duration
+ XSD.NonNegativeInteger number optional,
+ XSD.Duration duration optional
}
with {
variant "name as uncapitalized";
@@ -6222,7 +6273,7 @@ type record TimeSeriesInstance
Labels labels optional,
Timestamp expirationTime,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AbsRelTimestamp dataGenerationTime,
XSD.AnySimpleType content,
XSD.NonNegativeInteger sequenceNr optional,
@@ -6272,7 +6323,7 @@ type record TimeSeries
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator,
XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -6417,7 +6468,7 @@ type record TrafficPattern
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional, //TODO To be put as optional
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
XSD.Boolean provideToNSE optional,
PeriodicIndicator periodicIndicator optional,
XSD.UnsignedInt periodicDurationTime optional,
@@ -6561,9 +6612,18 @@ with {
encode "adapter";
}
- type RequestPrimitive UtTriggerPrimitive;
+ type record UtTriggerPrimitive {
+ RequestPrimitive requestPrimitive,
+ AttributeAux_list forcedFields optional
+ }
+ with {
+ encode "UpperTester"
+ }
- type ResponsePrimitive UtTriggerAckPrimitive;
+ type ResponsePrimitive UtTriggerAckPrimitive
+ with {
+ encode "UpperTester"
+ }
type record AttributeAux {
XSD.NCName name,
@@ -6665,6 +6725,7 @@ group OptionalResourceTypes {
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6719,6 +6780,7 @@ group OptionalResourceTypes {
XSD.Boolean requestReachability optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7075,6 +7137,7 @@ group OptionalResourceTypes {
XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7526,6 +7589,7 @@ group OptionalResourceTypes {
XSD.AnyURI nodeLink optional,
XSD.UnsignedInt triggerReferenceNumber optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7588,6 +7652,7 @@ group OptionalResourceTypes {
XSD.Boolean requestReachability optional,
XSD.AnyURI nodeLink optional,
E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -8045,13 +8110,13 @@ group InvalidTypes {
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- XSD.NonNegativeInteger stateTag optional,
+ XSD.Integer stateTag optional,
XSD.ID creator optional,
- XSD.NonNegativeInteger maxNrOfInstances optional,
- XSD.NonNegativeInteger maxByteSize optional,
- XSD.NonNegativeInteger maxInstanceAge optional,
- XSD.NonNegativeInteger currentNrOfInstances optional,
- XSD.NonNegativeInteger currentByteSize optional,
+ XSD.Integer maxNrOfInstances optional,
+ XSD.Integer maxByteSize optional,
+ XSD.Integer maxInstanceAge optional,
+ XSD.Integer currentNrOfInstances optional,
+ XSD.Integer currentByteSize optional,
XSD.AnyURI locationID optional,
XSD.AnyURI ontologyRef optional,
XSD.Boolean disableRetrieval optional,
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4fc52aab2ce8c285c920a41736ac3e909e962302..a3f75524decbb663008e198dcede8920bacdced7 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -38,7 +38,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(0, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -48,13 +48,12 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
- v_utRequest.from_ := "UNINITIALIZED";
+ 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_);
@@ -78,11 +77,11 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var UtTriggerAckPrimitive v_trigger_response;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
//Test Control
@@ -94,18 +93,17 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
- v_utRequest.from_ := "UNINITIALIZED";
+ 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_))) {
+ [] 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_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -128,13 +126,13 @@ module OneM2M_PermutationFunctions {
group Update {
function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -145,19 +143,18 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//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.from_ := "UNINITIALIZED";
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -175,13 +172,13 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -191,18 +188,18 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
- v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequest.from_ := "UNINITIALIZED";
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -225,14 +222,14 @@ module OneM2M_PermutationFunctions {
group Retrieve {
function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequestTemplate;
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -242,19 +239,19 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
- v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
f_sendUtPrimitive(v_utRequestTemplate,v_action);
v_utRequest := valueof(v_utRequestTemplate);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -272,14 +269,14 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequestTemplate;
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -289,19 +286,19 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
- v_auxInteger := f_setLocalResource(v_localResource, int3);
- v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
v_utRequest := valueof(v_utRequestTemplate);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -324,13 +321,13 @@ module OneM2M_PermutationFunctions {
group Delete {
function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -340,19 +337,18 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//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.from_ := "UNINITIALIZED";
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_))) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -370,13 +366,13 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -386,20 +382,19 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//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_hierarchical, p_primitiveScope);
- v_utRequest.from_ := "UNINITIALIZED";
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_))) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -425,25 +420,27 @@ module OneM2M_PermutationFunctions {
group Create {
- function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in universal charstring p_action) runs on CseSimu {
+ function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
//primitives for mcaPortIn
- var MsgIn v_request;
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
f_cf03Up();
//Send Trigger Message
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(p_response)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -475,13 +472,19 @@ module OneM2M_PermutationFunctions {
group Create {
function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
+ var PrimitiveContent v_localResource;
+ var integer v_containerIndex := -1;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
f_cf03Up();
//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, vc_cSEBaseIndex);
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -489,12 +492,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -514,13 +517,15 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
f_cf03Up();
//send triggering primitive to SUT
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -528,12 +533,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -557,24 +562,23 @@ 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;
- var ResponsePrimitive v_responsePrimitive;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
- var integer v_parentIndex := -1;
- var PrimitiveContent v_modifiedResource;
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_modifiedResource;
+ var PrimitiveContent v_localResource;
f_cf03Up();
//Preamble
- v_aeIndex := f_ae_preamble_registerAe();
-
+
//Send Trigger Message
- p_utRequestTestBody.to_ := f_getLocalResourceAddress(v_aeIndex);
- f_sendUtPrimitive(p_utRequestTestBody,p_action);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+ v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
+ f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -583,14 +587,10 @@ module OneM2M_PermutationFunctions {
[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE update request is accepted!");
- v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
- v_modifiedResource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
- v_resourceIndex := f_setLocalResource(v_modifiedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
- if(v_resourceIndex != -1) {
- mcaPortIn.send(m_response(m_responsePrimitive_content(int2004, v_request.primitive.requestPrimitive.requestIdentifier, v_modifiedResource)));
- }
- //send back responsePrimitive
- //mcaPortIn.send(m_response(v_responsePrimitive));
+
+ vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
+
+ mcaPortIn.send(m_response(vc_response.primitive.responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) -> value v_request {
tc_ac.stop;
@@ -607,13 +607,18 @@ module OneM2M_PermutationFunctions {
}
function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_localResource;
+ var integer v_auxInteger := -1;
//Test component configuration
f_cf03Up();
//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, vc_cSEBaseIndex);
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -621,12 +626,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -650,29 +655,33 @@ module OneM2M_PermutationFunctions {
group Retrieve {
- function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in universal charstring p_action) runs on CseSimu {
+ function f_AE_DMR_RET_001(ResourceType p_resourceType, template PrimitiveContent p_primitiveContent, in universal charstring p_action) runs on CseSimu {
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_localResource;
+ var integer v_auxInteger := -1;
//Test component configuration
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := p_resourceType;
+ v_localResource := f_ae_generateLocalResource(valueof(p_primitiveContent), vc_cSEBaseIndex, p_resourceType);
+ v_auxInteger := f_setLocalResource(v_localResource, p_resourceType, vc_cSEBaseIndex);
+ v_utRequest := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger));
f_sendUtPrimitive(v_utRequest,p_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(p_address))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(f_getLocalResourceAddress(v_auxInteger)))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -712,6 +721,7 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//send triggering primitive to SUT
+ p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -722,7 +732,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1407,6 +1417,7 @@ module OneM2M_PermutationFunctions {
function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test control
@@ -1426,12 +1437,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mccPortIn.receive(mw_request(p_request)) {
+ [] mccPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mccPortIn.send(m_response(v_responsePrimitive));
@@ -1729,8 +1740,7 @@ module OneM2M_PermutationFunctions {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
- v_utRequest.to_ := f_getResourceAddress();
- v_utRequest.from_ := "UNINITIALIZED";
+ v_utRequest.requestPrimitive.to_ := f_getResourceAddress();
f_sendUtPrimitive(v_utRequest, v_action);
// Test Body
@@ -4708,10 +4718,11 @@ module OneM2M_PermutationFunctions {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
+ var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_ae2Index := -1;
- var integer v_acpAuxIndex := -1;
+ var integer v_acpAuxIndex := -1;
// Test control
@@ -4741,6 +4752,9 @@ module OneM2M_PermutationFunctions {
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
+ if(vc_ae2.running) {
+ vc_ae2.stop;
+ }
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cse1.done;
@@ -4751,16 +4765,12 @@ module OneM2M_PermutationFunctions {
//Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- if(p_resourceType == int23) { //Subscription
+ if((p_resourceType == int23) and (ispresent(v_request.primitiveContent.subscription.notificationURI))) { //Subscription
v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};
}
mcaPort.send(m_request(v_request));
- if(p_resourceType == int23) { //Subscription
- f_cse_notifyProcedure_subscriptionVerificationHandler();
- }
-
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -4775,6 +4785,15 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(fail, __SCOPE__, ": Error while updating mandatory attribute");
}
+ [] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value vc_request {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received");
+ v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
+ v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ mcaPortIn.send(m_response(v_responsePrimitive));
+ tc_ac.start;
+ repeat;
+ }
[] tc_ac.timeout {
setverdict(fail, __SCOPE__, ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
}
@@ -5545,7 +5564,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code while retrieving resource");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response while retrieving resource");
}
diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index b092d21801bdbac1d5e5119e079a417d20c7e736..6fd75e8d97e66e392be2af37f7edb1edadaadb5b 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -54,7 +54,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_REG_UPD_001());}
if(true) {execute (TC_CSE_REG_DEL_001());}
if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
- if(PICS_IN_CSE) {execute (TC_CSE_REG_RET_005());}
+ if(true) {execute (TC_CSE_REG_RET_005());}
if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
//CE_REG_00002
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 955d385c773d28bbed49ca1345b138951cf53166..43eb9841038b36795e32ca31677f2b2b4c9d6e43 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -54,6 +54,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_REG_UPD_001());}
if(true) {execute (TC_CSE_REG_DEL_001());}
if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
+ if(true) {execute (TC_CSE_REG_RET_005());}
if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
//CE_REG_00002
@@ -96,6 +97,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_REG_DEL_002());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
+ if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 0c7bbbbe445bb6772b2a84f1c9687b207cd1403e..f3c3a86f3ec741b163fbc8acc1b57dbd17c5ec87 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -36,18 +36,23 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the creation of a <container> resource using unstructured resource identifier
*/
- testcase TC_AE_GEN_CRE_001_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_001_CSR() runs on Tester system AeSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
// Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
stop;
}
- f_AE_GEN_CRE_001(e_cseRelative);
+ v_cse1.start(f_AE_GEN_CRE_001(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_CRE_001_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_001_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
// Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -55,18 +60,21 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_CRE_001(e_spRelative);
+ v_cse1.start(f_AE_GEN_CRE_001(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_CRE_001_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_001_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
// Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
setverdict(inconc, __SCOPE__, ": Unstructured-Absolute-Resource-ID format support is required to run this test case");
stop;
}
-
- f_AE_GEN_CRE_001(e_absolute);
+ v_cse1.start(f_AE_GEN_CRE_001(e_absolute));
+ v_cse1.done;
}
}//end group g_AE_GEN_CRE_002
@@ -77,34 +85,43 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the creation of a <container> resource using structured resource identifier
*/
- testcase TC_AE_GEN_CRE_002_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_002_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
stop;
}
- f_AE_GEN_CRE_002(e_cseRelative);
+ v_cse1.start(f_AE_GEN_CRE_002(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_CRE_002_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_002_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
setverdict(inconc, __SCOPE__, ": Structured-SP-Relative-Resource-ID format support is required to run this test case");
stop;
}
- f_AE_GEN_CRE_002(e_spRelative);
+ v_cse1.start(f_AE_GEN_CRE_002(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_CRE_002_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_CRE_002_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
setverdict(inconc, __SCOPE__, ": Structured-Absolute-Resource-ID format support is required to run this test case");
stop;
}
- f_AE_GEN_CRE_002(e_absolute);
+ v_cse1.start(f_AE_GEN_CRE_002(e_absolute));
+ v_cse1.done;
}
} //end group g_AE_GEN_CRE_002
@@ -119,7 +136,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the update of a <container> resource using unstructured resource identifier
*/
- testcase TC_AE_GEN_UPD_001_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_001_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
// Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -127,10 +146,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_001(e_cseRelative);
+ v_cse1.start(f_AE_GEN_UPD_001(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_UPD_001_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_001_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -138,10 +160,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_001(e_spRelative);
+ v_cse1.start(f_AE_GEN_UPD_001(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_UPD_001_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_001_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -149,7 +174,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_001(e_absolute);
+ v_cse1.start(f_AE_GEN_UPD_001(e_absolute));
+ v_cse1.done;
}
}//end group g_AE_GEN_UPD_001
@@ -160,7 +186,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the update of a <container> resource using structured resource identifier
*/
- testcase TC_AE_GEN_UPD_002_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_002_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -168,10 +196,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_002(e_cseRelative);
+ v_cse1.start(f_AE_GEN_UPD_002(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_UPD_002_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_002_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -179,10 +210,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_002(e_spRelative);
+ v_cse1.start(f_AE_GEN_UPD_002(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_UPD_002_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_UPD_002_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -190,7 +224,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_UPD_002(e_absolute);
+ v_cse1.start(f_AE_GEN_UPD_002(e_absolute));
+ v_cse1.done;
}
} //end group g_AE_GEN_UPD_002
@@ -205,7 +240,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the retrieval of a <container> resource using unstructured resource identifier
*/
- testcase TC_AE_GEN_RET_001_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_001_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
// Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -213,10 +250,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_001(e_cseRelative);
+ v_cse1.start(f_AE_GEN_RET_001(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_RET_001_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_001_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -224,10 +264,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_001(e_spRelative);
+ v_cse1.start(f_AE_GEN_RET_001(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_RET_001_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_001_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -235,7 +278,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_001(e_absolute);
+ v_cse1.start(f_AE_GEN_RET_001(e_absolute));
+ v_cse1.done;
}
}//end group g_AE_GEN_RET_001
@@ -246,7 +290,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the retrieval of a <container> resource using structured resource identifier
*/
- testcase TC_AE_GEN_RET_002_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_002_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -254,10 +300,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_002(e_cseRelative);
+ v_cse1.start(f_AE_GEN_RET_002(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_RET_002_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_002_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -265,10 +314,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_002(e_spRelative);
+ v_cse1.start(f_AE_GEN_RET_002(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_RET_002_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_RET_002_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -276,7 +328,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_RET_002(e_absolute);
+ v_cse1.start(f_AE_GEN_RET_002(e_absolute));
+ v_cse1.done;
}
} //end group g_AE_GEN_RET_002
@@ -291,7 +344,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the deletion of a <container> resource using unstructured resource identifier
*/
- testcase TC_AE_GEN_DEL_001_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_001_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -299,10 +354,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_001(e_cseRelative);
+ v_cse1.start(f_AE_GEN_DEL_001(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_DEL_001_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_001_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -310,10 +368,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_001(e_spRelative);
+ v_cse1.start(f_AE_GEN_DEL_001(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_DEL_001_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_001_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -321,7 +382,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_001(e_absolute);
+ v_cse1.start(f_AE_GEN_DEL_001(e_absolute));
+ v_cse1.done;
}
}//end group g_AE_GEN_DEL_001
@@ -332,7 +394,9 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends the deletion of a <container> resource using structured resource identifier
*/
- testcase TC_AE_GEN_DEL_002_CSR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_002_CSR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE)) {
@@ -340,10 +404,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_002(e_cseRelative);
+ v_cse1.start(f_AE_GEN_DEL_002(e_cseRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_DEL_002_SPR() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_002_SPR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_SP_RELATIVE)) {
@@ -351,10 +418,13 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_002(e_spRelative);
+ v_cse1.start(f_AE_GEN_DEL_002(e_spRelative));
+ v_cse1.done;
}
- testcase TC_AE_GEN_DEL_002_ABS() runs on CseSimu system AeSystem {
+ testcase TC_AE_GEN_DEL_002_ABS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//Test control
if(not(PICS_PRIMITIVE_SCOPE_ABSOLUTE)) {
@@ -362,7 +432,8 @@ module OneM2M_Testcases_AE_Release_1 {
stop;
}
- f_AE_GEN_DEL_002(e_absolute);
+ v_cse1.start(f_AE_GEN_DEL_002(e_absolute));
+ v_cse1.done;
}
} //end group g_AE_GEN_DEL_002
@@ -379,29 +450,42 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends an AE initial registration request with no AE-ID-STEM provided when it is started
*/
- testcase TC_AE_REG_CRE_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_REG_CRE_001());
+
+ v_cse1.done;
+ }
+
+ function f_AE_REG_CRE_001() runs on CseSimu {
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
+
//primitives for mcaPortIn
var MsgIn v_request;
+ var template RequestPrimitive v_requestPrimitive := mw_createAe;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
f_cf03Up();
//Send Trigger Message
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest, v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -426,104 +510,137 @@ module OneM2M_Testcases_AE_Release_1 {
group g_AE_REG_CRE_002 {
- testcase TC_AE_REG_CRE_002_RN() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_RN() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.resourceName := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.resourceName := "UNINITIALIZED";
+ v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_ET() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_ET() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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";
- v_createAe.primitiveContent.aE.expirationTime := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ 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
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_LBL() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_LBL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.labels := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.labels := {"UNINITIALIZED"};
+ v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_APN() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_APN() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.appName := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.appName := "UNINITIALIZED";
+ v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_API() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_API() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.app_ID := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.app_ID := "UNINITIALIZED";
+ v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_POA() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_POA() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.pointOfAccess := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
+ v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_OR() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_OR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.ontologyRef := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
+ v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_NL() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_NL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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_createAe.primitiveContent.aE.nodeLink := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
+ v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_RR() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_RR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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;
- v_createAe.primitiveContent.aE.requestReachability := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ 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
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
- testcase TC_AE_REG_CRE_002_CSZ() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_CRE_002_CSZ() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ 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};
- v_createAe.primitiveContent.aE.contentSerialization := ?;
- f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
+ 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
+ v_cse1.start(f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action));
+ v_cse1.done;
}
}//End of subgroup AE_REG_CRE_002
@@ -536,29 +653,44 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends AE deregistration request to CSE
*/
- testcase TC_AE_REG_DEL_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_REG_DEL_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_REG_DEL_001());
+
+ v_cse1.done;
+
+ }
+
+ function f_AE_REG_DEL_001() runs on CseSimu {
//variables
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_localResource;
+ var integer v_auxInteger := -1;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := mw_delete;
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
f_cf03Up();
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
+ v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
+ 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)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -588,28 +720,40 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a Container creation request when it is triggered
*/
- testcase TC_AE_DMR_CRE_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_CRE_001());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_CRE_001() runs on CseSimu {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var MsgIn v_request;
+ var template RequestPrimitive v_requestPrimitive := mw_createContainer;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container";
f_cf03Up();
//send triggering primitive to SUT
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_createContainer)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -630,11 +774,22 @@ module OneM2M_Testcases_AE_Release_1 {
/**
* @desc Check that the IUT sends a ContentInstance creation request when it is triggered
*/
-
- testcase TC_AE_DMR_CRE_002() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_002() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_CRE_002());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_CRE_002() runs on CseSimu {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var MsgIn v_request;
+ var PrimitiveContent v_localResource;
+ var integer v_containerIndex := -1;
+ var template RequestPrimitive v_requestPrimitive := mw_createContentInstance;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
@@ -642,6 +797,10 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//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, vc_cSEBaseIndex);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
@@ -649,12 +808,12 @@ module OneM2M_Testcases_AE_Release_1 {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(mw_createContentInstance)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -680,49 +839,65 @@ module OneM2M_Testcases_AE_Release_1 {
group g_AE_DMR_CRE_003 {
- testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_003_CNF() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.contentInstance.contentInfo := ?;
- f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
+ v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_003_RN() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.contentInstance.resourceName := ?;
- f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
+ v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_003_ET() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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";
- v_request.primitiveContent.contentInstance.expirationTime := ?;
- f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_003_LBL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.contentInstance.labels := ?;
- f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
+ v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_003_CR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.contentInstance.creator := ?;
- f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
+ v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_003(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
}//End of subgroup AE_DMR_CRE_003
@@ -735,85 +910,116 @@ module OneM2M_Testcases_AE_Release_1 {
group g_AE_DMR_CRE_004 {
- testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_ACPI() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.accessControlPolicyIDs := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
+ v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_MNI() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_MNI() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
- v_request.primitiveContent.container.maxNrOfInstances := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_MBS() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
- v_request.primitiveContent.container.maxByteSize := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_MIA() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_MIA() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
- v_request.primitiveContent.container.maxInstanceAge := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_OR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.ontologyRef := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
+ v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_RN() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_RN() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.resourceName := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
+ v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_ET() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_ET() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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";
- v_request.primitiveContent.container.expirationTime := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_LBL() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_LBL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.labels := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
+ v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_CRE_004_CR() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_CRE_004_CR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.creator := ?;
- f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
+ v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
+ v_cse1.start(f_AE_DMR_CRE_004(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
}//End of subgroup AE_DMR_CRE_004
@@ -828,114 +1034,140 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource
*/
- testcase TC_AE_DMR_UPD_001_ET() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_ET() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := ?;
- f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest, v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_LBL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_APN() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_APN() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_POA() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_POA() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := {"http://127.0.0.1:1400/monitor"};
+ v_utRequest.requestPrimitive.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED", *});
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_OR() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_OR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := "MyOntologyRef";
+ v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_NL() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_NL() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 := "/CSE_ID/S-AE-ID-STEM";
+ v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_RR() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_RR() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
-
+ 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 := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//Check value other than "UNINITIALIZED", done by typing
- f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_UPD_001_CSZ() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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};
-
+ 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 := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//Check value other than "UNINITIALIZED", done by typing
- f_AE_DMR_UPD_001(v_utRequestTestBody,v_action, v_expectedUpdateRequestAe);
+ v_cse1.start(f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe));
+ v_cse1.done;
}
}//End of subgroup AE_DMR_UPD_001
@@ -946,64 +1178,67 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the <container> resource
*/
- testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_UPD_002_ET() runs on Tester system AeSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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.primitiveContent.container.expirationTime := "20301231T012345";
v_request.primitiveContent.container.expirationTime := ?;
- f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+ v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_UPD_002_LBL() runs on Tester system AeSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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_request.primitiveContent.container.labels := ?;
- f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+ v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
+ v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
+ v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_UPD_002_MNI() runs on Tester system AeSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
- v_request.primitiveContent.container.maxNrOfInstances := ?;
- f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_UPD_002_MBS() runs on Tester system AeSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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;
- v_request.primitiveContent.container.maxByteSize := ?;
- f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_UPD_002_MIA() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_UPD_002_MIA() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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 maxInstanceAge";
-
- v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxInstanceAge := 1;
- v_request.primitiveContent.container.maxInstanceAge := ?;
- f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
+ 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
+ v_cse1.start(f_AE_DMR_UPD_002(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
}//End of subgroup AE_DMR_UPD_002
@@ -1018,22 +1253,28 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a RETRIEVE Request on the TARGET_RESOURCE_ADDRESS to CSE
*/
- testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
+ testcase TC_AE_DMR_RET_001_CB() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
- f_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action);
+ v_cse1.start(f_AE_DMR_RET_001(int5, m_primitiveContentCSEBase(m_contentCreateCSEBase),v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+ testcase TC_AE_DMR_RET_001_AE() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
- f_AE_DMR_RET_001(int2, f_getLocalResourceAddress(v_auxInteger),v_action);
+ v_cse1.start(f_AE_DMR_RET_001(int2, m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit)),v_action));
+ v_cse1.done;
}
- testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
+ testcase TC_AE_DMR_RET_001_CNT() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
- f_AE_DMR_RET_001(int3, f_getLocalResourceAddress(v_auxInteger),v_action);
+ v_cse1.start(f_AE_DMR_RET_001(int3, m_primitiveContentContainer(m_contentCreateContainer()),v_action));
+ v_cse1.done;
}
}//End of TC_AE_DMR_RET_001
@@ -1042,13 +1283,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a RETRIEVE Request of oldest virtual resource.
*/
- testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_RET_002() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_RET_002());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_RET_002() runs on CseSimu {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
@@ -1057,17 +1307,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//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, vc_cSEBaseIndex);
+ 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_address & "/" & c_resourceShortNameOldest))) -> 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!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1090,13 +1343,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a RETRIEVE Request of latest virtual resource.
*/
- testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_RET_003() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_RET_003());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_RET_003() runs on CseSimu {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
@@ -1105,17 +1367,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//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, vc_cSEBaseIndex);
+ 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_address & "/" & c_resourceShortNameLatest))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1138,13 +1403,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a <container> resource RETRIEVE Request to CSE
*/
- testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_RET_004() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ v_cse1.start(f_AE_DMR_RET_004());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_RET_004() runs on CseSimu {
+
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
@@ -1153,18 +1427,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int3;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_address))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1187,13 +1463,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a <contentInstance> resource RETRIEVE Request to CSE
*/
- testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_RET_005 () runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_RET_005());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_RET_005() runs on CseSimu {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
@@ -1202,18 +1487,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int4;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+ v_auxInteger := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+ 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_address))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1240,13 +1527,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a DELETE Request of oldest virtual resource.
*/
- testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_DEL_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_DEL_001());
+
+ v_cse1.done;
+ }
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ function f_AE_DMR_DEL_001() runs on CseSimu {
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
+
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
@@ -1255,17 +1551,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//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, vc_cSEBaseIndex);
+ 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_address & "/" & c_resourceShortNameOldest))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1288,13 +1587,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a DELETE Request of latest virtual resource.
*/
- testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_DEL_002() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_DEL_002());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_DEL_002() runs on CseSimu {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
@@ -1303,17 +1611,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//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, vc_cSEBaseIndex);
+ 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_address & "/" & c_resourceShortNameLatest))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1336,13 +1647,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a <container> resource DELETE request to CSE
*/
- testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_DEL_003() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_DEL_003());
+
+ v_cse1.done;
+ }
+
+ function f_AE_DMR_DEL_003() runs on CseSimu {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
@@ -1351,18 +1671,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int3;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ 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_address))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1385,13 +1707,22 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a <contentInstance> resource DELETE Request to CSE
*/
- testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem {
+ testcase TC_AE_DMR_DEL_004 () runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_DMR_DEL_004());
+
+ v_cse1.done;
+ }
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ function f_AE_DMR_DEL_004() runs on CseSimu {
+
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
@@ -1400,18 +1731,20 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int4;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+ v_auxInteger := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
+ 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_address))) -> 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!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1443,7 +1776,16 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a subscription creation request
*/
- testcase TC_AE_SUB_CRE_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_SUB_CRE_001());
+
+ v_cse1.done;
+ }
+
+ function f_AE_SUB_CRE_001() runs on CseSimu {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
@@ -1451,12 +1793,10 @@ module OneM2M_Testcases_AE_Release_1 {
var ResponsePrimitive v_responsePrimitive;
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);
-
- f_cf03Up();
+ f_cf03Up();
//send triggering primitive to SUT
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
@@ -1467,7 +1807,7 @@ module OneM2M_Testcases_AE_Release_1 {
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1491,123 +1831,122 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a subscription creation request with optional attribute ATTRIBUTE_NAME when it is triggered
*/
- testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_ACPI() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?;
- f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_ENC() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
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";
-
-
- v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;
-
- f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria := m_eventNotificationCriteria();
+ v_utRequest.requestPrimitive.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
+ v_utRequest.forcedFields := {{name := "createdBefore", value_ := "UNINITIALIZED"}};
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;//Check value other than "UNINITIALIZED", done by typing
+
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_EXC() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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;
-
- v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.expirationCounter := ?;
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.expirationCounter := 1;
+ v_utRequest.forcedFields := {{name := "expirationCounter", value_ := "UNINITIALIZED"}};
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"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);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_NFU() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.notificationForwardingURI := complement("UNINITIALIZED");
- v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationForwardingURI := ?;
-
- f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_NCT() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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;
-
- v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationContentType := ?;
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationContentType := int1;
+ v_utRequest.forcedFields := {{name := "notificationContentType", value_ := "UNINITIALIZED"}};
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"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);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_NEC() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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;
+ 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.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//Check value other than "UNINITIALIZED", done by typing
- v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationEventCat.alt_ := ?;
-
- f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
- testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_CRE_002_SU() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
var template RequestPrimitive v_requestT := mw_createSubscription;
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_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.subscriberURI := ?;
+ v_utRequest.requestPrimitive.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
+ v_utRequest.requestPrimitive.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.subscriberURI := complement("UNINITIALIZED");
- f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
+ v_cse1.start(f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action));
+
+ v_cse1.stop;
}
}//End AE_SUB_CRE_002
@@ -1620,27 +1959,39 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a Notify Response to the hosting CSE when receiving a Notify request containing a single notification
*/
- testcase TC_AE_SUB_NTF_001() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_NTF_001() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_SUB_NTF_001());
+
+ v_cse1.done;
+ }
+
+ function f_AE_SUB_NTF_001() runs on CseSimu {
//variables
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_localResource;
+ var integer v_auxInteger := -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);
-
f_cf03Up();
//create Ae
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+ v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
f_sendUtPrimitive(v_utRequest,v_action);
+
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1659,7 +2010,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress(-1);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -1670,7 +2021,7 @@ module OneM2M_Testcases_AE_Release_1 {
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1711,27 +2062,38 @@ module OneM2M_Testcases_AE_Release_1 {
* @desc Check that the IUT sends a Notify Response to the hosting CSE when receiving a Notify request containing aggregated notifications
*/
- testcase TC_AE_SUB_NTF_002() runs on CseSimu system AeSystem {
+ testcase TC_AE_SUB_NTF_002() runs on Tester system AeSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_AE_SUB_NTF_002());
+
+ v_cse1.done;
+ }
+
+ function f_AE_SUB_NTF_002() runs on CseSimu {
//variables
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
+ var PrimitiveContent v_localResource;
+ var integer v_auxInteger := -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);
-
f_cf03Up();
//create Ae
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
+ v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress();
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt{
[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1750,7 +2112,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress(-1);
+ v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger);
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -1761,7 +2123,7 @@ module OneM2M_Testcases_AE_Release_1 {
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 7b23861a685ad2963921ff3d797dddfcafac1f24..5f1eeffe49e2335dabaaa29bce7a3df810cb8173 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -380,7 +380,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_relative_ AE_ID.
*
*/
- testcase TC_CSE_REG_CRE_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_001() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -402,7 +412,7 @@ module OneM2M_Testcases_CSE_Release_1 {
f_sleepIgnoreDef(PX_TCONFIG_IUT);
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, f_getResourceAddress(-1, -, e_spRelative) & "/" & PX_ALLOWED_C_AE_IDS[0]));
+ v_request := valueof(m_createAe(PX_APP_ID, omit, PX_CSE_ID & "/" & PX_ALLOWED_C_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -438,7 +448,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned AE_ID of AE-ID-Stem format.
*
*/
- testcase TC_CSE_REG_CRE_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_002() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -488,7 +508,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_relative_AE_ID.
*/
- testcase TC_CSE_REG_CRE_003() runs on CseSimu system CseSystem{
+ testcase TC_CSE_REG_CRE_003() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_003());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_003() runs on CseSimu {
var integer v_remoteCseIndex := -1;
@@ -507,7 +537,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects an AE registration (allowed App-ID, not allowed C-AE-ID-STEM provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_004() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -567,12 +607,16 @@ module OneM2M_Testcases_CSE_Release_1 {
*
*/
testcase TC_CSE_REG_CRE_005() runs on Tester system CseSystem {
+
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
v_cse1.start(f_CSE_REG_CRE_005());
+
v_cse1.done;
+
}
-
- function f_CSE_REG_CRE_005() runs on CseSimu system CseSystem {
+
+ function f_CSE_REG_CRE_005() runs on CseSimu {
var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive;
@@ -634,7 +678,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided character ‘S’ in AE_ID_Stem ask for a SP_relative_AE_ID
*
*/
- testcase TC_CSE_REG_CRE_006() runs on InCseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_006() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_006());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_006() runs on CseSimu {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
@@ -680,7 +734,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided character ‘S’ in AE_ID_Stem ask for a SP_relative_AE_ID
*
*/
- testcase TC_CSE_REG_CRE_007() runs on AeSimu system CseSystem{
+ testcase TC_CSE_REG_CRE_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_007() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -738,7 +802,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer request to the IN-CSE
*
*/
- testcase TC_CSE_REG_CRE_008() runs on InCseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_008() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_008());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_008() runs on CseSimu {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
@@ -799,7 +873,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), communication between MN-CSE and IN-CSE
*
*/
- testcase TC_CSE_REG_CRE_009() runs on MnCseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_009() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_009());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_009() runs on CseSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -867,7 +951,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), transfer response to the AE
*
*/
- testcase TC_CSE_REG_CRE_010() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_010() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_010());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_010() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -939,7 +1033,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and asking an CSE relative AE_ID by indicating AE_ID_Stem with character ‘C’.
*
*/
- testcase TC_CSE_REG_CRE_011() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_011() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_011());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_011() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1091,7 +1195,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects an AE registration (not allowed App-ID)
*
*/
- testcase TC_CSE_REG_CRE_016() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_016() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_016());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_016() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1179,7 +1293,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1.
*
*/
- testcase TC_CSE_REG_CRE_018() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_018() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_018());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_018() runs on CseSimu {
// Local variables
var MsgIn v_response;
@@ -1233,7 +1357,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
*
*/
- testcase TC_CSE_REG_CRE_019() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_019() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_019());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_019() runs on CseSimu {
// Local variables
var MsgIn v_response;
@@ -1284,7 +1418,17 @@ module OneM2M_Testcases_CSE_Release_1 {
*
*/
//TODO TO BE FINALIZED
- testcase TC_CSE_REG_CRE_020() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_020());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_020() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1368,7 +1512,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the create request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_CRE_021() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_021() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_021());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_021() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -1418,7 +1572,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE registration (allowed App-ID, C-AE-ID-STEM not provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_022() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_022() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_022());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_022() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1474,7 +1638,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects registration of already registered AE (C-AE-ID-STEM provided by AE)
*
*/
- testcase TC_CSE_REG_CRE_023() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_023() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_CRE_023());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_CRE_023() runs on AeSimu {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1524,7 +1698,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT sends a CSE registration request with attributes multiplicity equals to 1
*
*/
- testcase TC_CSE_REG_CRE_024() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_024() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_024());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_024() runs on CseSimu {
// Local variables
var ResponsePrimitive v_responsePrimitive;
@@ -1579,7 +1763,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT accepts a CSE registration request with attributes multiplicity equals to 1
*
*/
- testcase TC_CSE_REG_CRE_025() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_025() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_025());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_025() runs on CseSimu {
// Local variables
var MsgIn v_response;
@@ -1635,58 +1829,70 @@ module OneM2M_Testcases_CSE_Release_1 {
group g_CSE_REG_CRE_026 {
- testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_026_RN() runs on Tester system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
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);
+ v_cse1.start(f_CSE_REG_CRE_026(v_utRequest,v_request,v_action));
+ v_cse1.done;
}
}
@@ -1695,7 +1901,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
*
*/
- testcase TC_CSE_REG_CRE_027() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_027() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_CRE_027());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_CRE_027() runs on CseSimu {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
var RequestPrimitive v_request;
@@ -1806,7 +2022,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an retrieval request of <CSEBase> resource and responds with all attributes that have multiplicity equals to 1.
*
*/
- testcase TC_CSE_REG_RET_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_RET_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_RET_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_RET_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -1896,7 +2122,17 @@ module OneM2M_Testcases_CSE_Release_1 {
*
*/
- testcase TC_CSE_REG_RET_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_RET_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_RET_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_RET_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -2007,18 +2243,23 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a retrieval request of <CSEBase> resource including the cseType attribute
*
*/
- testcase TC_CSE_REG_RET_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_RET_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_RET_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_RET_005() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
- var template PrimitiveContent v_contentResponse;
-
- // Test control
- if(not(PICS_IN_CSE)) {
- setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
- stop;
- }
+ var template PrimitiveContent v_contentResponse_MN;
+ var template PrimitiveContent v_contentResponse_IN;
// Test component configuration
f_cf01Up();
@@ -2029,18 +2270,34 @@ module OneM2M_Testcases_CSE_Release_1 {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
// Test Body
- v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
- v_contentResponse.cSEBase.cseType := int1;
+ v_contentResponse_MN.cSEBase := mw_contentCSEBase_rc1;
+ v_contentResponse_IN.cSEBase := mw_contentCSEBase_rc1;
+ v_contentResponse_IN.cSEBase.cseType := int1;
mcaPort.send(m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse), {"parentID"})) -> value v_response {
+ [PX_IN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_IN), {"parentID"})) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": cseType attribute is set to 1 (IN_CSE)");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ [PX_MN_CSE] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse_MN), {"parentID"})) -> value v_response {
+ tc_ac.stop;
+ if(ispresent(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType)) {
+ if(v_response.primitive.responsePrimitive.primitiveContent.cSEBase.cseType == int2) {
+ setverdict(pass, __SCOPE__ & ": cseType attribute is set to 2 (MN_CSE)");
+ } else {
+ setverdict(fail, __SCOPE__ & ": cseType attribute is set to other than 2 (MN_CSE)");
+ }
+ }
+
+ }
+ [PX_IN_CSE] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse_IN))) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [PX_MN_CSE] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse_MN))) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
@@ -2069,86 +2326,96 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a retrieval request of <remoteCSE> resource
*
*/
- testcase TC_CSE_REG_RET_006() runs on CseSimu system CseSystem {
- //Local variables
- //Local variables
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var ResourceType v_resourceType := int16; //remoteCSE
- var template PrimitiveContent v_contentResponse;
-
- // Test control
-
- // Test component configuration
- f_cf04Up();
-
- // Test adapter configuration
-
- // Preamble
- if(PX_IN_CSE){
- vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
-
- v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
-
- mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
- }
- }
-
- } else if (PX_MN_CSE) {
- vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
-
- v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+ testcase TC_CSE_REG_RET_006() runs on Tester system CseSystem {
- mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
- tc_ac.start;
- alt {
- [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
- }
- [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_RET_006());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_RET_006() runs on CseSimu {
+ //Local variables
+ //Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var ResourceType v_resourceType := int16; //remoteCSE
+ var template PrimitiveContent v_contentResponse;
+
+ // Test control
+
+ // Test component configuration
+ f_cf04Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ if(PX_IN_CSE){
+ vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
+
+ v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+ tc_ac.start;
+ alt {
+ [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+ }
}
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+
+ } else if (PX_MN_CSE) {
+ vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+
+ v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
+
+ mccPort.send(m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+ tc_ac.start;
+ alt {
+ [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Response OK for retrieving");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error, resource elements provided not matching expected resource elements");
+ }
+ [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
+ }
}
}
- }
-
- // Postamble
- f_cse_postamble_deleteResourcesCSE();
-
- // Tear down
- f_cf04Down();
+
+ // Postamble
+ f_cse_postamble_deleteResourcesCSE();
+
+ // Tear down
+ f_cf04Down();
}//end TC_CSE_REG_RET_006
@@ -2225,7 +2492,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts a retrieval request of <CSEBase> resource and responds with supportedResourceTypes attribute containing a list of the supported resources and pointOfAccess containing the list of physical addresses to be used by Registree to connect to this CSE (e.g. IP address, FQDN).
*
*/
- testcase TC_CSE_REG_RET_008() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_RET_008() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_RET_008());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_RET_008() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -2294,7 +2571,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT sends a <remoteCSE> retrieve request on TARGET_REMOTE_CSE_ADDRESS
*
*/
- testcase TC_CSE_REG_RET_009() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_RET_009() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_RET_009());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_RET_009() runs on CseSimu {
//Local variables
//Local variables
var MsgIn v_response;
@@ -2319,9 +2606,8 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
- v_utRequest := m_utRetrieveResource(f_getLocalResourceAddress(vc_localRemoteCseIndex), PX_CSE_ID);
- v_utRequest.from_ := "UNINITIALIZED";
- f_sendUtPrimitive(v_utRequest, v_action);
+ v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex));
+ f_sendUtPrimitive(v_utRequest, v_action);
tc_ac.start;
alt {
@@ -2349,7 +2635,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT accepts a <remoteCSE> retrieve request
*
*/
- testcase TC_CSE_REG_RET_010() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_RET_010() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_RET_010());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_RET_010() runs on CseSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -2414,7 +2710,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the update request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_UPD_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_UPD_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_UPD_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_UPD_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -2591,7 +2897,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the delete request of <CSEBase> resource.
*
*/
- testcase TC_CSE_REG_DEL_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_DEL_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_DEL_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_DEL_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -2637,7 +2953,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT accepts a <remoteCSE> delete request on TARGET_REMOTE_CSE_ADDRESS, and deletes the <remoteCSE> resource
*
*/
- testcase TC_CSE_REG_DEL_002() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_DEL_002() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_DEL_002());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_DEL_002() runs on CseSimu {
//Local variables
var RequestPrimitive v_request;
// Test control
@@ -2700,7 +3026,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts an AE de-registration
*
*/
- testcase TC_CSE_REG_DEL_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_REG_DEL_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_REG_DEL_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_REG_DEL_003() runs on AeSimu {
//Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
@@ -2750,9 +3086,19 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that IUT sends a <remoteCSE> delete request on TARGET_REMOTE_CSE_ADDRESS
*
*/
- testcase TC_CSE_REG_DEL_004() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_DEL_004() runs on Tester system CseSystem {
+
+ var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
+
+ v_cse1.start(f_CSE_REG_DEL_004());
+
+ v_cse1.done;
+
+ }
+
+ function f_CSE_REG_DEL_004() runs on CseSimu {
//Local variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
@@ -2773,8 +3119,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
@@ -3268,11 +3613,11 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_CRE_005_MNI() runs on Tester system CseSystem {
// Local variables
- var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
var AttributeAux v_invalidAttribute;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_createRequest.primitiveContent.container.maxNrOfInstances := 0;
+ v_createRequest.primitiveContent.container_update_invalid.maxNrOfInstances := -1;
v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -3281,11 +3626,11 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_005_MBS() runs on Tester system CseSystem {
// Local variables
- var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
var AttributeAux v_invalidAttribute;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_createRequest.primitiveContent.container.maxByteSize := 0;
+ v_createRequest.primitiveContent.container_update_invalid.maxByteSize := -1;
v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -3295,11 +3640,11 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_005_MIA() runs on Tester system CseSystem {
// Local variables
- var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var template RequestPrimitive v_createRequest := m_createContainerBaseInvalid;
var AttributeAux v_invalidAttribute;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_createRequest.primitiveContent.container.maxInstanceAge := 0;
+ v_createRequest.primitiveContent.container_update_invalid.maxInstanceAge := -1;
v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
v_ae1.start(f_CSE_DMR_CRE_005(int3, v_createRequest, v_invalidAttribute));
@@ -3933,7 +4278,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
- const integer c_maxByteSize := 0;
+ const integer c_maxByteSize := 1;
// Test control
// Test component configuration
@@ -5234,7 +5579,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds with an error when the AE tries to update an attribute of a TARGET_RESOURCE_ADDRESS resource when the resource does not exist
*
*/
- testcase TC_CSE_DMR_UPD_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_UPD_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_UPD_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_UPD_005() runs on AeSimu {
//Local variables
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
@@ -7758,7 +8113,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable.
*
*/
- testcase TC_CSE_SUB_CRE_001_SUB() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_001_SUB());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_001_SUB() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -7821,7 +8186,17 @@ module OneM2M_Testcases_CSE_Release_1 {
} // end TC_CSE_SUB_CRE_001_SUB
- testcase TC_CSE_SUB_CRE_001_CIN() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_001_CIN());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_001_CIN() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -7888,7 +8263,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the originator does not have privileges for retrieving the subscribed-to resource.
*
*/
- testcase TC_CSE_SUB_CRE_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -7956,7 +8341,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT cannot send the Notify request to the notificationURI
*
*/
- testcase TC_CSE_SUB_CRE_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -8018,7 +8413,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT stores Originator ID in the notification creator attribute when a <SUBSCRIPTION> creation request which needs verification is received and the notificationURI is not the Originator.
*
*/
- testcase TC_CSE_SUB_CRE_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_004() runs on AeSimu {
//Local variables
var template RequestPrimitive v_request := m_createSubscriptionBase;
var RequestPrimitive v_notificationRequest;
@@ -8070,7 +8475,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Create_of_Direct_Child_Resource" and an create operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_CRE_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_CRE_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_CRE_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_CRE_005() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -8143,7 +8558,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT sends Notify request to the subscriber resource when an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
@@ -8219,7 +8644,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT sends a Notify request to the AE2_RESOURCE_ADDRESS of the subscriberURI attribute when the SUBSCRIPTION_RESOURCE_ADDRESS <subscription> resource is deleted
*
*/
- testcase TC_CSE_SUB_DEL_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_DEL_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_DEL_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_DEL_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -8309,7 +8744,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having multiple access control rules
*
*/
- testcase TC_CSE_SEC_ACP_CRE_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_CRE_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_CRE_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -8382,7 +8827,17 @@ module OneM2M_Testcases_CSE_Release_1 {
/**
* @desc Check that the IUT accepts the creation of a accessControlPolicy resource with selfPrivileges attribute having multiple access control rules
*/
- testcase TC_CSE_SEC_ACP_CRE_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_CRE_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_CRE_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -8456,7 +8911,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT accepts the creation of a accessControlPolicy resource with privileges attribute having empty rules
*
*/
- testcase TC_CSE_SEC_ACP_CRE_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_CRE_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_CRE_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_acpIndex := -1;
@@ -8529,7 +8994,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds with an error when the creation of a accessControlPolicy resource with selfPrivileges attribute having empty rules
*
*/
- testcase TC_CSE_SEC_ACP_CRE_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_CRE_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_CRE_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_CRE_004() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_acpIndex := -1;
@@ -8596,7 +9071,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT updates successfully the accessControlPolicyIDs attribute of the <AE> resource when the AE has privileges for UPDATE operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
*
*/
- testcase TC_CSE_SEC_ACP_UPD_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_UPD_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_UPD_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_UPD_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -8679,7 +9164,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds with an error when the AE tries an UPDATE operation on the accessControlPolicyIDs attribute without having privileges for such operation in any selfPrivileges of the <accessControlPolicy> resources which this attribute originally indicates.
*
*/
- testcase TC_CSE_SEC_ACP_UPD_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SEC_ACP_UPD_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SEC_ACP_UPD_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SEC_ACP_UPD_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9242,7 +9737,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT returns successfully a list all discovered resource addresses
*
*/
- testcase TC_CSE_DIS_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_001() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -9294,7 +9799,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT returns successfully appropriate list of discovered resource when the filter criteria is provided in the request
*
*/
- testcase TC_CSE_DIS_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9356,7 +9871,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT returns the empty address list when no result matching with filter criteria is discovered
*
*/
- testcase TC_CSE_DIS_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9417,7 +9942,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT returns successfully a list of discovered resource addresses with Non-hierarchical addressing form when the Discovery Result Type is provided in the request
*
*/
- testcase TC_CSE_DIS_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_004() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9478,7 +10013,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the discovery requests to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery request for the resource TARGET_RESOURCE_ADDRESS
*
*/
- testcase TC_CSE_DIS_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_005() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -9537,7 +10082,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds with an error when the AE sends requests to discover the resource TARGET_RESOURCE_ADDRESS which does not exist in the Hosting CSE
*
*/
- testcase TC_CSE_DIS_006() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_006() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_006());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_006() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9593,7 +10148,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds the originator with an error when the originator sends a request including an invalid format of filter criteria to discover the resource TARGET_RESOURCE_ADDRESS
*
*/
- testcase TC_CSE_DIS_007() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_007() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9629,7 +10194,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code while retrieving resource");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response while retrieving resource");
}
@@ -9651,7 +10216,7 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds the originator with an error when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
*
*/
- testcase TC_CSE_DIS_008_CRB_CRA() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_008_CRB_CRA() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9666,7 +10231,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- testcase TC_CSE_DIS_008_MS_US() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_008_MS_US() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9681,7 +10246,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- testcase TC_CSE_DIS_008_STS_STB() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_008_STS_STB() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9696,7 +10261,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- testcase TC_CSE_DIS_008_EXB_EXA() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_008_EXB_EXA() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -9717,7 +10282,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT returns the empty address list when resources match the filter criteria but they do not include DISCOVERY permission
*
*/
- testcase TC_CSE_DIS_009() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DIS_009() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DIS_009());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DIS_009() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9791,7 +10366,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the creation of the group resource when member ID exceed max number of members.
*
*/
- testcase TC_CSE_GMG_CRE_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_001() runs on AeSimu {
// Local constants
const XSD.NonNegativeInteger c_maxNrOfMembers := 1;
@@ -9868,7 +10453,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the creation of the group resource when the memberType cannot be retrieved due to lack of privilege.
*
*/
- testcase TC_CSE_GMG_CRE_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9942,7 +10537,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT detects the presence of duplicate member IDs during the creation of the <group> resource and removes the duplicate member IDs prior to creation of the <group> resource.
*
*/
- testcase TC_CSE_GMG_CRE_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -9999,7 +10604,17 @@ module OneM2M_Testcases_CSE_Release_1 {
/**
* @desc Check that the IUT validates the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’.
*/
- testcase TC_CSE_GMG_CRE_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_004() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -10056,7 +10671,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
*
*/
- testcase TC_CSE_GMG_CRE_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_005() runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -10124,7 +10749,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER,.
*
*/
- testcase TC_CSE_GMG_CRE_006() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_006() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_006());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_006() runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -10196,7 +10831,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
*
*/
- testcase TC_CSE_GMG_CRE_007() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_CRE_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_CRE_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_CRE_007() runs on AeSimu {
//Local variables
var MsgIn v_response;
var RequestPrimitive v_createRequest;
@@ -10257,7 +10902,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT generates a request primitive for each resource in memberIDs with a relative address appended to fanOutPoint that includes a virtual resource.
*
*/
- testcase TC_CSE_GMG_RET_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_RET_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_RET_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_RET_001() runs on AeSimu {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
@@ -10352,7 +11007,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT rejects the update of the group resource when the memberType cannot be retrieved due to lack of privilege.
*
*/
- testcase TC_CSE_GMG_UPD_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -10422,7 +11087,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT detects the presence of duplicate member IDs during an update of the <group> resource and removes the duplicate member IDs prior to updating the <group> resource.
*
*/
- testcase TC_CSE_GMG_UPD_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -10506,7 +11181,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT validates the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’.
*
*/
- testcase TC_CSE_GMG_UPD_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -10582,7 +11267,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the <group> resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED.
*
*/
- testcase TC_CSE_GMG_UPD_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_004() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10678,7 +11373,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during an UPDATE of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_MEMBER.
*
*/
- testcase TC_CSE_GMG_UPD_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_005() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10777,7 +11482,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles unsuccessful validation of the resource type during the creation of the group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is ABANDON_GROUP.
*
*/
- testcase TC_CSE_GMG_UPD_006() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_006() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_006());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_006() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10838,8 +11553,18 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT detects when the number of memberIDs exceeds the limitation of maxNrOfMembers.
*
*/
- testcase TC_CSE_GMG_UPD_007() runs on AeSimu system CseSystem
- {
+ testcase TC_CSE_GMG_UPD_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_007() runs on AeSimu {
+
//Local constants
const integer c_maxNrOfMembers := 2;
@@ -10920,7 +11645,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT detects when the value provided for maxNrOfMembers attribute is less than the value of the currentNrOfMembers attribute.
*
*/
- testcase TC_CSE_GMG_UPD_008() runs on AeSimu system CseSystem {
+ testcase TC_CSE_GMG_UPD_008() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_008());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_008() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
@@ -10992,8 +11727,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles validation of the resource type during an UPDATE of the <group> resource when memberIDs contains a sub-group on a temporarily unreachable Hosting CSE.
*
*/
- testcase TC_CSE_GMG_UPD_009() runs on AeSimu system CseSystem
- {
+ testcase TC_CSE_GMG_UPD_009() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_009());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_009() runs on AeSimu {
//Local constants
const integer c_maxNrOfMembers := 2;
const ResourceType c_ResourceTypeGroup := int9;
@@ -11095,8 +11839,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT handles validation of the resource type during an UPDATE of the group resource when memberIDs contains a sub-group on a a previously unreachable Hosting CSE that has become reachable
* @verdict
*/
- testcase TC_CSE_GMG_UPD_010() runs on AeSimu system CseSystem
- {
+ testcase TC_CSE_GMG_UPD_010() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_GMG_UPD_010());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_GMG_UPD_010() runs on AeSimu {
//Local constants
const ResourceType c_ResourceTypeGroup := int9;
const integer c_maxNrOfMembers := 2;
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 91fd819f3bb04b54833bedda4415e0d63a12a955..56c3218139208c95f10521469ec0935b7680cff3 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1448,7 +1448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_createRequest := m_createScheduleBase;
var RequestPrimitive v_requestPrimitive;
- var ScheduleEntries scheduleElement := {{"0,0,0 1 2,1,1,*"}};
+ var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement; //Correct value? Shall be indicated in TP?
@@ -1518,7 +1518,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT responds with an error when the AE tries to retrieve the resource TARGET_RESOURCE_ADDRESS which does not exist
*
*/
- testcase TC_CSE_DMR_RET_002() runs on AeSimu system CseSystem{
+ testcase TC_CSE_DMR_RET_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_RET_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_RET_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -1968,7 +1978,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the RETRIEVE Request of a latest resource target to a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_RET_009() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_RET_009() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_RET_009());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_RET_009() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -2023,7 +2043,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the RETRIEVE Request of a oldest resource target to a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_RET_011() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_RET_011() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_RET_011());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_RET_011() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -3278,8 +3308,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_createRequest.primitiveContent.schedule.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1
- v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1
+ v_createRequest.primitiveContent.schedule.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
+ v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
v_updateRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};//Attribute 2
v_updateRequest.primitiveContent.schedule.labels := v_labels_1;//Attribute 3
@@ -4724,7 +4754,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT responds with an error when the AE tries to delete the resource TARGET_RESOURCE_ADDRESS which does not exist
*
*/
- testcase TC_CSE_DMR_DEL_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_DEL_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_DEL_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_DEL_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -4839,7 +4879,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the DELETE request of a latest resource in a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_DEL_008() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_DEL_008() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_DEL_008());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_DEL_008() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -4897,7 +4947,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the DELETE request of a oldest resource in a container resource that has no direct child contentInstance resources.
*
*/
- testcase TC_CSE_DMR_DEL_010() runs on AeSimu system CseSystem {
+ testcase TC_CSE_DMR_DEL_010() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_DMR_DEL_010());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_DMR_DEL_010() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -4954,9 +5014,19 @@ module OneM2M_Testcases_CSE_Release_2 {
group Location {
- group g_CSE_LOC_BV_001{
+ group g_CSE_LOC_001{
- testcase TC_CSE_LOC_BV_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_LOC_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_001() runs on AeSimu {
var integer v_aeIndex := -1;
var RequestPrimitive v_request;
@@ -5009,12 +5079,22 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }// end testcase TC_CSE_LOC_BV_001
- }//end group g_CSE_LOC_BV_001
+ }// end testcase TC_CSE_LOC_001
+ }//end group g_CSE_LOC_001
- group g_CSE_LOC_BV_002{
- testcase TC_CSE_LOC_BV_002() runs on AeSimu system CseSystem {
+ group g_CSE_LOC_002{
+ testcase TC_CSE_LOC_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_002() runs on AeSimu {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Network-based
@@ -5072,14 +5152,24 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }// end testcase TC_CSE_LOC_BV_002
+ }// end testcase TC_CSE_LOC_002
- }//end group g_CSE_LOC_BV_002
+ }//end group g_CSE_LOC_002
- group g_CSE_LOC_BO_003{
+ group g_CSE_LOC_003{
- testcase TC_CSE_LOC_BO_003() runs on AeSimu system CseSystem {//the originator has no privileges to create a locationPolicy resource!!
+ testcase TC_CSE_LOC_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_003() runs on AeSimu {//the originator has no privileges to create a locationPolicy resource!!
var integer v_aeIndex := -1;
var integer v_acpAuxIndex := -1;
@@ -5144,12 +5234,22 @@ module OneM2M_Testcases_CSE_Release_2 {
f_cf01Down();
- } // end testcase TC_CSE_LOC_BO_003
+ } // end testcase TC_CSE_LOC_003
- }//end group g_CSE_LOC_BO_003
+ }//end group g_CSE_LOC_003
- group g_CSE_LOC_BO_004{
- testcase TC_CSE_LOC_BO_004() runs on AeSimu system CseSystem {
+ group g_CSE_LOC_004{
+ testcase TC_CSE_LOC_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_004() runs on AeSimu {
var integer v_aeIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
@@ -5203,14 +5303,24 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }// end testcase TC_CSE_LOC_BO_004
+ }// end testcase TC_CSE_LOC_004
- }//end group g_CSE_LOC_BO_004
+ }//end group g_CSE_LOC_004
- group g_CSE_LOC_BI_005{
+ group g_CSE_LOC_005{
- testcase TC_CSE_LOC_BI_005() runs on AeSimu system CseSystem {//reject an invalid update request with invalid attribtue locationUpdatePeriod
+ testcase TC_CSE_LOC_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_005() runs on AeSimu {//reject an invalid update request with invalid attribtue locationUpdatePeriod
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
@@ -5266,13 +5376,23 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BI_005
+ }//end testcase TC_CSE_LOC_005
- }//end group g_CSE_LOC_BI_005
+ }//end group g_CSE_LOC_005
- group g_CSE_LOC_BV_006 {
+ group g_CSE_LOC_006 {
- testcase TC_CSE_LOC_BV_006() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_006() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_006());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_006() runs on AeSimu {
//TO RETRIEVE a <container> resource that has created in cse and linked with a <locationPolicy> resource (network-based case)
var integer v_aeAuxIndex := -1;
@@ -5332,13 +5452,23 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_006
+ }//end testcase TC_CSE_LOC_006
- }//end group g_CSE_LOC_BV_006
+ }//end group g_CSE_LOC_006
- group g_CSE_LOC_BV_007 {
+ group g_CSE_LOC_007 {
- testcase TC_CSE_LOC_BV_007() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_007() runs on AeSimu {
//TO create a <locationPolicy> resource with locationSource set to Device-based
var integer v_aeAuxIndex := -1;
@@ -5347,63 +5477,76 @@ module OneM2M_Testcases_CSE_Release_2 {
var MsgIn v_response;
var LocationSource v_locationSource := int2;//Device-based
var integer v_resourceIndex := -1;
+
+ //Test control
+ if(not(PICS_ASN_CSE)) {
+ setverdict(inconc, __SCOPE__ & ": IUT shall support ASN-CSE to run this test case. Set PX_ASN_CSE to true to run this test case");
+ stop;
+ }
+
//Test component configuration
f_cf01Up();
-
- if(PX_ASN_CSE){
-
- //Preamble
- v_aeAuxIndex := f_cse_preamble_registerAe();
- //Set requestPrimitive
- v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
-
- // Test Body
- mcaPort.send(m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
- f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_isResourcePresent(v_resourceIndex)) {
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+ //Preamble
+ v_aeAuxIndex := f_cse_preamble_registerAe();
+ //Set requestPrimitive
+ v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
+
+ // Test Body
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+ f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
}
-
- // Postamble
- f_cse_postamble_deleteResources();
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+ }
+ }
+
+ f_checkAeSimuStatus();
+
+ //Check to see if the resource is present or not
+ if(f_isResourcePresent(v_resourceIndex)) {
+ setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+ } else {
+ setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
- }
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_007
+ }//end testcase TC_CSE_LOC_007
- }//end group g_CSE_LOC_BV_007
+ }//end group g_CSE_LOC_007
- group g_CSE_LOC_BV_008 {
+ group g_CSE_LOC_008 {
- testcase TC_CSE_LOC_BV_008() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_008() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_008());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_008() runs on AeSimu {
//TO create a <locationPolicy> resource with locationSource set to Share-based
var integer v_aeAuxIndex := -1;
@@ -5412,63 +5555,75 @@ module OneM2M_Testcases_CSE_Release_2 {
var MsgIn v_response;
var integer v_resourceIndex := -1;
+ //Test control
+ if(not(PICS_MN_CSE)) {
+ setverdict(inconc, __SCOPE__ & ": IUT shall support MN-CSE to run this test case. Set PX_MN_CSE to true to run this test case");
+ stop;
+ }
+
//Test component configuration
f_cf01Up();
-
-
- if(PX_MN_CSE){
-
- //Preamble
- v_aeAuxIndex := f_cse_preamble_registerAe();
- //Set requestPrimitive
- v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
-
- // Test Body
- mcaPort.send(m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
- f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
- v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is present or not
- if(f_isResourcePresent(v_resourceIndex)) {
- setverdict(pass, __SCOPE__ & ":INFO: Resource created");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+
+ //Preamble
+ v_aeAuxIndex := f_cse_preamble_registerAe();
+ //Set requestPrimitive
+ v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
+
+ // Test Body
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": Resource locationPolicy is created successfully with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!");
+ f_checkAttributesToBeSaved(int10, v_request, v_response.primitive.responsePrimitive);
+ v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int10, v_aeAuxIndex);
}
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Wrong response status code");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, __SCOPE__ & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, __SCOPE__ & ": Timeout due to no response from requested server!");
+ }
+ }
+
+ f_checkAeSimuStatus();
+
+ //Check to see if the resource is present or not
+ if(f_isResourcePresent(v_resourceIndex)) {
+ setverdict(pass, __SCOPE__ & ":INFO: Resource created");
+ } else {
+ setverdict(fail, __SCOPE__ & ":ERROR: Resource not created");
+ }
+
+ //Postamble
+ f_cse_postamble_deleteResources();
+
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_008
+ }//end testcase TC_CSE_LOC_008
- }//end group g_CSE_LOC_BV_008
+ }//end group g_CSE_LOC_008
- group g_CSE_LOC_BV_009 {
+ group g_CSE_LOC_009 {
- testcase TC_CSE_LOC_BV_009_01() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_009_01() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_009_01());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_009_01() runs on AeSimu {
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -5530,9 +5685,19 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_009_01
+ }//end testcase TC_CSE_LOC_009_01
- testcase TC_CSE_LOC_BV_009_02() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_BV_009_02() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_009_02());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_009_02() runs on AeSimu {
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -5593,9 +5758,19 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_009_02
+ }//end testcase TC_CSE_LOC_009_02
- testcase TC_CSE_LOC_BV_009_03() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_009_03() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_009_03());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_009_03() runs on AeSimu {
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -5655,31 +5830,41 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_009_03
- }//end group g_CSE_LOC_BV_009
+ }//end testcase TC_CSE_LOC_009_03
+ }//end group g_CSE_LOC_009
- /*group g_CSE_LOC_BV_007 {
- testcase TC_CSE_LOC_BV_007() runs on AeSimu system CseSystem{
+ /*group g_CSE_LOC_007 {
+ testcase TC_CSE_LOC_007() runs on AeSimu system CseSystem{
//TODO
- }//end testcase TC_CSE_LOC_BV_007
- }//end group g_CSE_LOC_BV_007
+ }//end testcase TC_CSE_LOC_007
+ }//end group g_CSE_LOC_007
- group g_CSE_LOC_BV_008 {
- testcase TC_CSE_LOC_BV_008() runs on AeSimu system CseSystem{
+ group g_CSE_LOC_008 {
+ testcase TC_CSE_LOC_008() runs on AeSimu system CseSystem{
//TODO
- }//end testcase TC_CSE_LOC_BV_008
- }//end group g_CSE_LOC_BV_008
+ }//end testcase TC_CSE_LOC_008
+ }//end group g_CSE_LOC_008
*/
- group g_CSE_LOC_BV_012 {
- testcase TC_CSE_LOC_BV_012() runs on AeSimu system CseSystem{
+ group g_CSE_LOC_012 {
+ testcase TC_CSE_LOC_012() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_012());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_012() runs on AeSimu {
//To CREATE a <subscription> resource as a child resource of the created <container>
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
var integer v_locContainerResourceIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
- var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
+ var XSD.Duration locationUpdatePeriod := PX_LOCATION_UPDATE_PERIOD;
var LocationTargetID locationTargetID := PX_LOCATION_TARGET_ID;
var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS;
var RequestPrimitive v_locpolicy_request_preamble;
@@ -5727,12 +5912,22 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_012
- }//end group g_CSE_LOC_BV_012
+ }//end testcase TC_CSE_LOC_012
+ }//end group g_CSE_LOC_012
- group g_CSE_LOC_BV_013 {
+ group g_CSE_LOC_013 {
- testcase TC_CSE_LOC_BV_013() runs on AeSimu system CseSystem{
+ testcase TC_CSE_LOC_013() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_LOC_013());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_LOC_013() runs on AeSimu {
//TO RETRIEVE a <locationPolicy> resource that has created in cse
var integer v_aeAuxIndex := -1;
@@ -5787,9 +5982,9 @@ module OneM2M_Testcases_CSE_Release_2 {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_013
+ }//end testcase TC_CSE_LOC_013
- }//end group g_CSE_LOC_BV_013
+ }//end group g_CSE_LOC_013
}//end group Location
@@ -5806,7 +6001,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE
*
*/
- testcase TC_CSE_SUB_NTF_001() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_NTF_001() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_NTF_001());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_NTF_001() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -5871,7 +6076,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT rejects the creation of the <subscription> resource when the notificationURI is not the originator and the IUT have received the Notify response containing Response Status Code indicating SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE
*
*/
- testcase TC_CSE_SUB_NTF_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_NTF_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_NTF_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_NTF_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -5936,7 +6151,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends aggregated notification to the subscriber resource when the duration value of the batchNotify attribute is set to TIME_LIMIT and when this timer expires
*
*/
- testcase TC_CSE_SUB_NTF_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_NTF_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_NTF_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_NTF_003() runs on AeSimu {
// Local variables
timer t_batchNotificationTimer := PX_TAC * 2.0;
var float v_elapsedTime;
@@ -6010,7 +6235,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “modified attributes†and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -6087,7 +6322,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the notificationContentType attribute is set to “ResourceID†and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -6160,7 +6405,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT decreases the expirationCounter attribute of a subscription resource when the Hosting CSE of the subscribed-to resource successfully sends the notification request to subscriber resource(s)
*
*/
- testcase TC_CSE_SUB_UPD_004() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_004() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_004());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_004() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -6244,7 +6499,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT deletes the subscription resource when the the expirationCounter meets zero
*
*/
- testcase TC_CSE_SUB_UPD_005() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_005() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_005());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_005() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -6320,7 +6585,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT doesn’t send a Notify request to the subscriber resource when the “attribute†condition tag of eventNotificationCriteria attribute is set to LIST_OF_ATTRIBUTE and doesn’t contain the ATTRIBUTE_NAME attribute updated.
*
*/
- testcase TC_CSE_SUB_UPD_006() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_006() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_006());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_006() runs on AeSimu {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
@@ -6393,7 +6668,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends aggregated notification to the subscriber resource when the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
*
*/
- testcase TC_CSE_SUB_UPD_007() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_007() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_007());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_007() runs on AeSimu {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
@@ -6455,7 +6740,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends the latest notification to the subscriber resource when latestNotify is set to TRUE, the number value of the batchNotify attribute is set to GROUP_LIMIT and when this number have been reached
*
*/
- testcase TC_CSE_SUB_UPD_008() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_008() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_008());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_008() runs on AeSimu {
// Local variables
const integer numberOfAggregatedNotification := 3;
var Labels v_labels_1:= {"VALUE_1"};
@@ -6521,7 +6816,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when the “attribute†condition tag of eventNotificationCriteria attribute is set to ATTRIBUTE_NAME and an update operation has been performed on the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_UPD_009() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_UPD_009() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_UPD_009());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_UPD_009() runs on AeSimu {
// Local variables
var MsgIn v_response;
var Labels v_labels_1:= {"VALUE_1"};
@@ -6602,7 +6907,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Resource" and an delete operation has been performed the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_DEL_002() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_DEL_002() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_DEL_002());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_DEL_002() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -6675,7 +6990,17 @@ module OneM2M_Testcases_CSE_Release_2 {
* @desc Check that the IUT sends a Notify request to the subscriber resource when eventType attribute is set to "Delete_of_Direct_Child_Resource" and an delete operation has been performed on a child resource of the subscribed-to resource
*
*/
- testcase TC_CSE_SUB_DEL_003() runs on AeSimu system CseSystem {
+ testcase TC_CSE_SUB_DEL_003() runs on Tester system CseSystem {
+
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_ae1.start(f_CSE_SUB_DEL_003());
+
+ v_ae1.done;
+
+ }
+
+ function f_CSE_SUB_DEL_003() runs on AeSimu {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;