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

Merge branch 'Release2-onwards' into Release2

parents 63250115 16962d12
......@@ -3795,7 +3795,7 @@ module OneM2M_Functions {
group CseSimuFunctions {
function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe) runs on CseSimu return integer {
function f_ae_createPollingChannel(template UtTriggerPrimitive p_utRequest := m_utCreateAe, integer p_parentIndex := vc_cSEBaseIndex) runs on CseSimu return integer {
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
......@@ -3806,6 +3806,8 @@ module OneM2M_Functions {
p_utRequest.requestPrimitive.primitiveContent.pollingChannel := m_contentCreatePollingChannel;
}
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(p_parentIndex);
f_ae_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
......
......@@ -7308,7 +7308,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_004
function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
......@@ -7399,7 +7399,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_005
function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu system CseSystem {
function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse := omit) runs on AeSimu system CseSystem {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
......
......@@ -2114,7 +2114,7 @@ module OneM2M_Testcases_AE_Release_1 {
f_checkCseSimuStatus();
//Create a function to receive the Create PollingChannel and to send the response
v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2);
v_pollingChannelIndex := f_ae_createPollingChannel(v_utRequest2, v_aeIndex);
f_checkCseSimuStatus();
......
......@@ -12297,9 +12297,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_GMG_005_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.aE := mw_contentAeBase;// TODO see with wath should it be matched
v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_GMG_005_DEL
......@@ -12347,10 +12345,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_GMG_006_DEL() runs on Tester system CseSystem { //Delete
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var template PrimitiveContent v_contentResponse;
v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary")));
v_ae1.done;
}//end TC_CSE_GMG_006_DEL
......
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