diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 45043e33085cba518cf595f67eda89032d4ed8ff..97a498db8735ff20f24459ee8f0c31c356e7445c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -78,7 +78,7 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_CRE_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var UtTriggerAckPrimitive v_trigger_response;
@@ -101,11 +101,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -128,7 +128,7 @@ module OneM2M_PermutationFunctions {
group Update {
function f_AE_GEN_UPD_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
@@ -153,11 +153,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -175,7 +175,7 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_UPD_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
@@ -198,11 +198,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -225,7 +225,7 @@ module OneM2M_PermutationFunctions {
group Retrieve {
function f_AE_GEN_RET_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequestTemplate;
var UtTriggerPrimitive v_utRequest;
@@ -250,11 +250,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -272,7 +272,7 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_RET_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequestTemplate;
var UtTriggerPrimitive v_utRequest;
@@ -297,11 +297,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container retrieve request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -324,7 +324,7 @@ module OneM2M_PermutationFunctions {
group Delete {
function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
@@ -348,11 +348,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -370,7 +370,7 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
@@ -395,11 +395,11 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request received successfuly");
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) {
@@ -428,7 +428,7 @@ module OneM2M_PermutationFunctions {
function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in universal charstring p_action) runs on CseSimu {
//primitives for mcaPortIn
- var MsgIn v_request;
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
f_cf03Up();
@@ -443,7 +443,7 @@ module OneM2M_PermutationFunctions {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -475,7 +475,7 @@ module OneM2M_PermutationFunctions {
group Create {
function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
@@ -489,12 +489,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -514,7 +514,7 @@ module OneM2M_PermutationFunctions {
f_cf03Down();
}
function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
@@ -528,12 +528,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -607,7 +607,7 @@ module OneM2M_PermutationFunctions {
}
function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
-
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
@@ -621,12 +621,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -672,7 +672,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -722,7 +722,7 @@ module OneM2M_PermutationFunctions {
setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1407,6 +1407,7 @@ module OneM2M_PermutationFunctions {
function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
+ var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
//Test control
@@ -1426,12 +1427,12 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mccPortIn.receive(mw_request(p_request)) {
+ [] mccPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
//set responseStatusCode back to SUT
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+ v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
//send back responsePrimitive
mccPortIn.send(m_response(v_responsePrimitive));