Commit 2ceb7734 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'STF531-REG-CRE' into Release1

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parents cfc21c69 15275058
......@@ -1802,12 +1802,13 @@ module OneM2M_Functions {
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
var RequestPrimitive v_rp;
var charstring v_action := "Please, register the AE on the Tester";
if(not(ispresent(p_utRequest.primitiveContent))) {
p_utRequest.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
}
f_sendUtPrimitive(p_utRequest);
f_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
......@@ -1851,12 +1852,13 @@ module OneM2M_Functions {
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
var RequestPrimitive v_rp;
var charstring v_action := "Please, create a Container resource on the Tester";
if(not(ispresent(p_utRequest.primitiveContent))) {
p_utRequest.primitiveContent.container := m_contentCreateContainer;
}
f_sendUtPrimitive(p_utRequest);
f_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
......@@ -2718,6 +2720,23 @@ module OneM2M_Functions {
group CommonFunctions {
/**
* @desc Sending of an Adapter Control primitive
* @param event Action to be performed by TA
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
function f_bool2str(in boolean p_bool) runs on Tester return charstring {
var charstring v_bool;
if (p_bool){
v_bool := "true";
}else{
v_bool := "false";
}
return v_bool;
}
/**
* @desc Sending of an Adapter Control primitive
* @param event Action to be performed by TA
......@@ -2806,27 +2825,37 @@ module OneM2M_Functions {
}
function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest) runs on Tester {
function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in charstring p_action) runs on Tester {
p_utRequest.from_ := "UNINITIALIZED";
p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
utPort.send(valueof(p_utRequest));
tc_wait.start;
alt{
[] utPort.receive(mw_utResponseOK) {
tc_wait.stop;
setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
}
[] utPort.receive(mw_utResponseKO) {
tc_wait.stop;
setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
}
[] tc_wait.timeout{
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
if (PX_UT_IMPLEMENTED){
p_utRequest.from_ := "UNINITIALIZED";
p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
utPort.send(valueof(p_utRequest));
tc_wait.start;
alt{
[] utPort.receive(mw_utResponseOK) {
tc_wait.stop;
setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
}
[] utPort.receive(mw_utResponseKO) {
tc_wait.stop;
setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
}
[] tc_wait.timeout{
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
}else{
action(__SCOPE__ & ":" & p_action);
}
}
......
......@@ -27,6 +27,8 @@ module OneM2M_Pixits {
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
modulepar boolean PX_UT_IMPLEMENTED := false;
/**
* @desc IUT CSE Name
*/
......@@ -57,6 +59,14 @@ module OneM2M_Pixits {
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
......@@ -67,7 +77,8 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
modulepar ListOfURIs PX_ACOR := {"*"};
modulepar ListOfURIs PX_ACOR := {"*"};
}
group TesterParameters {
......
This diff is collapsed.
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