Commit 9700ca427630221479a6cd29e5d653180d9b82a0

Authored by Miguel Angel Reina Ortega
1 parent 90d807ac

AccessControlPolicy_optional and AccessControlPolicyAnnc_optional choice_list ad…

…ded for the children resource list

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -3840,7 +3840,7 @@ module OneM2M_Templates {
3840 3840 }
3841 3841  
3842 3842 template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
3843   - choice := {subscription_list := ?} //O
  3843 + choice := {choice_list := ?} //O
3844 3844 }
3845 3845  
3846 3846 template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
... ...
... ... @@ -6718,7 +6718,9 @@ group OptionalResourceTypes {
6718 6718 SetOfAcrs selfPrivileges optional,
6719 6719 union {
6720 6720 record length(1 .. infinity) of ChildResourceRef childResource_list,
6721   - record length(1 .. infinity) of Subscription subscription_list
  6721 + record length(1 .. infinity) of union {
  6722 + Subscription subscription
  6723 + } choice_list
6722 6724 } choice optional
6723 6725 }
6724 6726 with {
... ... @@ -6729,8 +6731,8 @@ group OptionalResourceTypes {
6729 6731 variant (choice) "untagged";
6730 6732 variant (choice.childResource_list) "untagged";
6731 6733 variant (choice.childResource_list[-]) "name as 'childResource'";
6732   - variant (choice.subscription_list) "untagged";
6733   - variant (choice.subscription_list[-]) "name as 'subscription'";
  6734 + variant (choice.choice_list) "untagged";
  6735 + variant (choice.choice_list[-]) "untagged";
6734 6736 };
6735 6737 type record AccessControlPolicyAnnc_optional
6736 6738 {
... ... @@ -6747,7 +6749,9 @@ group OptionalResourceTypes {
6747 6749 SetOfAcrs selfPrivileges optional,
6748 6750 union {
6749 6751 record length(1 .. infinity) of ChildResourceRef childResource_list,
6750   - record length(1 .. infinity) of Subscription subscription_list
  6752 + record length(1 .. infinity) of union {
  6753 + Subscription subscription
  6754 + } choice_list
6751 6755 } choice optional
6752 6756 }
6753 6757 with {
... ... @@ -6757,8 +6761,8 @@ group OptionalResourceTypes {
6757 6761 variant (choice) "untagged";
6758 6762 variant (choice.childResource_list) "untagged";
6759 6763 variant (choice.childResource_list[-]) "name as 'childResource'";
6760   - variant (choice.subscription_list) "untagged";
6761   - variant (choice.subscription_list[-]) "name as 'subscription'";
  6764 + variant (choice.choice_list) "untagged";
  6765 + variant (choice.choice_list[-]) "untagged";
6762 6766 };
6763 6767  
6764 6768 type record AE_optional
... ...