From dcd4424ffcbaa665c9ea0493e5593f23896cc46a Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 22 Nov 2016 18:53:44 +0100
Subject: [PATCH] Moved to XSD 1.10.0
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 4 ++--
LibOneM2M/OneM2M_Templates.ttcn | 8 ++++----
LibOneM2M/OneM2M_Types.ttcn | 19 ++++++++++++++++---
OneM2M_Testcases.ttcn | 4 ++--
4 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index f4d6129..b182138 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 104 2016-08-30 15:13:47Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -354,7 +354,7 @@ module OneM2M_Functions {
{
accessControlOriginators := PX_ACOR, //{"admin:admin"}
accessControlOperations := valueof(p_allowedOperations),
- accessControlContexts_list := omit
+ accessControlContexts_list := {}
}
};
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 852287f..43fe6f5 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/branches/Release1/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
- * $Id: OneM2M_Templates.ttcn 120 2016-09-20 14:48:51Z reinaortega $
+ * $Id: OneM2M_Templates.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
@@ -1023,7 +1023,7 @@ module OneM2M_Templates {
* @param p_acor Allowed originators
* @param p_allowedOperations Allowed operations
*/
- template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
+ template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) ResourceName p_name := c_defaultResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1039,7 +1039,7 @@ module OneM2M_Templates {
{
accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := p_allowedOperations,
- accessControlContexts_list := omit
+ accessControlContexts_list := {}
}
}
},//M
@@ -1048,7 +1048,7 @@ module OneM2M_Templates {
{
accessControlOriginators := p_acor, //{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := int63,
- accessControlContexts_list := omit
+ accessControlContexts_list := {}
}
}
},//M
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index afc64ae..75d9f40 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- * $Id: OneM2M_Types.ttcn 120 2016-09-20 14:48:51Z reinaortega $
+ * $Id: OneM2M_Types.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Test System module for oneM2M
*
*/
@@ -3218,8 +3218,21 @@ module OneM2M_Types {
};
- type record Notification_1
- {
+type record AggregatedNotification_1
+{
+ record of Notification notification_list
+}
+with {
+ variant "name as 'aggregatedNotification'";
+ variant (notification_list) "untagged";
+ variant (notification_list[-]) "name as 'notification'";
+};
+
+
+type record Notification_1
+{
+ record {
+ XSD.AnyType representation optional,
record {
XSD.AnyType representation optional,
record {
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 183ca22..f33d9f3 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author ETSI
* @version $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 120 2016-09-20 14:48:51Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 173 2016-11-22 08:10:48Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -3113,7 +3113,7 @@ module OneM2M_Testcases {
{
accessControlOriginators := {"admin:admin"},
accessControlOperations := int63,
- accessControlContexts_list := omit
+ accessControlContexts_list := {}
}
}
}
--
GitLab