From f0acc47a6ea6dbdbf06b9d912abf1c5fe60e3e35 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 29 Oct 2021 11:40:29 +0200
Subject: [PATCH] Support for several resources needed for new test cases
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Types.ttcn | 59 +++++++++++++++++++++++++++++++++++++++--------
1 file changed, 50 insertions(+), 9 deletions(-)
diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 80fbb33..8b03484 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -3971,7 +3971,12 @@ type enumerated ResourceType
int50(50),
int51(51),
int52(52),//TODO To be adjusted once Service_Subscription_User_Profile is intrduced in TS-0004
- int59(59), //TODO PrimitiveProfile-Manually added until XSD files are updated
+ int61(61), //Resource Type 61 - softwareCampaign
+ int62(62), //TODO PrimitiveProfile-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int63(63), //TODO action-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int64(64), //TODO dependency-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int65(65), //TODO state-Manually added until XSD files are updated - should be added to TS004 Table 6.3.4.2.1-1
+ int66(66), //TODO processManagement-Manually added until XSD files are updated - should be added to TS004 Table 6.3.4.2.1-1 int10001(10001),
int10001(10001),
int10002(10002),
int10003(10003),
@@ -4256,8 +4261,11 @@ type enumerated MemberType
int49(49),
int50(50),
int51(51),
- int59(59), // TODO primitive profile - Manually added until XSD files are updated
- int10001(10001),
+ int62(62), //TODO PrimitiveProfile-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int63(63), //TODO action-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int64(64), //TODO dependency-Manually added until XSD files are updated - acc. to SDS-2021-0121R03-TS-0004 Table 6.3.4.2.1-1
+ int65(65), //TODO state-Manually added until XSD files are updated - should be added to TS004 Table 6.3.4.2.1-1
+ int66(66), //TODO processManagement-Manually added until XSD files are updated - should be added to TS004 Table 6.3.4.2.1-1 int10001(10001),
int10002(10002),
int10003(10003),
int10004(10004),
@@ -4399,7 +4407,8 @@ type enumerated NotificationContentType
int1(1),
int2(2),
int3(3),
- int4(4)
+ int4(4),
+ int5(5)
}
with {
variant "useNumber";
@@ -4415,7 +4424,8 @@ type enumerated NotificationEventType
int4(4),
int5(5),
int6(6),
- int7(7)
+ int7(7),
+ int8(8)
}
with {
variant "useNumber";
@@ -5059,6 +5069,31 @@ with {
variant "name as uncapitalized";
};
+type enumerated ProcessStatus //TODO Manually added until XSD files are updated
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+type enumerated ProcessControl //TODO Manually added until XSD files are updated
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
type record EventConfig
{
@@ -6291,14 +6326,21 @@ with {
//FIXME To replace Representation type by this
type union Representation {
Resource_2 resource,
- URI uRI
+ URI uRI,
+ TimeSeriesNotification timeSeriesNotification
}
with {
variant "name as 'representation'";
variant (uRI) "name as capitalized";
};
-
+ type record TimeSeriesNotification {
+ MissingDataList missingDataList,
+ XSD.NonNegativeInteger missingDataCurrentNr
+ }
+ with {
+ variant "name as 'timeSeriesNotification'";
+ };
type record OntologyRepository
{
@@ -8409,5 +8451,4 @@ with {
encode "XML";
//variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'";
//variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'";
- extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional"
-}
+ extension "anytype Resource, URI, Notification, AggregatedNotification, AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, AccessControlPolicyAnnc_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, ContainerAnnc_optional, ContentInstanceAnnc_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, GroupAnnc_optional, LocationPolicyAnnc_optional, MgmtResource_optional, AnnouncedMgmtResource_optional, Node_optional, NodeAnnc_optional, Schedule_optional, ScheduleAnnc_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid, SemanticDescriptor_optional, FlexContainerResource_optional, GenericInterworkingOperationInstance_optional, ProcessManagement_optional, State_optional"}
--
GitLab