From 9700ca427630221479a6cd29e5d653180d9b82a0 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 24 Jan 2019 15:43:12 +0100
Subject: [PATCH] AccessControlPolicy_optional and
AccessControlPolicyAnnc_optional choice_list added for the children resource
list
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 2 +-
LibOneM2M/OneM2M_Types.ttcn | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index d471a7b..d3ab79c 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3840,7 +3840,7 @@ module OneM2M_Templates {
}
template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
- choice := {subscription_list := ?} //O
+ choice := {choice_list := ?} //O
}
template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 275953b..f804670 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6718,7 +6718,9 @@ group OptionalResourceTypes {
SetOfAcrs selfPrivileges optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription
+ } choice_list
} choice optional
}
with {
@@ -6729,8 +6731,8 @@ group OptionalResourceTypes {
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
type record AccessControlPolicyAnnc_optional
{
@@ -6747,7 +6749,9 @@ group OptionalResourceTypes {
SetOfAcrs selfPrivileges optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription
+ } choice_list
} choice optional
}
with {
@@ -6757,8 +6761,8 @@ group OptionalResourceTypes {
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
type record AE_optional
--
GitLab