Skip to content
Snippets Groups Projects
Commit d194674d authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'Release1' 


Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parents a1e8c364 74acdade
No related branches found
No related tags found
1 merge request!25Ae fixes
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 2
− 2
View file @ d194674d
......@@ -664,7 +664,7 @@ module OneM2M_Functions {
* @param p_responseStatusCode Response Status Code to be sent in response to the subscription verification request
* @verdict
*/
function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
function f_cse_preamble_subscriptionVerification(inout integer p_ae2Index, inout template RequestPrimitive p_createRequestPrimitive,in ResourceType p_resourceType, in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu {
if(p_resourceType == int23){
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", {f_getAnnouncementTargetPoA("HTTP", PX_AE2_ADDRESS, "")}), -1)); // AE2 is registred
......@@ -1309,7 +1309,7 @@ module OneM2M_Functions {
* @param p_responseStatusCode Response Status Code to be used for the response to the verification request
* @verdict
*/
function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2001) runs on AeSimu {
function f_cse_notifyProcedure_subscriptionVerificationHandler(in ResponseStatusCode p_responseStatusCode := int2000) runs on AeSimu {
// Local variables
var ResponsePrimitive v_responsePrimitive;
var template Notification v_notificationRequest := mw_contentNotificationVerification;
......
OneM2M_Testcases_CSE.ttcn
+ 70
− 31
View file @ d194674d
......@@ -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);
......@@ -5666,7 +5666,7 @@ module OneM2M_Testcases_CSE {
var template RequestPrimitive v_createRequest := m_createContainerBase;
const AttributeList c_optionalAttribute := {"creator"};
v_createRequest.primitiveContent.container.creator := "Unitialized";
v_createRequest.primitiveContent.container.creator := "";
v_ae1.start(f_CSE_DMR_CRE_012(int3, v_createRequest, c_optionalAttribute));
v_ae1.done;
......@@ -6022,9 +6022,9 @@ module OneM2M_Testcases_CSE {
}
// Test Body
if(p_optionalAttribute[0] == "creator") {
p_requestPrimitive.primitiveContent.container.creator := vc_resourcesList[v_parentIndex].resource.aE.aE_ID;
}
// if(p_optionalAttribute[0] == "creator") {
// p_requestPrimitive.primitiveContent.container.creator := vc_resourcesList[v_parentIndex].resource.aE.aE_ID;
// }
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
mcaPort.send(m_request(v_request));
......@@ -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
......@@ -11090,7 +11123,6 @@ module OneM2M_Testcases_CSE {
function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
......@@ -13670,7 +13702,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 +13734,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 +13769,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 +13802,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 +13835,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 +14745,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
......@@ -14766,11 +14802,10 @@ module OneM2M_Testcases_CSE {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.remoteCSE.requestReachability := v_requestReachability;
v_ae1.done;
v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE
v_ae1.done;
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
......@@ -14868,7 +14903,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 +14937,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;
......@@ -14929,7 +14964,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -15300,9 +15335,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 +15374,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
......
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