Commit c11d2cb5 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'STF531-January' of https://git.onem2m.org/TST/ATS into STF531-January

parents 7efb8faf 844d817a
......@@ -1726,7 +1726,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(m_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
v_utRequest.to_ := f_getResourceAddress();
......
......@@ -73,13 +73,13 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_REG_CRE_023());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_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(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
if(PICS_AE_APN) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());}
if(true) {execute (TC_CSE_REG_CRE_002());}
......@@ -135,35 +135,35 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
if(true) {execute (TC_CSE_DMR_DEL_006());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
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());}
if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_013());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
if(true) {execute (TC_CSE_DMR_UPD_011());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
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());}
if(true) {execute (TC_CSE_DMR_RET_012());}
if(true) {execute (TC_CSE_DMR_UPD_012());}
if(true) {execute (TC_CSE_DMR_DEL_007());}
......@@ -193,10 +193,10 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
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());}
//CE_SUB_00004
if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
......@@ -230,17 +230,17 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
if(true) {execute (TC_CSE_SEC_ACP_CRE_003());}
if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
//CE_SEC_00002
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
if(PICS_SUB_ACPI) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
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_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());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
......@@ -351,9 +351,9 @@ 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(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
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());}
if(true) {execute (TC_CSE_GMG_CRE_005());}
......@@ -391,7 +391,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
}
} // end of module OneM2M_TestControl_IN_profile
......@@ -54,7 +54,6 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_REG_UPD_001());}
if(true) {execute (TC_CSE_REG_DEL_001());}
if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
if(true) {execute (TC_CSE_REG_RET_005());}
if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
//CE_REG_00002
......@@ -77,13 +76,13 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_REG_CRE_023());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_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(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
if(PICS_AE_APN) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
if(true) {execute (TC_CSE_REG_CRE_002());}
//if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());}
......@@ -122,13 +121,13 @@ module OneM2M_TestControl_MN_profile {
if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_CRE_026_POA());}
if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_CRE_026_NL());}
if(PICS_MN_CSE and PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_003_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_CSR_LBL());}
if(PICS_CSR_LBL) {execute (TC_CSE_DMR_UPD_015_CSR_LBL());}
if(PICS_MN_CSE and PICS_CSR_ET) {execute (TC_CSE_REG_UPD_003_ET());}
if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_UPD_003_POA());}
if(true) {execute (TC_CSE_DMR_UPD_015_CSR_POA());}
if(PICS_CSR_POA) {execute (TC_CSE_DMR_UPD_015_CSR_POA());}
if(PICS_MN_CSE and PICS_CSR_RR) {execute (TC_CSE_REG_UPD_003_RR());}
if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_UPD_003_NL());}
if(true) {execute (TC_CSE_DMR_UPD_015_CSR_NL());}
if(PICS_CSR_NL) {execute (TC_CSE_DMR_UPD_015_CSR_NL());}
if(PICS_MN_CSE) {execute (TC_CSE_REG_DEL_004());}
if(PICS_MN_CSE) {execute (TC_CSE_REG_RET_009());}
......@@ -159,35 +158,35 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
if(true) {execute (TC_CSE_DMR_DEL_006());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
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());}
if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
if(PICS_CNT_MNI) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_013());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
if(PICS_CNT_MIA) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
if(true) {execute (TC_CSE_DMR_UPD_011());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
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());}
if(true) {execute (TC_CSE_DMR_RET_012());}
if(true) {execute (TC_CSE_DMR_UPD_012());}
if(true) {execute (TC_CSE_DMR_DEL_007());}
......@@ -217,10 +216,10 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
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());}
//CE_SUB_00004
if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
......@@ -254,17 +253,17 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
if(true) {execute (TC_CSE_SEC_ACP_CRE_003());}
if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
//CE_SEC_00002
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
if(PICS_SUB_ACPI) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
if(PICS_CNT_ACPI) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
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_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());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
......@@ -374,9 +373,9 @@ 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(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
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());}
if(true) {execute (TC_CSE_GMG_CRE_005());}
......@@ -414,7 +413,7 @@ module OneM2M_TestControl_MN_profile {
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
if(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
if(PICS_GRP_MACP) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
}
} // end of module OneM2M_TestControl_IN_profile
......
......@@ -2290,7 +2290,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(m_createRemoteCSEBase);
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
v_utRequest := m_utRetrieveResource(f_getLocalResourceAddress(vc_localRemoteCseIndex), PX_CSE_ID);
......@@ -2339,7 +2339,13 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(m_createRemoteCSEBase);
if (PICS_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
}
if (PICS_MN_CSE){
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
}
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
......@@ -2616,8 +2622,14 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test adapter configuration
// Preamble
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
if (PICS_MN_CSE){
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
}
if (PICS_IN_CSE){
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE);
}
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
......@@ -2732,7 +2744,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSE);
//Send Trigger Message
v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,omit,omit))), int16);
v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,-,-))), int16);
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest, v_action);
......
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