Skip to content

GitLab

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

Adding descriptions to all functions in OneM2M_Functions file 


Renaming of "child" component:
- vc_cseSimu -> vc_cse1
- vc_aeSimu -> vc_ae1 for CseSimu or vc_ae2 for AeSimu
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent e3cc4e6d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 439 additions and 377 deletions
LibOneM2M/OneM2M_Functions.ttcn
View file @ 7da9b134
This diff is collapsed.
LibOneM2M/OneM2M_TestSystem.ttcn
View file @ 7da9b134
......@@ -33,11 +33,11 @@ module OneM2M_TestSystem {
var Configurations vc_config;
var MyResourcesList vc_resourcesList;
var IntegerList vc_resourcesIndexToBeDeleted := {};
//var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
//var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
var integer vc_aeAuxIndex;//TODO To be removed
var integer vc_acpAuxIndex;
var AccessControlPolicy_optional vc_acpAux;
var MsgIn vc_request;
var MsgIn vc_response;
};
type component AeSimu extends Tester {
......@@ -48,12 +48,8 @@ module OneM2M_TestSystem {
//global variables
var PrimitiveContent vc_primitiveContentRetrievedResource;
var MsgIn vc_request;
var MsgIn vc_response;
var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
var CseSimu vc_cse1;//For CF02 when AeSimu is master
var boolean vc_auxiliaryAe2Up := false;
//var AeSimu vc_ae2;
};
type component CseSimu extends Tester {
......@@ -63,10 +59,8 @@ module OneM2M_TestSystem {
//global variables
var MyResourcesList vc_localResourcesList;
var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
var AeSimu vc_ae1;//For CF02 when CseSimu is master
var integer vc_remoteCseIndex;
var MsgIn vc_request;
var MsgIn vc_response;
};
type component InCseSimu extends CseSimu {}
......
OneM2M_Testcases_CSE.ttcn
View file @ 7da9b134
......@@ -963,8 +963,8 @@ module OneM2M_Testcases_CSE {
//Preamble
v_remoteCseIndex := f_cse_registrationRemoteCse();
vc_aeSimu := AeSimu.create("AE1") alive;
//vc_aeSimu.start(f_a);
vc_ae1 := AeSimu.create("AE1") alive;
//vc_ae1.start(f_a);
}
......@@ -1034,7 +1034,7 @@ module OneM2M_Testcases_CSE {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Test Body
vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));
//v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
......@@ -1058,8 +1058,8 @@ module OneM2M_Testcases_CSE {
}
}
/*vc_cseSimu.start(f_cse_receiveCreateRequest(mw_createAEAnnc(-, -, -)));
vc_cseSimu.done;*/
/*vc_cse1.start(f_cse_receiveCreateRequest(mw_createAEAnnc(-, -, -)));
vc_cse1.done;*/
// Postamble
f_cse_postamble_deleteResourcesCSE();
......@@ -1084,14 +1084,14 @@ module OneM2M_Testcases_CSE {
//Preambule
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
//TODO:
//v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
//mcaPort.send(m_request(v_request));
//Test Body
vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
tc_ac.start;
......@@ -1191,13 +1191,13 @@ module OneM2M_Testcases_CSE {
f_cf02Up();
//Preambule
vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
vc_cseSimu.done;
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
vc_cse1.done;
v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
vc_cseSimu.done;
vc_cse1.start(f_cse_resourceAnnouncementHandler());
vc_cse1.done;
//TODO Deregister
//f_cse_deleteResource(v_aeIndex);
......@@ -1207,8 +1207,8 @@ module OneM2M_Testcases_CSE {
//Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
vc_cseSimu.start(f_cse_resourceAnnouncementHandler(PX_CSE_ID, f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative)));
vc_cseSimu.done;
vc_cse1.start(f_cse_resourceAnnouncementHandler(PX_CSE_ID, f_getResourceAddress(v_aeIndex, e_nonHierarchical, e_spRelative)));
vc_cse1.done;
tc_ac.start;
......@@ -1720,7 +1720,7 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
// Test Body
f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
......@@ -6029,8 +6029,8 @@ module OneM2M_Testcases_CSE {
mcaPort.send(m_request(v_request));
vc_cseSimu.start(f_cse_receiveCreateRequest(p_requestAnnc));
vc_cseSimu.done;
vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));
vc_cse1.done;
// Postamble
f_cse_postamble_deleteResources();
......@@ -6259,15 +6259,15 @@ module OneM2M_Testcases_CSE {
// Preamble
if (PX_IUT_IS_MN_CSE == true) {
vc_cseSimu.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
}else if (PX_IUT_IS_IN_CSE == true) {
vc_cseSimu.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
}
vc_cseSimu.done;
vc_cse1.done;
vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
vc_cse1.start(f_cse_resourceAnnouncementHandler());
v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
vc_cseSimu.done;
vc_cse1.done;
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
......@@ -6277,11 +6277,11 @@ module OneM2M_Testcases_CSE {
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
vc_cseSimu.start(f_cse_receiveCreateRequest(p_requestAnnc));
vc_cse1.start(f_cse_receiveCreateRequest(p_requestAnnc));
mcaPort.send(m_request(v_request));
vc_cseSimu.done;
vc_cse1.done;
vc_request.primitive.requestPrimitive := f_getRemoteCseRequestPrimitive(vc_cseSimu);
vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
// Postamble
f_cse_postamble_deleteResources();
......@@ -7815,10 +7815,10 @@ module OneM2M_Testcases_CSE {
} else { //ResourceType = RemoteCSE
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
......@@ -7955,10 +7955,10 @@ module OneM2M_Testcases_CSE {
} else { //ResourceType = RemoteCSE
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
......@@ -8121,10 +8121,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
} else {
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
// Test Body
......@@ -8290,10 +8290,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
......@@ -8543,10 +8543,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
......@@ -8684,10 +8684,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
......@@ -8821,10 +8821,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cseSimu.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex),
......@@ -14108,10 +14108,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
vc_cseSimu.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
//Test Body
......@@ -14732,10 +14732,10 @@ module OneM2M_Testcases_CSE {
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
vc_cseSimu.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cseSimu.done;
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
vc_cse1.done;
v_resourceIndex := f_getRemoteCseResource(vc_cseSimu);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
//Test Body
......
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