Commit 05e3e624 authored by Antonio Castillo Verdugo's avatar Antonio Castillo Verdugo
Browse files

f_CSE_DMR_CRE_003 --> AE2 was being started twice


f_CSE_DMR_CRE_012 --> CIN_CR issue
g_CSE_DMR_RET_012 --> One second gap between contentInstances creation
f_CSE_DMR_RET_013, f_CSE_DMR_RET_015, f_CSE_DMR_RET_016, f_CSE_DMR_RET_017, f_CSE_DMR_RET_018, f_CSE_DMR_RET_018, f_CSE_DMR_UPD_015, f_CSE_DMR_UPD_016 --> Tear down issue
TC_CSE_DMR_RET_013_AE, TC_CSE_DMR_UPD_015_AE_LBL, TC_CSE_DMR_UPD_015_AE_ACPI, TC_CSE_DMR_UPD_015_AE_APN, TC_CSE_DMR_UPD_015_AE_POA, TC_CSE_DMR_UPD_015_AE_OR, TC_CSE_DMR_UPD_016_AE_ET, TC_CSE_DMR_UPD_016_AE_RR, f_CSE_DMR_RET_013 --> Added in m_createAe the parameter PX_AE1_ID_STEM
f_CSE_DMR_RET_014 --> It is was creating a PollingChannel instead of AE. Furthermore, in AE case, AE was being created twice
Signed-off-by: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent 61323811
......@@ -4819,7 +4819,7 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
if(p_resourceType == int23){
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
//vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
......@@ -6022,7 +6022,7 @@ module OneM2M_Testcases_CSE {
}
// Test Body
if(p_optionalAttribute[0] == "creator") {
if((p_optionalAttribute[0] == "creator") and (p_resourceType==int3)) {
p_requestPrimitive.primitiveContent.container.creator := vc_resourcesList[v_parentIndex].resource.aE.aE_ID;
}
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
......@@ -8184,7 +8184,7 @@ module OneM2M_Testcases_CSE {
var integer v_contentInstanceIndex1 := -1;
var integer v_contentInstanceIndex2 := -1;
var template PrimitiveContent v_contentResponse;
timer t_contentInstanceCreationGap;
// Test control
// Test component configuration
......@@ -8199,6 +8199,8 @@ module OneM2M_Testcases_CSE {
v_contentInstanceIndex1 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
t_contentInstanceCreationGap.start(1.0);
t_contentInstanceCreationGap.timeout;
v_contentInstanceIndex2 := f_cse_createResource(int4, m_createContentInstance_noResourceName, v_containerIndex);
v_contentResponse.contentInstance := mw_contentContentInstanceBase;
......@@ -8266,7 +8268,7 @@ module OneM2M_Testcases_CSE {
v_contentResponse.aE := mw_contentAeBase;
v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID), v_contentResponse));//AE
v_ae1.start(f_CSE_DMR_RET_013(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM), v_contentResponse));//AE
v_ae1.done;
}
......@@ -8410,7 +8412,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_013
......@@ -8437,7 +8443,7 @@ module OneM2M_Testcases_CSE {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DMR_RET_014(int2, m_createPollingChannelBase));//AE
v_ae1.start(f_CSE_DMR_RET_014(int2, m_createAe(PX_APP_ID,-,PX_AE1_ID_STEM)));//AE
v_ae1.done;
}
......@@ -8495,7 +8501,9 @@ module OneM2M_Testcases_CSE {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
if (p_resourceType!=int2){
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi;
}
if(p_resourceType != int1) {
......@@ -8510,6 +8518,11 @@ module OneM2M_Testcases_CSE {
f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
if (p_resourceType==int2){
v_aeIndex := v_resourceIndex;
}
} else { //ResourceType = RemoteCSE
......@@ -8717,7 +8730,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_015
......@@ -8887,7 +8904,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_016
......@@ -9143,7 +9164,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_017
......@@ -9282,7 +9307,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_018
......@@ -9421,7 +9450,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
}//end f_CSE_DMR_RET_019
......@@ -13670,7 +13703,7 @@ module OneM2M_Testcases_CSE {
v_updateRequest.primitiveContent.aE.labels := v_labels;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -13702,7 +13735,7 @@ module OneM2M_Testcases_CSE {
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest, true));//AE
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest, true));//AE
v_ae1.done;
......@@ -13737,7 +13770,7 @@ module OneM2M_Testcases_CSE {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.appName := v_appName;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -13770,7 +13803,7 @@ module OneM2M_Testcases_CSE {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -13803,7 +13836,7 @@ module OneM2M_Testcases_CSE {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef;
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -14713,7 +14746,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
} // end function f_CSE_DMR_UPD_015
......@@ -14868,7 +14905,7 @@ module OneM2M_Testcases_CSE {
v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime;
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -14902,7 +14939,7 @@ module OneM2M_Testcases_CSE {
v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability;
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE
v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM), v_updateRequest));//AE
v_ae1.done;
......@@ -15300,9 +15337,9 @@ module OneM2M_Testcases_CSE {
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cse1.done;
......@@ -15339,7 +15376,11 @@ module OneM2M_Testcases_CSE {
f_cse_postamble_deleteResources();
// Tear down
f_cf02Down();
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
f_cf01Down();
} else {
f_cf02Down();
}
} //end function f_CSE_DMR_UPD_016
......
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