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

Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

parents d98a9661 c0e5ea69
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Functions.ttcn
+ 6
− 7
View file @ feaba577
......@@ -683,7 +683,7 @@ module OneM2M_Functions {
p_ae2Index := f_getResource(vc_ae2);
if(ischosen(p_createRequestPrimitive.primitiveContent.subscription)){ //this condition is necessary for Subscription TCs where notification URI is set in m_createSubscriptionAdvanced
p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
p_createRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(p_ae2Index)};
}
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler(p_responseStatusCode));
}
......@@ -1648,7 +1648,6 @@ module OneM2M_Functions {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_resourceIndex := -1;
var integer v_localResourceIndex := -1;
var PrimitiveContent v_remoteCSEResource;
......@@ -1661,7 +1660,7 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type remoteCSE created successfuly");
f_checkAttributesToBeSaved(int16, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
vc_remoteCseIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int16, -1);
v_remoteCSEResource := f_cse_generateLocalResource(v_response.primitive.responsePrimitive.primitiveContent, vc_cSEBaseIndex, int16);
v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, vc_cSEBaseIndex);
}
......@@ -1680,7 +1679,7 @@ module OneM2M_Functions {
f_checkCseSimuStatus();
return v_resourceIndex;
return vc_remoteCseIndex;
}
......@@ -1979,7 +1978,7 @@ module OneM2M_Functions {
tc_ac.start;
alt {
[] mcaPort.receive(mw_request(mw_createContainer(?,?))) -> value v_request {
[] mcaPortIn.receive(mw_request(mw_createContainer(?,?))) -> value v_request {
tc_ac.stop;
v_rp := v_request.primitive.requestPrimitive;
......@@ -1987,11 +1986,11 @@ module OneM2M_Functions {
v_modifiedResource := f_ae_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
if(v_resourceIndex != -1) {
mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
mcaPortIn.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
setverdict(pass, __SCOPE__&":INFO: Container created successfuly");
}
else {
mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
mcaPortIn.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
setverdict(inconc, __SCOPE__&":INFO: Container creation failed");
}
}
......
LibOneM2M/OneM2M_Pixits.ttcn
+ 2
− 2
View file @ feaba577
......@@ -83,9 +83,9 @@ module OneM2M_Pixits {
group TesterParameters {
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3141";
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3142";
modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
......
OneM2M_Testcases_AE.ttcn
+ 15
− 15
View file @ feaba577
......@@ -498,7 +498,7 @@ module OneM2M_Testcases_AE {
stop;
}
f_AE_GEN_UPD_002(e_spRelative);
f_AE_GEN_RET_002(e_spRelative);
}
testcase TC_AE_GEN_RET_002_ABS() runs on CseSimu system AeSystem {
......@@ -1456,19 +1456,19 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(p_expectedUpdateRequest)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration update request is accepted!");
setverdict(pass, __SCOPE__, " : AE update request is accepted!");
v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
v_modifiedResource := f_ae_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
v_resourceIndex := f_setLocalResource(v_modifiedResource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
if(v_resourceIndex != -1) {
mcaPort.send(m_response(m_responsePrimitive_content(int2004, v_request.primitive.requestPrimitive.requestIdentifier, v_modifiedResource)));
mcaPortIn.send(m_response(m_responsePrimitive_content(int2004, v_request.primitive.requestPrimitive.requestIdentifier, v_modifiedResource)));
}
//send back responsePrimitive
mcaPortIn.send(m_response(v_responsePrimitive));
//mcaPortIn.send(m_response(v_responsePrimitive));
}
[] mcaPortIn.receive(mw_request(?)) -> value v_request {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : AE registration update request is rejected due to not including the optional attribute!");
setverdict(fail, __SCOPE__, " : AE update request is rejected due to not including the optional attribute!");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......@@ -1637,7 +1637,7 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(mw_retrieve(p_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
......@@ -1648,7 +1648,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......@@ -1784,7 +1784,7 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
......@@ -1795,7 +1795,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......@@ -1833,7 +1833,7 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
......@@ -1844,7 +1844,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while retrieving ressource !");
setverdict(fail, __SCOPE__, " : error while retrieving resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......@@ -1982,7 +1982,7 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
......@@ -1993,7 +1993,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while deleting ressource !");
setverdict(fail, __SCOPE__, " : error while deleting resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......@@ -2031,7 +2031,7 @@ module OneM2M_Testcases_AE {
alt{
[] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete ressource type " & int2str(enum2int(v_request.primitive.requestPrimitive.resourceType)) & " request is accepted!!");
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
//set responseStatusCode back to SUT
v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
......@@ -2042,7 +2042,7 @@ module OneM2M_Testcases_AE {
}
[] mcaPortIn.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while deleting ressource !");
setverdict(fail, __SCOPE__, " : error while deleting resource !");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
......
OneM2M_Testcases_CSE.ttcn
+ 19
− 19
View file @ feaba577
......@@ -4378,7 +4378,7 @@ module OneM2M_Testcases_CSE {
vc_ae2.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, c_defaultAE2Name, v_poaList), -1)); // AE2 is registred
vc_ae2.done;
v_ae2Index := f_getResource(vc_ae2);
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
}
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
......@@ -8478,7 +8478,7 @@ module OneM2M_Testcases_CSE {
v_ae1.start(f_CSE_DMR_RET_014(int23, m_createSubscriptionBase));//Subscription
v_ae1.done;
}
}
function f_CSE_DMR_RET_014(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
......@@ -11979,7 +11979,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_CNT_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12003,7 +12003,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12027,7 +12027,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12051,7 +12051,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12075,7 +12075,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12099,7 +12099,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_creationTime := "20001231T012345";
var Timestamp v_creationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12187,7 +12187,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_CNT_ET() runs on Tester system CseSystem {
// Local variables
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 AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12213,7 +12213,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12239,7 +12239,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12265,7 +12265,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12291,7 +12291,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -12317,7 +12317,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var Timestamp v_expirationTime := "20001231T012345";
var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -14763,7 +14763,7 @@ module OneM2M_Testcases_CSE {
*/
testcase TC_CSE_DMR_UPD_016_CSR_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_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -14829,7 +14829,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_NOD_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_updateNodeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -14897,7 +14897,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_AE_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_updateAE;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -15099,7 +15099,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_SUB_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_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......@@ -15202,7 +15202,7 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_DMR_UPD_016_GRP_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_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
......
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