Arrangement of PXs

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Pixits.ttcn

@@ -18,21 +18,14 @@ module OneM2M_Pixits {
 	
 	group TestAdapterParameters {}
 
-	modulepar boolean PX_DELETE_CREATED_RESOURCES 	:= true;
-	
-	modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED 	:= "/ae_test";
-	
-	modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
 	
-	modulepar charstring PX_SUT_ADDRESS 			:= "127.0.0.1:8080";
+		group IutParameters {
 			
-	modulepar charstring PX_AE1_ADDRESS				:= "127.0.0.1:3131";
+			modulepar boolean PX_MN_CSE	:= true; 
 			
-	modulepar charstring PX_AE2_ADDRESS				:= "127.0.0.1:3132";
-	
-	modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
+			modulepar boolean PX_IN_CSE	:= false; 
 		
-	modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
+			modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
 			
 			/**
 			 * @desc IUT CSE Name
@@ -45,56 +38,86 @@ module OneM2M_Pixits {
 			modulepar XSD.ID PX_CSE_ID := "/cseId";
 			
 			/**
-	 * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+			 * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
 			 */			
-	modulepar XSD.ID PX_SP_ID					:= "//om2m.org";
+			modulepar XSD.ID PX_CSE_RESOURCE_ID	:= "cseResourceId";
 			 
 			/**
-	 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+			 * @desc IUT M2M-SP-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
 			 */
-	modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
+			modulepar XSD.ID PX_SP_ID := "//om2m.org";
 
 			/**
-	 * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+			 * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */	
-	modulepar XSD.ID PX_CSE_RESOURCE_ID			:= "cseResourceId";
+			modulepar XSD.ID PX_SUPER_AE_ID				:= "admin:admin";
 	
 			/**
-	 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */	
-	modulepar XSD.ID PX_AE1_ID_STEM				:= "";
+			modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";	
+			
+			modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+	
+			modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
+	
+			modulepar charstring PX_SERIALIZATION			:= "XML";
+	
+			modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";		
+			
+			modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
+			
+			modulepar ListOfURIs PX_ACOR 					:= {"*"};			
+		}
+		
+		group TesterParameters {
+		
+			modulepar charstring PX_AE1_ADDRESS				:= "127.0.0.1:3131";
+	
+			modulepar charstring PX_AE2_ADDRESS				:= "127.0.0.1:3132";
+	
+			modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
 	
 			/**
-	 * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */		
-	modulepar XSD.ID PX_AE2_ID_STEM				:= "";
+			modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
 		
 			/**
-	 * @desc AE-ID with privileges to CREATE at the IUT CSEBase with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+			 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */			
-	modulepar XSD.ID PX_SUPER_AE_ID				:= "admin:admin";
+			modulepar XSD.ID PX_AE1_ID_STEM				:= "";
 
 			/**
-	 * @desc CSE-ID with privileges to CREATE at the IUT CSEBase with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+			 * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
 			 */		
-	modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";
+			modulepar XSD.ID PX_AE2_ID_STEM				:= "";
 			
 			/**
 			 * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
 			 */		
 			modulepar XSD.ID PX_APP_ID 					:= "NMyAppId";
 
+		}
+		
+		group ExecutionParameters {
+		
+			modulepar boolean PX_DELETE_CREATED_RESOURCES 	:= true;
+	
+			modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED 	:= "/ae_test";
+	
+			modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
+	
 			modulepar boolean PX_RUN_POSTAMBLE 				:= true;		
 		
-	modulepar ListOfURIs PX_ACOR 					:= {"*"};
 		
-	modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+		}
+
+
+	
 
-	modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
 	
-	modulepar charstring PX_SERIALIZATION			:= "XML";
 
-	modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";
 	
 	modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR 				:= true;