From a3a9a7534ae151b50d68917517fbf8f695de64bb Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Mon, 15 Jan 2018 09:41:48 +0100
Subject: [PATCH] Profiles updated

Signed-off-by: acverdugo <acverdugo@at4wireless.com>
---
 OneM2M_TestControl_IN_profile.ttcn | 72 +++++++++++++--------------
 OneM2M_TestControl_MN_profile.ttcn | 78 +++++++++++++++---------------
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index b1850b8..96c9877 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -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());}
 		
@@ -129,35 +129,35 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
 		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_CNT_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());}
@@ -187,10 +187,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());}
@@ -224,17 +224,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());}
@@ -345,9 +345,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());}
@@ -385,7 +385,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
 
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 89e9997..8fc5415 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -77,13 +77,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 +122,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());}				
 		
@@ -153,35 +153,35 @@ module OneM2M_TestControl_MN_profile {
 		if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
 		if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
 		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());}
@@ -211,10 +211,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());}
@@ -248,17 +248,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());}
@@ -368,9 +368,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());}
@@ -408,7 +408,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
-- 
GitLab