Commit 9c087cb0 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'Release2' into 'master'

Conformance sessions in oneM2M TP#42 India

See merge request !57
parents 167043a7 c1d74835
......@@ -1873,45 +1873,36 @@ module OneM2M_Functions {
//Preparation of expected Notification verification
//TODO To add checks for creator and subscription reference
//v_notificationRequest.creator := p_creator; TODO To check what address format is to be expected
//Some participants use SP relative UNSTRUCTURED
//v_notificationRequest.subscriptionReference := "I Don't know which URI is expected"; // TODO mandatory parameter
//v_notificationRequest.creator := p_creator;(which format?)
//v_notificationRequest.subscriptionReference := "I Don't know which URI is expected";
//Preparation of Notification response to be sent
v_responsePrimitive := valueof(m_responseNotification(p_responseStatusCode, omit));
tc_ac.start;
alt {
[] mcaPortIn.receive(mw_request(mw_notifyNotification(v_notificationRequest))) -> value vc_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ":INFO: Notification received");
setverdict(pass, __SCOPE__ & ":INFO: Subscription Verification Notification received");
}
[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
}
[] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
stop;
setverdict(inconc, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
setverdict(inconc, __SCOPE__ & ":ERROR: No subscriptionVerification notification received");
stop;
}
}
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
if(getverdict == pass) {
f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));
} else {
//Sending response to the notification received
//Preparation of Notification response to be sent
v_responsePrimitive := valueof(m_responseNotification(p_responseStatusCode, omit));
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
if(getverdict != pass) {
v_responsePrimitive.responseStatusCode := int4000;
f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));
}
//mcaPort.send(m_response(v_responsePrimitive)); // TODO have to be deleted
} //end f_subscriptionVerificationHandler
f_send(e_mca_in_port, m_response(v_responsePrimitive));
} //end f_cse_notifyProcedure_subscriptionVerificationHandler
/**
* @desc Default handling message exchange for the notification procedure
......@@ -1975,10 +1966,6 @@ module OneM2M_Functions {
v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
f_send(e_mca_in_port, m_response(v_responsePrimitive));
}
[] mcaPortIn.receive{
tc_ac.stop;
setverdict(fail, __SCOPE__ & ":ERROR: unexpected message received");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
}
......@@ -5129,7 +5116,7 @@ module OneM2M_Functions {
var verdicttype v_verdict := none;
tc_done.start(15.0);
tc_done.start;
alt {
[] p_component.done -> value v_verdict {
tc_done.stop;
......@@ -5158,7 +5145,7 @@ module OneM2M_Functions {
var verdicttype v_verdict := none;
tc_done.start(15.0);
tc_done.start;
alt {
[] p_component.done -> value v_verdict {
tc_done.stop;
......
......@@ -148,6 +148,14 @@ module OneM2M_Pics {
modulepar boolean PICS_NON_BLOCKING_REQUEST_SYNCH := true;
modulepar boolean PICS_NON_BLOCKING_REQUEST_ASYNCH := true;
}
/**
* @desc Subscription capabilities
* @see oneM2M TS-0017 A.5.4-1
*/
group Subscription_capabilities{
modulepar boolean PICS_SUBSCRIPTION_VERIFICATION := true;
}
}
} // end of module
......@@ -1302,7 +1302,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
resourceType := int18,
primitiveContent := {schedule := m_contentCreateSchedule ({{"1,2,3,0-5/4,*/8 10,10-11/8 */9 * * 0,4-5/3 2000-2007/8,2000-2000/9,2500-2000/3,2000"}})}
primitiveContent := {schedule := m_contentCreateSchedule ({{"* * * * * * *"}})}
};
template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
......
......@@ -6969,79 +6969,12 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_DEL_013
}//end group Delete
group Notify {
function f_CSE_DMR_NTF_001(ResultContent p_resultContent) runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex, v_ae2Index := -1;
// Test control
// Test component configuration
f_cf01Up(true);
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
vc_ae2.start(f_cse_createAccessControlPolicyAux("Ae2Acp",{"all"}, int63));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
vc_ae2.start(f_cse_createResource_withAcpAux(int2, m_createAe(PX_TS_AE2.appId, -, PX_TS_AE2.aeIdStem, c_defaultAE2Name, {f_getCompletePoA(PX_TS_AE2.mcaPortIn, "")}), -1)); // AE2 is registred
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
v_ae2Index := f_getLatestResource(vc_ae2);
// Test Body
v_request := valueof(m_notifyNotification(f_getResourceAddress(v_ae2Index), m_contentNotification_subscriptionVerification(vc_resourcesList[v_ae2Index].resource.aE.aE_ID)));
v_request.from_ := f_getOriginator(v_aeIndex, e_ae);
v_request.resultContent := p_resultContent;
vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Request successfully rejected");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error, Result content set to " & int2str(enum2int(p_resultContent)) & " is not valid for a NOTIFY request ");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while deleting resource");
}
}
f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
}//end f_CSE_DMR_NTF_001
}//end group Notify
}//end group Data_Management_and_Repository
group Location {
}//end group Location
group Group_Managment {
......
......@@ -50,15 +50,21 @@ module OneM2M_TestControl_ADN_profile_3 {
if(true) {execute (TC_AE_REG_CRE_002_API());}
if(true) {execute (TC_AE_REG_CRE_002_SRV());}
//Container ADN-3
//AE_DMR_00001
if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_DMR_00002
if(true) {execute (TC_AE_DMR_CRE_002());}
//AE_SUB_00004
if(true) {execute (TC_AE_SUB_NTF_001());}
if(true) {execute (TC_AE_SUB_NTF_002());}
//FlexcContainer ADN-3
//AE_DMR_00003
//TODO Missing
//TimeSeries ADN-3
//AE_DMR_00004
//TODO Missing
//AE_DMR_00005
//TODO Missing
}
} // end of module OneM2M_TestControl_ADN_profile_3
......
......@@ -9,7 +9,7 @@
* @desc Test control module for oneM2M
*
*/
module OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable {
module OneM2M_TestControl_Actuator_as_ADN {
import from OneM2M_Testcases_AE_Release_1 all;
......@@ -51,11 +51,27 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable {
//AE_SUB_00001
if(true) {execute (TC_AE_SUB_CRE_001());}
//Container actuator
//AE_DMR_00001
if(true) {execute (TC_AE_DMR_CRE_001());}
//Flex container actuator
//TODO Missing
//Notification actuator
//AE_SUB_00004
if(true) {execute (TC_AE_SUB_NTF_001());}
if(true) {execute (TC_AE_SUB_NTF_002());}
//Polling channel actuator
//AE_PCH_00001
//TODO Missing
//AE_PCH_00002
if(true) {execute (TC_AE_PCH_001());}
}
} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
} // end of module OneM2M_TestControl_Actuator_as_ADN
/**
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
module OneM2M_TestControl_Constrained_actuator_as_ADN {
import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control {
//AE_GEN_00001
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_REG_00002
if(true) {execute (TC_AE_REG_CRE_001());}
if(true) {execute (TC_AE_REG_CRE_002_RR());}
if(true) {execute (TC_AE_REG_CRE_002_POA());}
//AE_SUB_00001
if(true) {execute (TC_AE_SUB_CRE_001());}
}
} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
/**
* Copyright Notification
* No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
* All rights reserved.
*
* @author oneM2M/ETSI
* @desc Test control module for oneM2M
*
*/
module OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel {
import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control {
//AE_GEN_00001
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_REG_00002
if(true) {execute (TC_AE_REG_CRE_001());}
if(true) {execute (TC_AE_REG_CRE_002_RR());}
if(true) {execute (TC_AE_REG_CRE_002_POA());}
//AE_SUB_00001
if(true) {execute (TC_AE_SUB_CRE_001());}
//AE_PCH_00001
//TODO Missing
//AE_PCH_00002
if(true) {execute (TC_AE_PCH_001());}
}
} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
......@@ -209,9 +209,9 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_REG_DEL_006());}
if(true) {execute (TC_CSE_REG_DEL_007());}
//if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
//if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
//if(PICS_AE_LBL) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
if(PICS_AE_LBL) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
if(PICS_AE_APN) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
......@@ -234,10 +234,10 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_REG_DEL_002());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_013_POA());}
......@@ -307,7 +307,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
//if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
if(PICS_CIN_CNF) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
......@@ -344,9 +344,9 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_SUB_CR) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
if(true) {execute (TC_CSE_DMR_CRE_012_SUB_SU());}
......@@ -369,8 +369,8 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_SUB_DEL_001());}
if(true) {execute (TC_CSE_SUB_DEL_002());}
if(true) {execute (TC_CSE_SUB_DEL_003());}
if(true) {execute (TC_CSE_SUB_NTF_001());}
if(true) {execute (TC_CSE_SUB_NTF_002());}
if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_001());}
if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_002());}
if(true) {execute (TC_CSE_SUB_NTF_003());}
if(true) {execute (TC_CSE_SUB_CRE_004());}
......@@ -407,6 +407,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
if(PICS_AE_ACPI) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
if(PICS_SUB_ACPI) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
......@@ -506,9 +507,8 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_GMG_UPD_002());}
if(true) {execute (TC_CSE_GMG_UPD_007());}
if(true) {execute (TC_CSE_GMG_UPD_008());}
//if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(PICS_GRP_GN) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
//if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
if(true) {execute (TC_CSE_GMG_CRE_004());}
......@@ -564,6 +564,8 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DIS_008_STS_STB());}
if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
if(true) {execute (TC_CSE_DIS_009());}
if(true) {execute (TC_CSE_DIS_010());}
if(true) {execute (TC_CSE_DIS_011());}
//CE_PCH_001
if(true) {execute (TC_CSE_DMR_CRE_001_PCH_AE());}
......
......@@ -225,10 +225,10 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_REG_DEL_002());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
//if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
if(true) {execute (TC_CSE_REG_CRE_027());}
if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
......@@ -288,9 +288,9 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005_CNT ());}
if(true) {execute (TC_CSE_DMR_DEL_006_CNT_CIN());}
//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
//if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
if(PICS_CNT_LBL) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
if(PICS_CNT_CR) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
......@@ -317,7 +317,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
//if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
if(PICS_CIN_CNF) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
......@@ -352,12 +352,13 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
//if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_SUB_CR) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
if(true) {execute (TC_CSE_DMR_CRE_012_SUB_SU());}
//CE_SUB_00004
if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
if(true) {execute (TC_CSE_SUB_CRE_001_CIN());}
......@@ -376,8 +377,8 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_SUB_DEL_001());}
if(true) {execute (TC_CSE_SUB_DEL_002());}
if(true) {execute (TC_CSE_SUB_DEL_003());}
if(true) {execute (TC_CSE_SUB_NTF_001());}
if(true) {execute (TC_CSE_SUB_NTF_002());}
if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_001());}
if(PICS_SUBSCRIPTION_VERIFICATION) {execute (TC_CSE_SUB_NTF_002());}
if(true) {execute (TC_CSE_SUB_NTF_003());}
if(true) {execute (TC_CSE_SUB_CRE_004());}
......@@ -414,6 +415,7 @@ module OneM2M_TestControl_MN_profile {
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
if(PICS_AE_ACPI) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
if(PICS_SUB_ACPI) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
......@@ -513,9 +515,8 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_GMG_UPD_002());}
if(true) {execute (TC_CSE_GMG_UPD_007());}
if(true) {execute (TC_CSE_GMG_UPD_008());}
//if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(PICS_GRP_GN) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
//if(PICS_GRP_ACPI) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
if(true) {execute (TC_CSE_GMG_CRE_004());}
......@@ -571,6 +572,8 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DIS_008_STS_STB());}
if(true) {execute (TC_CSE_DIS_008_EXB_EXA());}
if(true) {execute (TC_CSE_DIS_009());}
if(true) {execute (TC_CSE_DIS_010());}
if(true) {execute (TC_CSE_DIS_011());}
//CE_PCH_001
if(true) {execute (TC_CSE_DMR_CRE_001_PCH_AE());}
......@@ -594,5 +597,5 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_PCH_006());}
}
} // end of module OneM2M_TestControl_IN_profile
} // end of module OneM2M_TestControl_MN_profile
......@@ -10320,6 +10320,152 @@ module OneM2M_Testcases_CSE_Release_1 {
// Tear down
f_cf01Down();
} // end TC_CSE_DIS_009
/**
* @desc Check that the IUT returns successfully a list of discovered resource addresses with Hierarchical addressing form when the Discovery Result Type is provided in the request
*
*/
testcase TC_CSE_DIS_010() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_010());
v_ae1.done;
}
function f_CSE_DIS_010() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var integer v_childResourceIndex := -1;
const ResourceType c_containerResourceType := int3;
var integer v_i_cont := 0;
// Test control
// Test component configuration
f_cf01Up();
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, int1));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
while (v_i_cont<lengthof(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
if (f_isNonHierarchical(v_response.primitive.responsePrimitive.primitiveContent.uRIList[v_i_cont])) {
setverdict(pass, __SCOPE__ & ": Hierarchical address form present in URIList[" & int2str(v_i_cont) & "] element");
} else {
setverdict(fail, __SCOPE__ & ": Hierarchical address form absent in URIList[" & int2str(v_i_cont) & "] element");
}
v_i_cont := v_i_cont + 1;
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
} // end TC_CSE_DIS_010
/**
* @desc Check that the IUT returns successfully a list of discovered resource addresses with Hierarchical addressing form when the Desired Identifier Result Type is not provided in the request
*
*/
testcase TC_CSE_DIS_011() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
v_ae1.start(f_CSE_DIS_011());
v_ae1.done;
}
function f_CSE_DIS_011() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var integer v_childResourceIndex := -1;
const ResourceType c_containerResourceType := int3;
var integer v_i_cont := 0;
// Test control
// Test component configuration
f_cf01Up();
// Test adapter configuration
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
while (v_i_cont<lengthof(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
if (f_isHierarchical(v_response.primitive.responsePrimitive.primitiveContent.uRIList[v_i_cont])) {
setverdict(pass, __SCOPE__ & ": Hierarchical address form present in URIList[" & int2str(v_i_cont) & "] element");
} else {
setverdict(fail, __SCOPE__ & ": Hierarchical address form absent in URIList[" & int2str(v_i_cont) & "] element");
}
v_i_cont := v_i_cont + 1;
}
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Wrong response status code");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while retrieving resource");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
}
}
// Postamble
f_cse_postamble_deleteResources();
// Tear down
f_cf01Down();
} // end TC_CSE_DIS_011
} //end group Group Discovery
......@@ -11114,7 +11260,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_containerIndex_2 := f_cse_createResource(int3, m_createContainer_noResourceName, v_aeIndex); // AE child resource
v_memberId_1 := f_getResourceId(vc_resourcesList[v_containerIndex_1].resource);
v_memberId_2 := f_getResourceId(vc_resourcesList[v_containerIndex_2].resource);
v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1, v_memberId_2}, omit, int3, -, -, -), v_aeIndex); // AE child resource
v_groupIndex := f_cse_createResource(int9, m_createGroup(2, {v_memberId_1, v_memberId_2}, omit, -, -, -, -), v_aeIndex); // AE child resource
v_updateRequest.primitiveContent.group_.memberIDs := {v_memberId_2, v_memberId_2};
v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
......
......@@ -16,6 +16,7 @@ module OneM2M_Testcases_CSE_Release_2 {
import from OneM2M_Types all;//{type XSD.ID};
import from OneM2M_TypesAndValues all;
import from OneM2M_Pixits all;
import from OneM2M_Pics all;
import from LibCommon_Time all;
import from OneM2M_Functions all;
import from OneM2M_PermutationFunctions all;
......@@ -32,7 +33,7 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer i;
var XSD.ID v_resourceAddress;
var RequestPrimitive v_request;
map(self:mcaPort, system:mcaPort);
map(self:mcaPort, system:mcaPort) param (PX_TS_AE1.mcaPort);
for (i:=0; i<lengthof(PX_RESOURCES_TO_BE_DELETED); i:= i+1) {
......@@ -2195,7 +2196,11 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer v_ae2Index := -1;
// Test control
if(not(PICS_SUBSCRIPTION_VERIFICATION)) {
setverdict(inconc, __SCOPE__ & ": Subscription verification support is required to run this test case");
stop;
}
// Test component configuration
f_cf01Up(true);
......@@ -2270,7 +2275,11 @@ module OneM2M_Testcases_CSE_Release_2 {
var integer v_ae2Index := -1;
// Test control