diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 1fa34a1ab1a52e668ab94ac6578fdf6b33e56517..e812745d23c295fd54afdaa1aa5584eca3837da5 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -65,8 +65,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { e_mca_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { e_mca_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf01());
@@ -126,8 +126,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { e_mca_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { e_mca_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
//Initialze the IUT
@@ -180,8 +180,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { e_mca_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { e_mca_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
activate(a_default());
vc_aeSimu := activate(a_cse_cf02_ae1());
@@ -239,8 +239,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { e_mcc_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { e_mcc_in_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
@@ -301,8 +301,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { e_mcc_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { e_mcc_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf02_cse1());
@@ -355,8 +355,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { e_mca_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { e_mca_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
//Initialze the IUT
@@ -411,8 +411,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { e_mca_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { e_mca_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPortIn.serialization)] };
if(PX_UT_IMPLEMENTED) {
map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -477,8 +477,8 @@ module OneM2M_Functions {
v_binding_in := "WSCK";
}
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
- vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { e_mcc_port, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+ vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { e_mcc_in_port, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
activate(a_default());
vc_cseSimu := activate(a_cse_cf04());
@@ -1237,7 +1237,7 @@ module OneM2M_Functions {
v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]);
- f_send(e_mca_port, m_request(v_request));
+ f_send(e_mca_port, m_request(v_request), false);
tc_ac.start;
alt {
@@ -1304,6 +1304,7 @@ module OneM2M_Functions {
var integer v_resourceIndex := -1;
var URIList v_childResourceRefs;
var XSD.ID v_resourceAddress;
+ var MsgIn v_msgIn;
var RequestPrimitive v_request;
var boolean v_deregistrationPerformed := false;
var template UtTriggerPrimitive v_utRequest := m_utDelete;
@@ -1329,7 +1330,7 @@ module OneM2M_Functions {
v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(v_resourceIndex, vc_testSystemRole)));
- f_send(e_mcc_port, m_request(v_request));
+ f_send(e_mcc_port, m_request(v_request), false);
tc_ac.start;
alt {
@@ -1359,7 +1360,7 @@ module OneM2M_Functions {
//v_request := valueof(m_delete(v_childResourceRefs[0], f_getOriginator(vc_remoteCseIndex)));
v_request := valueof(m_delete(v_childResourceRefs[0]));//TODO Originator super user to be replaced by CSE1_ID (line above)
- f_send(e_mcc_port, m_request(v_request));
+ f_send(e_mcc_port, m_request(v_request), false);
tc_ac.start;
alt {
@@ -1387,9 +1388,9 @@ module OneM2M_Functions {
tc_ac.start;
alt {
- [] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
+ [] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value v_msgIn {
tc_ac.stop;
- f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
+ f_processDeleteRequestPrimitive(v_msgIn.primitive.requestPrimitive);
f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
log(__SCOPE__&": INFO: Deregistration performed successfully");
}
@@ -1582,15 +1583,16 @@ module OneM2M_Functions {
* @verdict
*/
function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
-
- f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+ var MsgIn v_retrievedResponse;
+
+ f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))), false);
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_retrievedResponse {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
}
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while retrieving resource");
}
@@ -1601,7 +1603,7 @@ module OneM2M_Functions {
f_checkAeSimuStatus();
- return vc_response.primitive.responsePrimitive.primitiveContent;
+ return v_retrievedResponse.primitive.responsePrimitive.primitiveContent;
}// end f_cse_retrieveResource
@@ -2960,7 +2962,7 @@ module OneM2M_Functions {
* @param p_resourceType Type of the resource to be created
* @return Index of internal created resource
*/
- function f_generateAndSetLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex := vc_cSEBaseIndex, in ResourceType p_resourceType) runs on CseSimu return Integer {
+ function f_generateAndSetLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex := 0, in ResourceType p_resourceType) runs on CseSimu return Integer { //vc_cSEBaseIndex, in ResourceType p_resourceType) runs on CseSimu return Integer {
var PrimitiveContent v_localResource;
var integer v_localResourceIndex;
@@ -2980,7 +2982,7 @@ module OneM2M_Functions {
* @param p_resourceType Type of the resource to be created
* @return Internal created resource
*/
- function f_generateLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex := vc_cSEBaseIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
+ function f_generateLocalResource(in template(omit) PrimitiveContent p_resource := omit, in integer p_parentIndex := 0, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent { //vc_cSEBaseIndex, in ResourceType p_resourceType) runs on CseSimu return PrimitiveContent {
var integer v_resourceIndex := lengthof(vc_localResourcesList);
var PrimitiveContent v_myResource;
@@ -3646,7 +3648,7 @@ module OneM2M_Functions {
//Send response in any case
v_response := valueof(m_responseNotification(int2000, omit));
- v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ v_response.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mca_in_port, m_response(v_response));
repeat;
}
@@ -3655,7 +3657,7 @@ module OneM2M_Functions {
//Send response in any case
v_response := valueof(m_responseNotification(int2000, omit));
- v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
+ v_response.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mca_in_port, m_response(v_response));
repeat;
}
@@ -3875,7 +3877,7 @@ module OneM2M_Functions {
group CseSimuFunctions {
- function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := vc_cSEBaseIndex) runs on CseSimu return integer {
+ function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := 0) runs on CseSimu return integer { //vc_cSEBaseIndex) runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
@@ -4686,9 +4688,11 @@ module OneM2M_Functions {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
}
}
- v_poa := v_poa & "/" & p_additionalContext;
+ if(p_additionalContext != ""){
+ v_poa := v_poa & "/" & p_additionalContext;
+ }
- return v_poa;
+ return v_poa;
}
/**
@@ -4723,7 +4727,9 @@ module OneM2M_Functions {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.remotePort);
}
}
- v_poa := v_poa & "/" & p_additionalContext;
+ if(p_additionalContext != ""){
+ v_poa := v_poa & "/" & p_additionalContext;
+ }
return v_poa;
}
@@ -5086,7 +5092,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 := vc_cSEBaseIndex) runs on CseSimu return integer {
+ function f_setLocalResource(PrimitiveContent p_resource, ResourceType p_resourceType, integer p_parentIndex := 0) runs on CseSimu return integer { //vc_cSEBaseIndex) 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};
@@ -5704,7 +5710,7 @@ module OneM2M_Functions {
}
}
case ("MqttSetDefaultTopicToNotRegistration") {
- acPort.send(AcRequestPrimitive:{p_event, {charstring := oct2char(unichar2oct(p_originator))}});
+ acPort.send(AcRequestPrimitive:{p_event, {charstring := oct2char(unichar2oct(valueof(p_originator)))}});
}
case ("MqttSetDefaultTopicToRegistration") {
acPort.send(AcRequestPrimitive:{p_event, {charstring := int2str(p_resourceIndex)}});
@@ -6021,7 +6027,8 @@ module OneM2M_Functions {
function f_send(
in InterfaceIds p_interfaceIds,
- in template MsgOut p_msgOut
+ in template MsgOut p_msgOut,
+ in boolean p_storingRequest := true
) runs on Tester {
log(">>> f_send: ", p_interfaceIds);
@@ -6030,8 +6037,10 @@ module OneM2M_Functions {
p_msgOut.serialization := vc_myInterfaces[enum2int(p_interfaceIds)].mySerialization;
log("f_send: protocolBinding=", p_msgOut.protocolBinding);
if(ischosen(p_msgOut.primitive.requestPrimitive)){
- p_msgOut.primitive.requestPrimitive.requestIdentifier := p_msgOut.primitive.requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
- vc_request.primitive.requestPrimitive := valueof(p_msgOut.primitive.requestPrimitive);
+ p_msgOut.primitive.requestPrimitive.requestIdentifier := valueof(p_msgOut.primitive.requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
+ if(p_storingRequest){
+ vc_request.primitive.requestPrimitive := valueof(p_msgOut.primitive.requestPrimitive);
+ }
}
if(not(vc_componentRegistered)) {
if(valueof(p_msgOut.protocolBinding) == "MQTT") {
@@ -6040,14 +6049,14 @@ module OneM2M_Functions {
if((valueof(p_msgOut.primitive.requestPrimitive.resourceType) != int2) and (valueof(p_msgOut.primitive.requestPrimitive.resourceType) != int16)){
//Modify default topic to publish a non-registration message
f_sendAcPrimitive("MqttSetDefaultTopicToNotRegistration", -1, valueof(p_msgOut.primitive.requestPrimitive.from_));
- vc_myInterfaces[enum2int(p_interfaceIds)].myPort.send(p_msgOut);
+ f_sendWrapper(p_interfaceIds, p_msgOut);
f_sendAcPrimitive("MqttSetDefaultTopicToRegistration", -1);
return;
}
} else {//RETRIEVE - UPDATE - DELETE - NOTIFY
//Modify default topic to publish a non-registration message
f_sendAcPrimitive("MqttSetDefaultTopicToNotRegistration", -1, valueof(p_msgOut.primitive.requestPrimitive.from_));
- vc_myInterfaces[enum2int(p_interfaceIds)].myPort.send(p_msgOut);
+ f_sendWrapper(p_interfaceIds, p_msgOut);
f_sendAcPrimitive("MqttSetDefaultTopicToRegistration", -1);
return;
}
@@ -6055,7 +6064,27 @@ module OneM2M_Functions {
}
}
//TODO: Handle response to normal messages before CSE registration occurs
- vc_myInterfaces[enum2int(p_interfaceIds)].myPort.send(p_msgOut);
+ f_sendWrapper(p_interfaceIds, p_msgOut);
+ }
+
+ function f_sendWrapper(in InterfaceIds p_interfaceIds,in template MsgOut p_msgOut) runs on Tester {
+
+ select (p_interfaceIds) {
+
+ case (e_mca_port) {
+ mcaPort.send(p_msgOut);
+ }
+ case (e_mca_in_port) {
+ mcaPortIn.send(p_msgOut);
+ }
+ case (e_mcc_port) {
+ mccPort.send(p_msgOut);
+ }
+ case (e_mcc_in_port) {
+ mccPortIn.send(p_msgOut);
+ }
+ }
+
}
/**
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index aa52cf85fe79b0fec33ff7d15bfd4a1a2d3bf076..b3851c716692a71725ebcd08f4363879c245183a 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1586,31 +1586,31 @@ module OneM2M_Templates {
group ContentCreate {
- template (value) PrimitiveContent m_primitiveContentAe(template AE_optional p_ae) := {
+ template (value) PrimitiveContent m_primitiveContentAe(template (value) AE_optional p_ae) := {
aE := valueof(p_ae)
}
- template (value) PrimitiveContent m_primitiveContentContainer(template Container_optional p_container) := {
+ template (value) PrimitiveContent m_primitiveContentContainer(template (value) Container_optional p_container) := {
container := valueof(p_container)
}
- template (value) PrimitiveContent m_primitiveContentContentInstance(template ContentInstance_optional p_contentInstance) := {
+ template (value) PrimitiveContent m_primitiveContentContentInstance(template (value) ContentInstance_optional p_contentInstance) := {
contentInstance := valueof(p_contentInstance)
}
- template (value) PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
+ template (value) PrimitiveContent m_primitiveContentCSEBase(template (value) CSEBase_optional p_cSEBase) := {
cSEBase := valueof(p_cSEBase)
}
- template (value) PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
+ template (value) PrimitiveContent m_primitiveContentRemoteCSE(template (value) RemoteCSE_optional p_remoteCSE) := {
remoteCSE := valueof(p_remoteCSE)
}
- template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template ResponsePrimitive p_responsePrimitive) := {
+ template (value) PrimitiveContent m_primitiveContentResponsePrimitive(template (value) ResponsePrimitive p_responsePrimitive) := {
responsePrimitive := valueof(p_responsePrimitive)
}
- template (value) PrimitiveContent m_primitiveContentGroup(template Group_optional p_group) := {
+ template (value) PrimitiveContent m_primitiveContentGroup(template (value) Group_optional p_group) := {
group_ := valueof(p_group)
}
@@ -2243,8 +2243,8 @@ module OneM2M_Templates {
labels := ?,//M
accessControlPolicyIDs := ?,//M
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
link := ?,//M
+ dynamicAuthorizationConsultationIDs := *, //O
nodeID := ?,//M
hostedCSELink := *,//O
mgmtClientAddress := *,//O
@@ -2445,7 +2445,7 @@ module OneM2M_Templates {
subscriberURI := p_subscriberURI//O
};
- template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
+ template (value) EventNotificationCriteria m_eventNotificationCriteria (template (omit) EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := omit, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
@@ -2456,7 +2456,7 @@ module OneM2M_Templates {
expireAfter := omit,
sizeAbove := omit,
sizeBelow := omit,
- operationMonitor_list := {},
+ operationMonitor_list := omit,
attribute := p_attribute_list,
notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
missingData := omit,
@@ -5558,9 +5558,9 @@ module OneM2M_Templates {
resultPersistence := omit,
resultContent := omit,
eventCategory := omit,
- filterCriteria := omit,
deliveryAggregation := omit,
groupRequestIdentifier := omit,
+ filterCriteria := omit,
desiredIdentifierResultType := omit,
tokens := omit,
tokenIDs := omit,
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index fe3b31aa6366f1aa0ec20a90e71b2d88fb9cb94a..d2f625fe371f5b80bfc56d79f4138e2e4c141871 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -28,7 +28,7 @@ module OneM2M_TestSystem {
}
type record Interface {
- OneM2MPort myPort,
+ InterfaceIds myPort,
charstring myHost,
charstring myProtocolBinding,
charstring mySerialization
@@ -41,6 +41,11 @@ module OneM2M_TestSystem {
port AdapterControlPort acPort;
port InfoPort infoPort;
port UpperTesterPort utPort;
+ //Ports for AeSimu/CseSimu
+ port OneM2MPort mcaPort;
+ port OneM2MPort mcaPortIn;
+ port OneM2MPort mccPort;
+ port OneM2MPort mccPortIn;
//Common timers
timer tc_ac := PX_TAC;
timer tc_wait := PX_TWAIT;
@@ -70,9 +75,6 @@ module OneM2M_TestSystem {
//Attached components depending on config
var AeSimu vc_ae2;
var CseSimu vc_cse1;//For CF02 when AeSimu is master
- //Ports
- port OneM2MPort mcaPort;
- port OneM2MPort mcaPortIn;
//global variables
//About configuration of the component
//Resource Index
@@ -84,11 +86,6 @@ module OneM2M_TestSystem {
type component CseSimu extends Tester {
//Attached components depending on config
var AeSimu vc_ae1;//For CF02 when CseSimu is master
- //Ports
- port OneM2MPort mcaPort;
- port OneM2MPort mcaPortIn;
- port OneM2MPort mccPort;
- port OneM2MPort mccPortIn;
//global variables
//About configuration of the component
var CseTypeID vc_cseType; //cseType of the simulated CSE. IN =1, MN = 2
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index d5bb3d0029d90aae8e4961173a19b045ef1a4adb..b55ce90a964bd32e0dfd3f48f17f0d938814ecca 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit d5bb3d0029d90aae8e4961173a19b045ef1a4adb
+Subproject commit b55ce90a964bd32e0dfd3f48f17f0d938814ecca
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index b6b78739a2abc7f7a6628c48d4cee6bcf1e1163c..a53e93702f2ca2b3e2a71a0618ded0665c8889a0 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5949,6 +5949,7 @@ module OneM2M_PermutationFunctions {
function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
//Local variables
var MsgIn v_response;
+ var MsgIn v_msgIn;
var RequestPrimitive v_request;
var ResponsePrimitive v_responsePrimitive;
var integer v_aeIndex := -1;
@@ -6027,11 +6028,11 @@ 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 {
+ [] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotificationVerification))) -> value v_msgIn {
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;
+ v_responsePrimitive.requestIdentifier := v_msgIn.primitive.requestPrimitive.requestIdentifier;
f_send(e_mca_in_port, m_response(v_responsePrimitive));
tc_ac.start;
repeat;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 999104a3c26db664050540606ca29e7ea0e02632..79d8dec872a881fd9716b333301300bf5b9a2f0d 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -589,7 +589,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Local variables
var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive;
- const charstring v_cseId := PX_CSE_ID;
+ const charstring v_cseId := oct2char(unichar2oct(PX_CSE_ID));
template XSD.AnyURI v_link := pattern "{v_cseId}/S";
//Test control
@@ -656,7 +656,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive;
var integer v_cseBaseIndex := -1;
- const charstring v_cseId := PX_CSE_ID;
+ const charstring v_cseId := oct2char(unichar2oct(PX_CSE_ID));
template XSD.AnyURI v_link := pattern "{v_cseId}/?*";
//Test control
@@ -724,7 +724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template RequestPrimitive v_requestPrimitive;
var integer v_aeIndex := -1;
var integer v_aeAnncIndex := -1;
- const charstring v_cseId := PX_CSE_ID;
+ const charstring v_cseId := oct2char(unichar2oct(PX_CSE_ID));
template XSD.AnyURI v_link := pattern "{v_cseId}/?*";
//Test control
@@ -2187,7 +2187,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_aeAnncIndex := -1;
var template PrimitiveContent v_primitiveContent;
- const charstring v_cseId := PX_CSE_ID;
+ const charstring v_cseId := oct2char(unichar2oct(PX_CSE_ID));
template XSD.AnyURI v_link := pattern "{v_cseId}/S*";
template XSD.ID v_resourceID := pattern "S*";
@@ -3661,15 +3661,16 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_CRE_001_CNT_CB() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, -)); //Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3679,17 +3680,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_CNT_AE() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.container.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
@@ -3700,6 +3702,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_CNT_CNT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3707,9 +3710,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.container.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int3, v_createRequest, m_createContainerBase));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3719,6 +3722,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_GRP_CB() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3726,11 +3730,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.group_.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, -));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3740,6 +3744,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_GRP_AE() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3747,11 +3752,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.group_.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int9, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3761,6 +3766,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_ACP_CB() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3768,11 +3774,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, -));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3782,6 +3788,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_ACP_AE() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -3789,11 +3796,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_createRequest.primitiveContent.accessControlPolicy.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int1, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3803,17 +3810,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_SUB_CB() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, -));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3823,17 +3831,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_SUB_AE() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3843,17 +3852,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_SUB_CNT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createContainerBase));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3863,17 +3873,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_SUB_ACP() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int23, v_createRequest, m_createAcpBase));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3882,17 +3893,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_SUB_CSR() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_createRequest.primitiveContent.subscription.resourceName := omit;
v_cse1.start(f_CSE_DMR_CRE_001_cseSimu(int23, v_createRequest));//Subscription
- v_cse1.done;
+ v_cse1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_cse1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3901,17 +3913,18 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_001_CIN_CNT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_createRequest.primitiveContent.contentInstance.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int4, v_createRequest, m_createContainerBase));//ContentInstance
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.contentInstance.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
@@ -3930,15 +3943,16 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_CRE_002_CNT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int3, m_createContainerBase));//container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
@@ -3952,15 +3966,16 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_002_GRP() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int9, m_createGroupBase));//group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.group_.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
@@ -3973,15 +3988,16 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_002_ACP() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int1, m_createAcpBase ));//accessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
@@ -3994,15 +4010,16 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_002_SUB() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int23, m_createSubscriptionBase));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
@@ -4159,16 +4176,17 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_CRE_006_MNI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
setverdict(fail, __SCOPE__ & ": Error, maxNrOfInstances attribute not provided");
}
@@ -4177,16 +4195,17 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_006_MBS() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__ & ": Error, maxByteSize attribute not provided");
}
@@ -4196,16 +4215,17 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_CRE_006_MIA() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
setverdict(fail, __SCOPE__ & ": Error, maxInstanceAge attribute not provided");
}
@@ -5129,6 +5149,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_001_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5141,11 +5162,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_001(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5168,6 +5189,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_001_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5180,11 +5202,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_001(int9, v_createRequest, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5207,6 +5229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_001_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5219,11 +5242,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_001(int1, v_createRequest, v_updateRequest));//ACP
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5246,6 +5269,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_001_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5258,11 +5282,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_001(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5294,6 +5318,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_002_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5303,11 +5328,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_002(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5330,6 +5355,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_002_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5339,11 +5365,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_002(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5366,6 +5392,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_002_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5375,11 +5402,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_002(int1, m_createAcpBase,v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5402,6 +5429,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_002_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5411,11 +5439,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_002(int23, m_createSubscriptionBase,v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5446,6 +5474,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_003_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5461,11 +5490,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_003(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -5492,6 +5521,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_003_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5507,11 +5537,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_003(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -5536,6 +5566,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_003_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5551,11 +5582,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_003(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -5580,6 +5611,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_003_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -5595,11 +5627,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_003(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -5632,6 +5664,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
@@ -5648,11 +5681,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_004(int3, v_createRequest, v_updateRequest, v_nullFields));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
//Check attribute 1
@@ -5692,6 +5725,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_groupName_1 := "VALUE_1";
var Labels v_labels_1 := {"VALUE_1"};
@@ -5710,11 +5744,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_004(int9, v_createRequest, v_updateRequest, v_nullFields));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
//Check attribute 1
@@ -5754,6 +5788,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_004_ACP_PVS_PV_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
@@ -5773,11 +5808,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_004(int1, v_createRequest, v_updateRequest, v_nullFields));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
//Check attribute 1
@@ -5817,6 +5852,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var AttributeAux_list v_nullFields;
@@ -5832,11 +5868,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_nullFields := {{"expirationCounter", omit}};
v_ae1.start(f_CSE_DMR_UPD_004(int23, v_createRequest, v_updateRequest, v_nullFields));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
//Check attribute 1
@@ -5960,6 +5996,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_006_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -5967,9 +6004,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -5982,6 +6019,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -5989,9 +6027,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
@@ -6004,6 +6042,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6014,9 +6053,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
@@ -6029,6 +6068,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -6036,9 +6076,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
@@ -6059,6 +6099,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -6067,9 +6108,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.container_invalid)) {
@@ -6082,6 +6123,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -6090,9 +6132,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_invalid)) {
@@ -6105,6 +6147,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6113,9 +6156,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy_invalid)) {
@@ -6128,6 +6171,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -6136,9 +6180,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription_invalid)) {
@@ -6160,6 +6204,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_008_GRP_MNM() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var AttributeAux_list v_nullFields;
@@ -6169,14 +6214,14 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
v_ae1.start(f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.maxNrOfMembers == 0){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ if(not ispresent(v_primitiveContentRetrieveResource.group_.maxNrOfMembers)){
+ setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers attribute deleted")
}
}
}
@@ -6184,6 +6229,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_008_ACP_PVS() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_selfPrivileges:= {{valueof(m_createAcr({"all"}, int63))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -6194,14 +6240,14 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
v_ae1.start(f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
- if(v_primitiveContentRetrieveResource.accessControlPolicy.selfPrivileges == v_selfPrivileges) {
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ if(not ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.selfPrivileges)) {
+ setverdict(fail, __SCOPE__ & ": Error: selfPrivileges attribute deleted")
}
}
}
@@ -6209,6 +6255,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_008_SUB_NU() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var AttributeAux_list v_nullFields;
@@ -6218,14 +6265,14 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
v_ae1.start(f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
- if(v_primitiveContentRetrieveResource.subscription.notificationURI == {"NullTarget"}){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ if(not ispresent(v_primitiveContentRetrieveResource.subscription.notificationURI)){
+ setverdict(fail, __SCOPE__ & ": Error: notificationURI attribute deleted")
}
}
}
@@ -6305,19 +6352,20 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
// Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+ var verdicttype v_verdict;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var template RequestPrimitive v_createRequest := m_createContainerBase;
- var Labels v_labels_1:= {"VALUE_1"};
+ var Labels v_labels_1:= {"VALUE_1"};
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that stateTag has been incremented
if(ischosen(v_primitiveContentRetrieveResource.container)) {
@@ -6340,19 +6388,20 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_UPD_011_CNT_CIN() runs on Tester system CseSystem {
// Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
- var Labels v_labels:= {"LABEL"};
+ var verdicttype v_verdict;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+ var Labels v_labels:= {"LABEL"};
var template RequestPrimitive v_createParentRequest := m_createContainerBase;
var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
- var PrimitiveContent v_primitiveContentRetrieveResource;
+ var PrimitiveContent v_primitiveContentRetrieveResource;
- v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
+ v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
@@ -6534,6 +6583,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_ACP_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -6545,11 +6595,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -6564,9 +6614,11 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_CNT_ACPI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
+ var RequestPrimitive v_requestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -6575,15 +6627,16 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest, true));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
- if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+ if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != v_requestPrimitive.primitiveContent.container.accessControlPolicyIDs){
setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
}
}
@@ -6593,6 +6646,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_CNT_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
@@ -6604,11 +6658,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6622,6 +6676,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_CNT_MBS() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxByteSize_1 := 256;
var XSD.NonNegativeInteger v_maxByteSize_2 := 512;
@@ -6633,11 +6688,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6651,6 +6706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_CNT_MIA() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxInstanceAge_1 := 60;
var XSD.NonNegativeInteger v_maxInstanceAge_2 := 120;
@@ -6662,11 +6718,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6680,6 +6736,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_CNT_MNI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxNrOfInstances_1 := 1;
var XSD.NonNegativeInteger v_maxNrOfInstances_2 := 2;
@@ -6691,11 +6748,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -6709,25 +6766,28 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_SUB_ACPI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+ var RequestPrimitive v_requestPrimitive;
var ResponsePrimitive v_responsePrimitive;
v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest, true));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
- if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+ if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs){
setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
}
}
@@ -6738,6 +6798,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_014_SUB_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"VALUE_2"};
@@ -6748,11 +6809,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -6774,6 +6835,7 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
*/
testcase TC_CSE_DMR_UPD_015_CSR_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6782,11 +6844,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.remoteCSE.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6807,6 +6869,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6815,11 +6878,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList;
v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6840,6 +6903,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CSR_NL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_nodeLink := "MyNodeId";
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -6848,11 +6912,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink;
v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -6873,6 +6937,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_AE_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6881,11 +6946,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.aE.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -6906,17 +6971,18 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_AE_ACPI() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest, true));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_responsePrimitive := f_getResponsePrimitive(v_ae1);
v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
@@ -6939,6 +7005,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_AE_APN() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_appName := "MyAppName";
var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6946,11 +7013,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.appName := v_appName;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -6971,6 +7038,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PoaList v_poaList := {f_getLocalPoA(PX_TS_AE2.mcaPortIn)};
var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -6978,11 +7046,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7003,6 +7071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CNT_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7011,11 +7080,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7036,17 +7105,18 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CNT_ACPI() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_responsePrimitive := f_getResponsePrimitive(v_ae1);
v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
@@ -7069,6 +7139,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CNT_MNI() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7077,11 +7148,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances;
v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7102,6 +7173,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CNT_MBS() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxByteSize := 512;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7110,11 +7182,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7135,6 +7207,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_CNT_MIA() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.NonNegativeInteger v_maxInstanceAge := 1;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
@@ -7143,11 +7216,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge;
v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7168,6 +7241,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_ACP_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7176,11 +7250,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7201,17 +7275,18 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_SUB_ACPI() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_responsePrimitive := f_getResponsePrimitive(v_ae1);
v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
@@ -7234,6 +7309,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_SUB_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7241,11 +7317,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7266,6 +7342,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_GRP_LBL() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels := {"MyLabel"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7273,11 +7350,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7298,17 +7375,18 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_GRP_ACPI() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_responsePrimitive := f_getResponsePrimitive(v_ae1);
v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
@@ -7331,22 +7409,25 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_GRP_MACP() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
+ var RequestPrimitive v_updateRequestPrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
- if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
+ if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
}
}
@@ -7355,7 +7436,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
+ if(v_primitiveContentRetrieveResource.group_.membersAccessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
}
}
@@ -7363,6 +7444,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_015_GRP_GN() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.String v_groupName:="MyGroupName";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7370,11 +7452,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.groupName := v_groupName;
v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7402,19 +7484,20 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT updates successfully the value of the attribute MANDATORY_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase
*/
testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -7435,6 +7518,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_CSR_RR() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_requestReachability := true;
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
@@ -7443,9 +7527,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.remoteCSE)) {
@@ -7466,19 +7550,20 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7499,6 +7584,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_AE_RR() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_requestReachability := true;
var template RequestPrimitive v_updateRequest := m_updateAeBase;
@@ -7507,11 +7593,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_TS_AE1.appId, -, PX_TS_AE1.aeIdStem), v_updateRequest));//AE
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
@@ -7532,19 +7618,20 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -7565,19 +7652,20 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_ACP_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7598,6 +7686,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_ACP_PV() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7605,11 +7694,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1;
v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7630,6 +7719,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_ACP_PVS() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int62))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
@@ -7637,11 +7727,11 @@ module OneM2M_Testcases_CSE_Release_1 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1;
v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -7662,19 +7752,20 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7696,24 +7787,27 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_SUB_NU() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI;
v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
- if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_notificationURI){
+ if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_updateRequestPrimitive.primitiveContent.subscription.notificationURI){
setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
}
}
@@ -7722,7 +7816,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
- if(v_primitiveContentRetrieveResource.subscription.notificationURI != v_notificationURI){
+ if(v_primitiveContentRetrieveResource.subscription.notificationURI != v_updateRequestPrimitive.primitiveContent.subscription.notificationURI){
setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
}
}
@@ -7730,6 +7824,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_SUB_NCT() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var NotificationContentType v_notificationContentType := int2;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
@@ -7738,11 +7833,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType;
v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -7763,19 +7858,20 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7796,6 +7892,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_GRP_MNM() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_maxNrOfMembers := 10;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
@@ -7804,11 +7901,11 @@ module OneM2M_Testcases_CSE_Release_1 {
v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
@@ -7829,23 +7926,26 @@ module OneM2M_Testcases_CSE_Release_1 {
}
testcase TC_CSE_DMR_UPD_016_GRP_MID() runs on Tester system CseSystem {
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_memberIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
- if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_memberIDs){
+ if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_updateRequestPrimitive.primitiveContent.group_.memberIDs){
setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
}
}
@@ -7854,7 +7954,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.memberIDs != v_memberIDs){
+ if(v_primitiveContentRetrieveResource.group_.memberIDs != v_updateRequestPrimitive.primitiveContent.group_.memberIDs){
setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
}
}
@@ -7968,14 +8068,15 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_DMR_DEL_005_CNT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var PrimitiveContent v_primitiveContentRetrieveResource;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_DEL_005(int3, m_createContainerBase, int3, m_createContainerBase));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that stateTag has been incremented
if(ischosen(v_primitiveContentRetrieveResource.container)) {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 41faf2f46966ca98443cce1c60a77016b59809e3..a766c71ee84219104da449fb25cecffd720231e7 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -594,6 +594,7 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_CRE_001_PCH_AE() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
@@ -602,7 +603,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_createRequest.primitiveContent.pollingChannel.resourceName := omit;
v_ae1.start(f_CSE_DMR_CRE_001(int15, v_createRequest, m_createAe(PX_TS_AE1.appId, omit, PX_TS_AE1.aeIdStem, -, omit)));//PollingChannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
@@ -624,11 +625,12 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_CRE_002_PCH() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int15, m_createPollingChannelBase));//Pollingchannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
@@ -645,11 +647,12 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_CRE_002_FLXC() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_002(int28, m_createGenericInterworkingServiceBase));//Specialization of FlexContainer
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.genericInterworkingService.resourceName)){
@@ -705,14 +708,15 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_CRE_006_CNT_MNI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxNrOfInstances)){
setverdict(fail, __SCOPE__, ": Error, maxNrOfInstances attribute not provided");
}
@@ -721,14 +725,15 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_CRE_006_CNT_MBS() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxByteSize)){
setverdict(fail, __SCOPE__, ": Error, maxByteSize attribute not provided");
}
@@ -738,15 +743,16 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_CRE_006_CNT_MIA() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_CRE_006(int3, v_createRequest));
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.container.maxInstanceAge)){
setverdict(fail, __SCOPE__, ": Error, maxInstanceAge attribute not provided");
}
@@ -1205,6 +1211,7 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_UPD_001_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -1217,11 +1224,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
v_ae1.start(f_CSE_DMR_UPD_001(int15, v_createRequest, v_updateRequest));//PollingChannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1253,6 +1260,7 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_UPD_002_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
@@ -1262,11 +1270,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
v_ae1.start(f_CSE_DMR_UPD_002(int15, m_createPollingChannelBase,v_updateRequest));//PollingChannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1297,6 +1305,7 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_UPD_003_PCH_LBL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Labels v_labels_1 := {"VALUE_1"};
var Labels v_labels_2 := {"To be deleted"};
@@ -1311,11 +1320,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_nullFields := {{"labels", omit}};
v_ae1.start(f_CSE_DMR_UPD_003(int15, v_createRequest, v_updateRequest, v_nullFields));//PollingChannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.pollingChannel)) {
@@ -1349,6 +1358,7 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
@@ -1357,9 +1367,9 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.pollingChannel_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){
+ if(v_verdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_invalid)) {
@@ -1402,9 +1412,10 @@ module OneM2M_Testcases_CSE_Release_2 {
*/
testcase TC_CSE_DMR_UPD_014_ACP_ET() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
- var Timestamp v_expirationTime_2 := "20401020T012345";
+ var Timestamp v_expirationTime_2 := "20301231T012340";
var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
@@ -1412,11 +1423,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime_2;
v_ae1.start(f_CSE_DMR_UPD_014(int1, v_createRequest, v_updateRequest));//ACP
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.accessControlPolicy)) {
@@ -1431,9 +1442,10 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_CNT_ET() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
- var Timestamp v_expirationTime_2 := "20401020T012345";
+ var Timestamp v_expirationTime_2 := "20301231T012340";
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -1442,11 +1454,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -1460,6 +1472,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_CNT_OR() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_ontologyRef_1 := "MyOntologyRef_1";
var XSD.AnyURI v_ontologyRef_2 := "MyOntologyRef_2";
@@ -1471,11 +1484,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.container.ontologyRef := v_ontologyRef_2;
v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
@@ -1489,6 +1502,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_BN() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var BatchNotify v_batchNotify_1 := {1, "PT1S"};
var BatchNotify v_batchNotify_2 := {2, "PT1S"};
@@ -1499,11 +1513,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.batchNotify := v_batchNotify_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1518,6 +1532,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_ENC() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventNotificationCriteria v_eventNotificationCriteria_1 := valueof(m_eventNotificationCriteria({int1}, -));
@@ -1529,11 +1544,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.eventNotificationCriteria := v_eventNotificationCriteria_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1548,10 +1563,11 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_ET() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime_1 := "20301231T012345";
- var Timestamp v_expirationTime_2 := "20401020T012345";
+ var Timestamp v_expirationTime_2 := "20301231T012340";
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
@@ -1559,11 +1575,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1578,6 +1594,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_EXC() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_expirationCounter_1 := 10;
@@ -1589,11 +1606,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.expirationCounter := v_expirationCounter_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1608,6 +1625,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_GPI() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_groupID_1 := "MyGroupID_1";
@@ -1619,11 +1637,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.groupID := v_groupID_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1638,6 +1656,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_LN() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.Boolean v_latestNotify_1 := true;
@@ -1649,11 +1668,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.latestNotify := v_latestNotify_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1668,6 +1687,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_NCT() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var NotificationContentType v_notificationContentType_1 := int1;
@@ -1679,11 +1699,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1698,6 +1718,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_NEC() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var EventCat v_notificationEventCat_1 := {alt_1 := 100};
@@ -1709,11 +1730,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.notificationEventCat := v_notificationEventCat_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1728,6 +1749,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_NFU() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.AnyURI v_notificationForwardingURI_1 := "MyForwardingURI_1";
@@ -1739,11 +1761,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.notificationForwardingURI := v_notificationForwardingURI_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1758,6 +1780,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_NSP() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var XSD.PositiveInteger v_notificationStoragePriority_1 := 1;
@@ -1769,11 +1792,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.notificationStoragePriority := v_notificationStoragePriority_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1788,6 +1811,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_PN() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var PendingNotification v_pendingNotification_1 := int1;
@@ -1799,11 +1823,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.pendingNotification := v_pendingNotification_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -1818,6 +1842,7 @@ module OneM2M_Testcases_CSE_Release_2 {
testcase TC_CSE_DMR_UPD_014_SUB_RL() runs on Tester system CseSystem {
// Local variables
+ var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RateLimit v_rateLimit_1 := {0, "PT20M"};
@@ -1829,11 +1854,11 @@ module OneM2M_Testcases_CSE_Release_2 {
v_updateRequest.primitiveContent.subscription.rateLimit := v_rateLimit_2;
v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
- v_ae1.done;
+ v_ae1.done -> value v_verdict;
- if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
@@ -3339,6 +3364,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_req2;
var MsgIn v_resp1, v_resp3;
var ResponsePrimitive v_resp2;
+ var RequestID v_expectedRequestIdentifier;
// Test control
@@ -3365,7 +3391,8 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
v_req2.from_ := PX_TS_CSE1.cseId;
- v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+ v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+ v_req2.requestIdentifier := pattern "{v_expectedRequestIdentifier}*";
tc_ac.start;
alt {
@@ -3450,6 +3477,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_req2;
var MsgIn v_resp1, v_resp3;
var ResponsePrimitive v_resp2;
+ var RequestID v_expectedRequestIdentifier;
// Test control
@@ -3472,7 +3500,8 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
v_req2.from_ := PX_TS_CSE1.cseId;
- v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+ v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+ v_req2.requestIdentifier := pattern "{v_expectedRequestIdentifier}*";
v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
f_send(e_mca_port, m_request(v_req1));
@@ -3558,7 +3587,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_req3;
var MsgIn v_resp1, v_resp3;
var ResponsePrimitive v_resp2;//Response to a Notify Request
-
+ var RequestID v_expectedRequestIdentifier;
+
// Test control
@@ -3584,7 +3614,8 @@ module OneM2M_Testcases_CSE_Release_2 {
vc_cse1.start(f_cse_notifyProcedure_notify(valueof(v_req2)));
v_req2.from_ := PX_TS_CSE1.cseId;
- v_req2.requestIdentifier := pattern "{v_req2.requestIdentifier}*";
+ v_expectedRequestIdentifier := valueof(v_req2.requestIdentifier);
+ v_req2.requestIdentifier := pattern "{v_expectedRequestIdentifier}*";
tc_ac.start;
alt {