STF531: Minor bugs corrected (renamed templates, missing PICS and values)

Signed-off-by: Naum Spaseski <naum.spaseski@gmail.com>

OneM2M_PermutationFunctions.ttcn

@@ -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();

OneM2M_TestControl_IN_profile.ttcn

@@ -157,7 +157,7 @@ module OneM2M_TestControl_IN_profile {
 		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
 		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(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());}

OneM2M_TestControl_MN_profile.ttcn

@@ -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

OneM2M_Testcases_CSE_Release_1.ttcn

@@ -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);