From 11ec4e97bc9a79f3c175959d7588a14b533b6e00 Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Fri, 6 Sep 2024 17:31:25 +0200 Subject: [PATCH] Moved to XSD v4_19_0 --- LibOneM2M/OneM2M_Templates.ttcn | 12 ++++++------ LibOneM2M/OneM2M_TypesAndValues.ttcn | 2 +- LibOneM2M/oneM2M_Types | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index ce9bfb0..6fa4947 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -5915,7 +5915,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := omit, //O custodian := omit,//O m2M_Sub_ID := PX_M2M_SUB_ID, //M - m2M_SS_ID := PX_M2M_SS_ID, //O + m2M_SS_ID := PX_M2M_SS_ID, //M status := omit, //NP default INACTIVE activate_ := omit, //NP default false activationTime := omit, //NP @@ -5957,7 +5957,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := omit, //O custodian := omit,//O m2M_Sub_ID := PX_M2M_SUB_ID, //M - m2M_SS_ID := PX_M2M_SS_ID, //O + m2M_SS_ID := PX_M2M_SS_ID, //M status := omit, //NP default INACTIVE activate_ := omit, //NP default false activationTime := omit, //NP @@ -5999,7 +5999,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := omit, //O custodian := omit,//O m2M_Sub_ID := PX_M2M_SUB_ID, //M - m2M_SS_ID := PX_M2M_SS_ID, //O + m2M_SS_ID := PX_M2M_SS_ID, //M status := omit, //NP activate_ := omit, //NP activationTime := omit, //NP @@ -6041,7 +6041,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := omit, //O custodian := omit,//O m2M_Sub_ID := PX_M2M_SUB_ID, //M - m2M_SS_ID := PX_M2M_SS_ID, //O + m2M_SS_ID := PX_M2M_SS_ID, //M status := omit, //NP activate_ := omit, //NP default false activationTime := omit, //NP @@ -6083,7 +6083,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := omit, //O custodian := omit,//O m2M_Sub_ID := PX_M2M_SUB_ID, //M - m2M_SS_ID := PX_M2M_SS_ID, //O + m2M_SS_ID := PX_M2M_SS_ID, //M status := omit, //NP activate_ := omit, //NP default false activationTime := omit, //NP @@ -10729,7 +10729,7 @@ module OneM2M_Templates { dynamicAuthorizationConsultationIDs := *, //O custodian := *,//O m2M_Sub_ID := ?, //M - m2M_SS_ID := *, //O + m2M_SS_ID := ?, //M status := ?, //M activate_ := ?, //M activationTime := *, //O diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn index cea7acb..c0f3a7a 100644 --- a/LibOneM2M/OneM2M_TypesAndValues.ttcn +++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn @@ -2487,7 +2487,7 @@ type record TriggerRequest_optional XSD.NonNegativeInteger maxNotificationRate optional, XSD.NonNegativeInteger maxNumFlexContainers optional, XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional, - SetOfAcrs defaultAccessControlPrivileges optional, + AcpType defaultAccessControlPrivileges optional, union { record length(1 .. infinity) of ChildResourceRef childResource_list, record length(1 .. infinity) of union { diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types index f25f326..3295ee7 160000 --- a/LibOneM2M/oneM2M_Types +++ b/LibOneM2M/oneM2M_Types @@ -1 +1 @@ -Subproject commit f25f32643a70631d119e07b4321e903edeec8025 +Subproject commit 3295ee7d836392a8ad585ce5faf2e4d2e93894d0 -- GitLab