From 22a210c1ee9c6e18dda84d753b4e2c5e3d6a199f Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 Sep 2017 10:07:14 +0200
Subject: [PATCH] Arrangement of PXs
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Pixits.ttcn | 153 ++++++++++++++++++++---------------
1 file changed, 88 insertions(+), 65 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index a37cf2f..f64c639 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -18,83 +18,106 @@ 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 boolean PX_MN_CSE := true;
+
+ modulepar boolean PX_IN_CSE := false;
- modulepar charstring PX_AE1_ADDRESS := "127.0.0.1:3131";
-
- modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
+ modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
+
+ /**
+ * @desc IUT CSE Name
+ */
+ modulepar XSD.ID PX_CSE_NAME := "cseName";
+
+ /**
+ * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE_ID := "/cseId";
+
+ /**
+ * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
+
+ /**
+ * @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_SP_ID := "//om2m.org";
+
+ /**
+ * @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_SUPER_AE_ID := "admin:admin";
+
+ /**
+ * @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_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_CSE1_ADDRESS := "127.0.0.1:3141";
+ modulepar charstring PX_AE2_ADDRESS := "127.0.0.1:3132";
- modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
+ modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141";
- /**
- * @desc IUT CSE Name
- */
- modulepar XSD.ID PX_CSE_NAME := "cseName";
-
- /**
- * @desc IUT CSE-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- 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
- */
- modulepar XSD.ID PX_SP_ID := "//om2m.org";
-
- /**
- * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
-
- /**
- * @desc IUT CSE resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_CSE_RESOURCE_ID := "cseResourceId";
-
- /**
- * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE1_ID_STEM := "";
+ /**
+ * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_CSE1_ID := "/MyCSEId";
+
+ /**
+ * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ modulepar XSD.ID PX_AE1_ID_STEM := "";
- /**
- * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_AE2_ID_STEM := "";
-
- /**
- * @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_SUPER_AE_ID := "admin:admin";
-
- /**
- * @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_SUPER_CSE_ID := "/admin:admin";
+ /**
+ * @desc Test System AE2-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1
+ */
+ 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";
- /**
- * @desc Test System APP-ID with App-ID format according to TS-0001-7.2-1
- */
- modulepar XSD.ID PX_APP_ID := "NMyAppId";
-
- modulepar boolean PX_RUN_POSTAMBLE := true;
+ }
+
+ group ExecutionParameters {
+
+ modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
- modulepar ListOfURIs PX_ACOR := {"*"};
+ modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
- modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+ modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
- modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
+ modulepar boolean PX_RUN_POSTAMBLE := true;
+
+
+ }
+
+
- modulepar charstring PX_SERIALIZATION := "XML";
+
- modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
+
modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
--
GitLab