From 071d32ccb379510bbffda440dc06adb067bf297b Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 17 Feb 2023 17:41:25 +0100
Subject: [PATCH] Moved to XSD v4_13_0
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Templates.ttcn | 23 +++++++++++++
LibOneM2M/OneM2M_TypesAndValues.ttcn | 48 +++++++++++++++++++---------
LibOneM2M/oneM2M_Types | 2 +-
3 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 1b1183e..d382c14 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3237,6 +3237,7 @@ module OneM2M_Templates {
sessionCapabilities := omit,//OA
triggerEnable := omit,//OA
activityPatternElements := omit,//OA
+ externalGroupID := omit,//OA
choice := omit//NP
};
@@ -3275,6 +3276,7 @@ module OneM2M_Templates {
sessionCapabilities := *,//OA O
triggerEnable := *,//OA O
activityPatternElements := *,//OA O
+ externalGroupID := *,//OA
choice := omit//NA
};
@@ -3353,6 +3355,9 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
+ Trigger_Recipient_ID := omit,//O
+ triggerReferenceNumber := omit,//O
+ externalGroupID := omit,//O
choice := omit//NP
};
@@ -3393,6 +3398,9 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
+ Trigger_Recipient_ID := *,//O
+ triggerReferenceNumber := *,//O
+ externalGroupID := *,//O
choice := *//NP
};
@@ -7379,6 +7387,9 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
+ Trigger_Recipient_ID := omit,//O
+ triggerReferenceNumber := omit,//O
+ externalGroupID := omit,//O
choice := omit //NP
};
@@ -7897,6 +7908,7 @@ module OneM2M_Templates {
sessionCapabilities := omit,//O
triggerEnable := omit,//O
activityPatternElements := omit,//O
+ externalGroupID := omit,//O
choice := omit
}
@@ -8677,6 +8689,9 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
+ Trigger_Recipient_ID := *,//O
+ triggerReferenceNumber := *,//O
+ externalGroupID := *,//O
choice := *//O
};
@@ -8713,6 +8728,9 @@ module OneM2M_Templates {
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
+ Trigger_Recipient_ID := omit,//O
+ triggerReferenceNumber := omit,//O
+ externalGroupID := omit,//O
choice := omit//O
};
@@ -8749,6 +8767,9 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
+ Trigger_Recipient_ID := *,//O
+ triggerReferenceNumber := *,//O
+ externalGroupID := *,//O
choice := *//O
};
@@ -8780,6 +8801,7 @@ module OneM2M_Templates {
sessionCapabilities := *,//O,
triggerEnable := *,//O,
activityPatternElements := *,//O,
+ externalGroupID := *,//O
choice := *//O
};
@@ -8812,6 +8834,7 @@ module OneM2M_Templates {
sessionCapabilities := *,//O,
triggerEnable := *,//O,
activityPatternElements := *,//O,
+ externalGroupID := *,//O
choice := *//O
};
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 985ae47..d1ac974 100644
--- a/LibOneM2M/OneM2M_TypesAndValues.ttcn
+++ b/LibOneM2M/OneM2M_TypesAndValues.ttcn
@@ -319,7 +319,7 @@ group OptionalResourceTypes {
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Dependency dependency,
+ DependencyAnnc dependencyAnnc,
Subscription subscription,
Transaction transaction
} choice_list
@@ -406,6 +406,9 @@ group OptionalResourceTypes {
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
+ TriggerRecipientID Trigger_Recipient_ID optional,
+ XSD.UnsignedInt triggerReferenceNumber optional,
+ ExternalID externalGroupID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -426,7 +429,8 @@ group OptionalResourceTypes {
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
NwMonitoringReq nwMonitoringReq,
- PrimitiveProfile primitiveProfile
+ PrimitiveProfile primitiveProfile,
+ Action action_
} choice_list
} choice optional
}
@@ -482,6 +486,7 @@ group OptionalResourceTypes {
SessionCapabilities sessionCapabilities optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
+ ExternalID externalGroupID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -507,7 +512,8 @@ group OptionalResourceTypes {
Transaction transaction,
E2eQosSession e2eQosSession,
NwMonitoringReq nwMonitoringReq,
- PrimitiveProfile primitiveProfile
+ PrimitiveProfile primitiveProfile,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -728,7 +734,8 @@ group OptionalResourceTypes {
SemanticDescriptor semanticDescriptor,
Sg_flexContainerResource_group sg_flexContainerResource,
TimeSeries timeSeries,
- Transaction transaction
+ Transaction transaction,
+ Action action_
} choice_list
} choice optional
}
@@ -783,7 +790,8 @@ group OptionalResourceTypes {
Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource,
TimeSeries timeSeries,
TimeSeriesAnnc timeSeriesAnnc,
- Transaction transaction
+ Transaction transaction,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -936,7 +944,8 @@ group OptionalResourceTypes {
E2eQosSession e2eQosSession,
TimeSyncBeacon timeSyncBeacon,
NwMonitoringReq nwMonitoringReq,
- PrimitiveProfile primitiveProfile
+ PrimitiveProfile primitiveProfile,
+ Action action_
} choice_list
} choice optional
}
@@ -1161,7 +1170,8 @@ group OptionalResourceTypes {
record length(1 .. infinity) of union {
Subscription subscription,
SemanticDescriptor semanticDescriptor,
- Transaction transaction
+ Transaction transaction,
+ Action action_
} choice_list
} choice optional
}
@@ -1216,7 +1226,8 @@ group OptionalResourceTypes {
Subscription subscription,
SemanticDescriptor semanticDescriptor,
SemanticDescriptorAnnc semanticDescriptorAnnc,
- Transaction transaction
+ Transaction transaction,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -1439,7 +1450,8 @@ group OptionalResourceTypes {
Subscription subscription,
SemanticDescriptor semanticDescriptor,
Transaction transaction,
- Schedule schedule
+ Schedule schedule,
+ Action action_
} choice_list
} choice optional
}
@@ -1494,7 +1506,8 @@ group OptionalResourceTypes {
SemanticDescriptor semanticDescriptor,
SemanticDescriptorAnnc semanticDescriptorAnnc,
Transaction transaction,
- Schedule schedule
+ Schedule schedule,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -1861,7 +1874,8 @@ group OptionalResourceTypes {
TimeSyncBeaconAnnc timeSyncBeaconAnnc,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile,
- PrimitiveProfileAnnc primitiveProfileAnnc
+ PrimitiveProfileAnnc primitiveProfileAnnc,
+ Action action_
} choice_list
} choice optional
}
@@ -1946,7 +1960,8 @@ group OptionalResourceTypes {
E2eQosSession e2eQosSession,
NwMonitoringReq nwMonitoringReq,
PrimitiveProfile primitiveProfile,
- PrimitiveProfileAnnc primitiveProfileAnnc
+ PrimitiveProfileAnnc primitiveProfileAnnc,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -2739,7 +2754,8 @@ type record TriggerRequest_optional
TimeSeriesInstance timeSeriesInstance,
Subscription subscription,
SemanticDescriptor semanticDescriptor,
- Transaction transaction
+ Transaction transaction,
+ Action action_
} choice_list
} choice optional
}
@@ -2793,7 +2809,8 @@ type record TriggerRequest_optional
Subscription subscription,
SemanticDescriptor semanticDescriptor,
SemanticDescriptorAnnc semanticDescriptorAnnc,
- Transaction transaction
+ Transaction transaction,
+ ActionAnnc actionAnnc
} choice_list
} choice optional
}
@@ -4564,7 +4581,8 @@ type record TriggerRequest_optional
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Subscription subscription
+ Subscription subscription,
+ Action action_
} choice_list
} choice optional
}
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index af7a009..19da551 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit af7a0093b851fd5a184d9cc2955c46bcbfe379d0
+Subproject commit 19da551298638b54c0b08a5db0cbf11b23e860d6
--
GitLab