diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index cf0f18c0c76ff867d43df6424b0ef2b547ac1144..d46fa0df9a9a850bd78837a10b3210f569137351 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -208,9 +208,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());}
@@ -233,10 +233,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());}
@@ -306,7 +306,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());}
@@ -343,9 +343,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());}
@@ -406,6 +406,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());}
@@ -505,9 +506,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());}
@@ -563,6 +563,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());}
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index dd89e4f0037b3db81264bd5cb1a1735ed535eb34..00f2fa196fbb8cb7cd37a6b65bce98f4ed767283 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -224,10 +224,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());}
@@ -287,9 +287,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());}
@@ -316,7 +316,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());}
@@ -351,12 +351,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());}
@@ -413,6 +414,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());}
@@ -512,9 +514,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());}
@@ -570,6 +571,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());}
@@ -593,5 +596,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
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index a692e980b4ec1e5f32d4a9549c1a4b2887c7d67b..806a9f3475b451d2cf3aadfbc2e84fddcb5df533 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -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