Clean up of duplicated PXs

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Pixits.ttcn

@@ -21,9 +21,11 @@ module OneM2M_Pixits {
 	
 		group IutParameters {
 			
-			modulepar boolean PX_MN_CSE	:= true; 
+			modulepar boolean PX_IN_CSE	:= true; 
 			
-			modulepar boolean PX_IN_CSE	:= false; 
+			modulepar boolean PX_MN_CSE	:= false; 
+						
+			modulepar boolean PX_ASN_CSE:= false; 
 		
 			modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
 			
@@ -142,13 +144,6 @@ module OneM2M_Pixits {
 	
 			modulepar boolean PX_RUN_POSTAMBLE 				:= true;		
 		}
-
-	
-	//for checking whether the locationPolicy creation request is originated from a ASN-AE
-	//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT  	
-	modulepar boolean PX_IUT_IS_ASN_CSE				:= false; //default //set it to true when running Device-based location testcases 	
-	modulepar boolean PX_IUT_IS_MN_CSE				:= false; //default //set it to true when running Share-based location testcases
-	modulepar boolean PX_IUT_IS_IN_CSE				:= false; //default //set it to true when running Share-based location testcases
 	
 	//constant parameters for LOC  
 	modulepar XSD.Token PX_LOCATION_TARGET_ID				:= "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER

OneM2M_PermutationFunctions.ttcn

@@ -2674,9 +2674,9 @@ module OneM2M_PermutationFunctions {
 	
 						// Preamble
 						
-						if (PX_IUT_IS_MN_CSE == true) {
+						if (PX_MN_CSE) {
 							vc_cse1.start(f_cse_registrationRemoteCse(m_createRemoteCSEBase));
-						}else if (PX_IUT_IS_IN_CSE == true) {
+						}else if (PX_IN_CSE) {
 							vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
 						}	
 						vc_cse1.done;						

OneM2M_Testcases_CSE_Release_2.ttcn

@@ -5351,7 +5351,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				f_cf01Up();
      	     	
      	     	
-				if(PX_IUT_IS_ASN_CSE){
+				if(PX_ASN_CSE){
      	     	  
 					//Preamble
 					v_aeAuxIndex := f_cse_preamble_registerAe();
@@ -5416,7 +5416,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 				f_cf01Up();
      	     	
      	     	
-				if(PX_IUT_IS_MN_CSE){
+				if(PX_MN_CSE){
      	     	      	     	    
 					//Preamble
 					v_aeAuxIndex := f_cse_preamble_registerAe();