Merge remote-tracking branch 'remotes/origin/STF531-REG-CRE' into Release1

OneM2M_Testcases_CSE.ttcn

@@ -925,6 +925,8 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+	                
 					// Test component configuration
 					f_cf01Up();
 		  	  	
@@ -992,6 +994,8 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+	                
 					// Test component configuration
 					f_cf01Up();
 		  	  	
@@ -1039,6 +1043,8 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+	                
 					// Test component configuration
 					f_cf02UpCseSimuMaster();
 		  	  	
@@ -1092,6 +1098,12 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+					if(not(PICS_MN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+						stop;
+					}
+	                
 					// Test component configuration
 					f_cf02UpCseSimuMaster();
 		  	  	
@@ -1147,6 +1159,12 @@ module OneM2M_Testcases_CSE {
 					var integer v_aeAnncIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+					if(not(PICS_IN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+						stop;
+					}
+	                
 					// Test component configuration
 					f_cf04Up();
 		  	  	
@@ -1202,6 +1220,12 @@ module OneM2M_Testcases_CSE {
 					var RequestPrimitive v_request;
 					var integer v_aeIndex := -1;
 					
+					//Test control
+					if(not(PICS_MN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+						stop;
+					}
+	                
 					// Test component configuration
 					f_cf02Up();
 		  	  	
@@ -1269,6 +1293,8 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+    
     
 					// Test component configuration
 					f_cf01Up();
@@ -1541,6 +1567,8 @@ module OneM2M_Testcases_CSE {
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
 					
+					//Test control
+	                
 					// Test component configuration
 					f_cf01Up();
 					
@@ -2055,6 +2083,10 @@ module OneM2M_Testcases_CSE {
 					var charstring v_action :=  __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
 	   
 					//Test control
+					if(not(PICS_MN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+						stop;
+					}
 
 					// Test component configuration
 					f_cf04Up();
@@ -2212,6 +2244,12 @@ module OneM2M_Testcases_CSE {
 	  
 						var ResponsePrimitive v_responsePrimitive;
 						
+						//Test control
+						if(not(PICS_MN_CSE)) {
+							setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+							stop;
+						}
+
 						//Test component configuration
 						f_cf04Up();
 
@@ -3223,10 +3261,6 @@ module OneM2M_Testcases_CSE {
 					 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
 	
 					 // Test control
-					if(not(PICS_MN_CSE)) {
-						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
-						stop;
-					 }
 	
 					 // Test component configuration
 					 f_cf04Up();
@@ -3736,7 +3770,12 @@ module OneM2M_Testcases_CSE {
 					var UtTriggerAckPrimitive v_trigger_response;
 					var integer v_auxInteger;
 					var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+					
 					//Test control
+					if(not(PICS_MN_CSE)) {
+						setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
+						stop;
+					}
 
 					// Test component configuration
 					f_cf04Up();