Commit fca634d5 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'Release2' into TS_PIXITS_ENHANCEMENT_BUGGY


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 48f42447 5de9457e
...@@ -2177,6 +2177,7 @@ module OneM2M_Functions { ...@@ -2177,6 +2177,7 @@ module OneM2M_Functions {
f_send(e_mcc_in_port, m_response(v_responsePrimitive)); f_send(e_mcc_in_port, m_response(v_responsePrimitive));
} }
[] mccPortIn.receive(mw_request(?)) -> value v_request { [] mccPortIn.receive(mw_request(?)) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters"); setverdict(fail, __SCOPE__ & ":ERROR: Request received with unexpected parameters");
v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier)); v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
f_send(e_mcc_in_port, m_response(v_responsePrimitive)); f_send(e_mcc_in_port, m_response(v_responsePrimitive));
...@@ -3220,6 +3221,46 @@ module OneM2M_Functions { ...@@ -3220,6 +3221,46 @@ module OneM2M_Functions {
if(ispresent(p_resource.aE.supportedReleaseVersions)) { if(ispresent(p_resource.aE.supportedReleaseVersions)) {
vc_localResourcesList[p_localResourceIndex].resource.aE.supportedReleaseVersions := p_resource.aE.supportedReleaseVersions; vc_localResourcesList[p_localResourceIndex].resource.aE.supportedReleaseVersions := p_resource.aE.supportedReleaseVersions;
} }
} else if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.aEAnnc) and (ischosen(p_resource.aEAnnc))) {//AEAnnc
if(ispresent(p_resource.aEAnnc.accessControlPolicyIDs)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.accessControlPolicyIDs := p_resource.aEAnnc.accessControlPolicyIDs;
}
if(ispresent(p_resource.aEAnnc.expirationTime)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.expirationTime := p_resource.aEAnnc.expirationTime;
}
if(ispresent(p_resource.aEAnnc.labels)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.labels := p_resource.aEAnnc.labels;
}
if(ispresent(p_resource.aEAnnc.link)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.link := p_resource.aEAnnc.link;
}
if(ispresent(p_resource.aEAnnc.dynamicAuthorizationConsultationIDs)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.dynamicAuthorizationConsultationIDs := p_resource.aEAnnc.dynamicAuthorizationConsultationIDs;
}
if(ispresent(p_resource.aEAnnc.appName)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.appName := p_resource.aEAnnc.appName;
}
if(ispresent(p_resource.aEAnnc.pointOfAccess)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.pointOfAccess := p_resource.aEAnnc.pointOfAccess;
}
if(ispresent(p_resource.aEAnnc.ontologyRef)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.ontologyRef := p_resource.aEAnnc.ontologyRef;
}
if(ispresent(p_resource.aEAnnc.nodeLink)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.nodeLink := p_resource.aEAnnc.nodeLink;
}
if(ispresent(p_resource.aEAnnc.requestReachability)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.requestReachability := p_resource.aEAnnc.requestReachability;
}
if(ispresent(p_resource.aEAnnc.contentSerialization)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.contentSerialization := p_resource.aEAnnc.contentSerialization;
}
if(ispresent(p_resource.aEAnnc.e2eSecInfo)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.e2eSecInfo := p_resource.aEAnnc.e2eSecInfo;
}
if(ispresent(p_resource.aEAnnc.supportedReleaseVersions)) {
vc_localResourcesList[p_localResourceIndex].resource.aEAnnc.supportedReleaseVersions := p_resource.aEAnnc.supportedReleaseVersions;
}
} else if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.accessControlPolicy) and (ischosen(p_resource.accessControlPolicy))) { //AccessControlPolicy } else if(ischosen(vc_localResourcesList[p_localResourceIndex].resource.accessControlPolicy) and (ischosen(p_resource.accessControlPolicy))) { //AccessControlPolicy
if(ispresent(p_resource.accessControlPolicy.expirationTime)) { if(ispresent(p_resource.accessControlPolicy.expirationTime)) {
vc_localResourcesList[p_localResourceIndex].resource.accessControlPolicy.expirationTime := p_resource.accessControlPolicy.expirationTime; vc_localResourcesList[p_localResourceIndex].resource.accessControlPolicy.expirationTime := p_resource.accessControlPolicy.expirationTime;
...@@ -3372,16 +3413,13 @@ module OneM2M_Functions { ...@@ -3372,16 +3413,13 @@ module OneM2M_Functions {
[] mccPortIn.receive(mw_request(mw_create())) -> value v_request { [] mccPortIn.receive(mw_request(mw_create())) -> value v_request {
log(__SCOPE__&": WARNING: Unexpected CREATE message received"); log(__SCOPE__&": WARNING: Unexpected CREATE message received");
tc_ac.stop;
v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive); v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive)); f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat; repeat;
} }
[] mccPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request { [] mccPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected RETRIEVE message received"); log(__SCOPE__&": WARNING: Unexpected RETRIEVE message received");
f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive); f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
...@@ -3390,36 +3428,29 @@ module OneM2M_Functions { ...@@ -3390,36 +3428,29 @@ module OneM2M_Functions {
} else { } else {
f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive)); f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
} }
tc_ac.start(10.0);
repeat; repeat;
} }
[] mccPortIn.receive(mw_request(mw_update())) -> value v_request { [] mccPortIn.receive(mw_request(mw_update())) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected UPDATE message received"); log(__SCOPE__&": WARNING: Unexpected UPDATE message received");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive); f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive)); f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat; repeat;
} }
[] mccPortIn.receive(mw_request(mw_delete())) -> value v_request { [] mccPortIn.receive(mw_request(mw_delete())) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected DELETE message received"); log(__SCOPE__&": WARNING: Unexpected DELETE message received");
f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive); f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive)); f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
tc_ac.start(10.0);
repeat; repeat;
} }
[] mccPortIn.receive(mw_request(mw_notify)) -> value v_request { [] mccPortIn.receive(mw_request(mw_notify)) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected NOTIFY message received"); log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
//Send response in any case //Send response in any case
v_response := valueof(m_responseNotification(int2000, omit)); v_response := valueof(m_responseNotification(int2000, omit));
v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mcc_in_port, m_response(v_response)); f_send(e_mcc_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat; repeat;
} }
[] mccPortIn.receive (mw_request(?)){ [] mccPortIn.receive (mw_request(?)){
...@@ -3440,14 +3471,12 @@ module OneM2M_Functions { ...@@ -3440,14 +3471,12 @@ module OneM2M_Functions {
var ResponsePrimitive v_response; var ResponsePrimitive v_response;
[] mcaPortIn.receive(mw_request(mw_notify)) -> value v_request { [] mcaPortIn.receive(mw_request(mw_notify)) -> value v_request {
tc_ac.stop;
log(__SCOPE__&": WARNING: Unexpected NOTIFY message received"); log(__SCOPE__&": WARNING: Unexpected NOTIFY message received");
//Send response in any case //Send response in any case
v_response := valueof(m_responseNotification(int2000, omit)); v_response := valueof(m_responseNotification(int2000, omit));
v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier; v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mca_in_port, m_response(v_response)); f_send(e_mca_in_port, m_response(v_response));
tc_ac.start(10.0);
repeat; repeat;
} }
[] mcaPortIn.receive { [] mcaPortIn.receive {
...@@ -3464,33 +3493,40 @@ module OneM2M_Functions { ...@@ -3464,33 +3493,40 @@ module OneM2M_Functions {
* @desc Activation of the corresponding default altstep depending on config for CseSimu * @desc Activation of the corresponding default altstep depending on config for CseSimu
*/ */
function f_cse_activateDefaults_cse1() runs on CseSimu { function f_cse_activateDefaults_cse1() runs on CseSimu {
if(not(self == mtc)) { deactivate;
activate(a_default()); activate(a_default());
if(vc_config == e_cf02) { if(vc_config == e_cf02) {
activate(a_cse_cf02_cse1()); activate(a_cse_cf02_cse1());
log(__SCOPE__&": INFO: Default cf02_cse1 activated"); log(__SCOPE__&": INFO: Default cf02_cse1 activated");
} else if(vc_config == e_cf02CseSimuMaster) {
activate(a_cse_cf02_cse1());
log(__SCOPE__&": INFO: Default cf02_cse1 activated");
} else if(vc_config == e_cf03) {
activate(a_cse_cf03());
log(__SCOPE__&": INFO: Default cf03 activated");
} else if(vc_config == e_cf04) { } else if(vc_config == e_cf04) {
activate(a_cse_cf04()); activate(a_cse_cf04());
log(__SCOPE__&": INFO: Default cf04 activated"); log(__SCOPE__&": INFO: Default cf04 activated");
} }
} }
}
/** /**
* @desc Activation of the corresponding default altstep depending on config for AeSimu * @desc Activation of the corresponding default altstep depending on config for AeSimu
*/ */
function f_cse_activateDefaults_ae() runs on AeSimu { function f_cse_activateDefaults_ae() runs on AeSimu {
if(not(self == mtc)) { deactivate;
activate(a_default()); activate(a_default());
if(vc_config == e_cf01) { if(vc_config == e_cf01) {
activate(a_cse_cf01()); activate(a_cse_cf01());
log(__SCOPE__&": INFO: Default cf01 and cf01_ae2 activated"); log(__SCOPE__&": INFO: Default cf01 activated");
} else if(vc_config == e_cf02) {
activate(a_cse_cf02_ae1());
log(__SCOPE__&": INFO: Default cf02_ae1 activated");
} else if(vc_config == e_cf02CseSimuMaster) { } else if(vc_config == e_cf02CseSimuMaster) {
activate(a_cse_cf02_ae1()); activate(a_cse_cf02_ae1());
log(__SCOPE__&": INFO: Default cf02_ae1 activated"); log(__SCOPE__&": INFO: Default cf02_ae1 activated");
} }
} }
}
}//end group CseAltstepFunctions }//end group CseAltstepFunctions
}//end cseFunctions }//end cseFunctions
...@@ -4980,12 +5016,12 @@ module OneM2M_Functions { ...@@ -4980,12 +5016,12 @@ module OneM2M_Functions {
var verdicttype v_verdict := none; var verdicttype v_verdict := none;
tc_ac.start(15.0); tc_done.start(15.0);
alt { alt {
[] p_component.done -> value v_verdict { [] p_component.done -> value v_verdict {
tc_ac.stop; tc_done.stop;
} }
[] tc_ac.timeout { [] tc_done.timeout {
setverdict(inconc, __SCOPE__ & "INFO: Component did not finish"); setverdict(inconc, __SCOPE__ & "INFO: Component did not finish");
} }
} }
...@@ -5009,12 +5045,12 @@ module OneM2M_Functions { ...@@ -5009,12 +5045,12 @@ module OneM2M_Functions {
var verdicttype v_verdict := none; var verdicttype v_verdict := none;
tc_ac.start(15.0); tc_done.start(15.0);
alt { alt {
[] p_component.done -> value v_verdict { [] p_component.done -> value v_verdict {
tc_ac.stop; tc_done.stop;
} }
[] tc_ac.timeout { [] tc_done.timeout {
setverdict(inconc, __SCOPE__ & "INFO: Component did not finish"); setverdict(inconc, __SCOPE__ & "INFO: Component did not finish");
} }
} }
......
...@@ -3753,6 +3753,31 @@ module OneM2M_Templates { ...@@ -3753,6 +3753,31 @@ module OneM2M_Templates {
choice := *//O choice := *//O
}; };
template AEAnnc_optional mw_contentAeAnnc_base := {
resourceName := ?,//M
resourceType := ?,//M
resourceID := ?,//M
parentID := ?,//M
creationTime := ?,//M
lastModifiedTime := ?,//M
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
link := ?,//M,
dynamicAuthorizationConsultationIDs := *, //O
appName := *,//O
app_ID := ?,//M
aE_ID := ?,//M
pointOfAccess := *,//O
ontologyRef := *,//O
nodeLink := *,//O
requestReachability := ?,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
supportedReleaseVersions := ?,//M
choice := *//O
};
template AEAnnc_optional mw_contentAeAnnc_any := { template AEAnnc_optional mw_contentAeAnnc_any := {
resourceName := *,//M resourceName := *,//M
resourceType := *,//M resourceType := *,//M
......
...@@ -46,6 +46,7 @@ module OneM2M_TestSystem { ...@@ -46,6 +46,7 @@ module OneM2M_TestSystem {
//timers //timers
timer tc_ac := PX_TAC; timer tc_ac := PX_TAC;
timer tc_wait := PX_TWAIT; timer tc_wait := PX_TWAIT;
timer tc_done := PX_TDONE;
//global variables //global variables
var Configurations vc_config; var Configurations vc_config;
var TestSystemRole vc_testSystemRole; var TestSystemRole vc_testSystemRole;
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment