From a2b47b58aa260faffca96680eef3436d4c3110d0 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 27 Sep 2016 11:14:03 +0200
Subject: [PATCH] Constants types corrected + new template for sending response
primitives
---
LibOneM2M/OneM2M_Pixits.ttcn | 20 ++++++++++----------
LibOneM2M/OneM2M_Templates.ttcn | 17 +++++++++++++++--
LibOneM2M/OneM2M_TypesAndValues.ttcn | 4 ++--
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index ab9294b..5894bba 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- * $Id: OneM2M_Pixits.ttcn 103 2016-08-30 09:39:32Z reinaortega $
+ * $Id: OneM2M_Pixits.ttcn 121 2016-09-27 08:36:54Z reinaortega $
* @desc Module containing Pixits for oneM2M
*
*/
@@ -18,7 +18,7 @@ module OneM2M_Pixits {
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
- modulepar charstring PX_RESOURCE_TO_BE_DELETED := "/ae_test";
+ modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"/ae_test", "/MyAcp"};
@@ -26,15 +26,15 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "om2m=""http://www.onem2m.org/xml/protocols""";
- modulepar charstring PX_CSE_NAME := "in-cse";
+ modulepar XSD.ID PX_CSE_NAME := "in-cse";
- modulepar charstring PX_URI_CSE := "/~/in-cse";
+ modulepar XSD.AnyURI PX_URI_CSE := "/~/in-cse";
modulepar boolean PX_UNSTRUCTURED := false;
- modulepar charstring PX_AE_ID_STEM := "admin:admin";
+ modulepar XSD.ID PX_AE_ID_STEM := "admin:admin";
- modulepar charstring PX_APP_ID := "myAppId";
+ modulepar XSD.ID PX_APP_ID := "myAppId";
modulepar boolean PX_RUN_POSTAMBLE := true;
@@ -42,21 +42,21 @@ module OneM2M_Pixits {
modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative;
- modulepar charstring PX_SERIALIZATION := "JSON";
+ modulepar charstring PX_SERIALIZATION := "XML";
modulepar charstring PX_PROTOCOL_BINDING := "HTTP";
modulepar boolean PX_ACP_SUPPORT := true;
- modulepar charstring PX_CSE_ID := "in-cse";
+ modulepar XSD.ID PX_CSE_ID := "in-cse";
modulepar boolean PX_FROM_IS_AE_ID := false;
//@Martin
//constant parameters for LOC
modulepar LocationSource PX_LOCATION_SOURCE := int1;//network-defined
- modulepar charstring PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
- modulepar charstring PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
+ modulepar XSD.Token PX_LOCATION_TARGET_ID := "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
+ modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS := "{LOCATION-SERVER-ADDRESS}";
modulepar charstring PX_LOCATION_UPDATE_PERIOD := "PT10M10S" ;//10 Minute 10 Seconds
modulepar charstring PX_LOCATION_UPDATE_PERIOD_INVALID := "-PT30M10S" ;//duration set to invalid value (minus value)
modulepar charstring PX_LOCATION_CONTAINER_NAME := "myLoContainer";
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index ff491c9..910646c 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 119 2016-09-20 13:40:03Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 121 2016-09-27 08:36:54Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -50,6 +50,19 @@ module OneM2M_Templates {
serialization := PX_SERIALIZATION,
nullFields := p_nullFields
};
+
+ /**
+ * @desc Base template for response sending operations
+ * @param p_responsePrimitive
+ */
+ template (value) MsgOut m_response(in template (value) ResponsePrimitive p_responsePrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := {
+ primitive := { responsePrimitive := p_responsePrimitive},
+ host := PX_HOST_ADDRESS,
+ xmlNamespace := PX_XML_NAMESPACE,
+ protocolBinding := PX_PROTOCOL_BINDING,
+ serialization := PX_SERIALIZATION,
+ nullFields := p_nullFields
+ };
//Added by @Naum
template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
primitive := { requestPrimitive := p_requestPrimitive}
@@ -63,7 +76,7 @@ module OneM2M_Templates {
primitive := { responsePrimitive := p_responsePrimitive}
};
- }
+ }//end of group primitives
group RequestPrimitives {
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index b204c93..31b408e 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- * $Id: OneM2M_TypesAndValues.ttcn 102 2016-08-30 09:28:49Z reinaortega $
+ * $Id: OneM2M_TypesAndValues.ttcn 121 2016-09-27 08:36:54Z reinaortega $
* @desc Module containing types and values for oneM2M
*
*/
@@ -20,7 +20,7 @@ module OneM2M_TypesAndValues {
const charstring c_uri_cse := "/~/in-cse/";
const charstring c_cse_name := "in-cse";
const XSD.String c_defaultResourceName := "MyResource";
- const charstring c_aeAuxName := "MyAe";
+ const XSD.ID c_aeAuxName := "MyAe";
const XSD.String c_acpAuxName := "MyAcp";
//AccessControlOperations
--
GitLab