diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 887f8a8b37018440dfeca24a20f0bee93324ae0d..ce9bfb06e169b9fda5fdb481970e8918b23037b2 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3230,6 +3230,7 @@ module OneM2M_Templates {
expirationTime := "20301231T012345",//MA
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
+ announceSyncType := omit, //OA
location := omit,//OA
appName := omit,//OA
app_ID := p_appId,//OA
@@ -3269,6 +3270,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := *, //OA O
+ announceSyncType := *, //OA
location := *,//OA O
appName := *,//OA O
app_ID := *,//OA M
@@ -3308,6 +3310,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA O
+ announceSyncType := *,//OA
location := *,//OA O
cseType := *,//OA O
pointOfAccess := *,//OA O
@@ -3364,7 +3367,7 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
- Trigger_Recipient_ID := omit,//O
+ trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit//NP
@@ -3407,7 +3410,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
- Trigger_Recipient_ID := *,//O
+ trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//NP
@@ -3459,6 +3462,7 @@ module OneM2M_Templates {
labels := omit,//O
expirationTime := omit,//O
link := omit,//M TODO Put the right value
+ announceSyncType := omit, //O
privileges := {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
@@ -3485,6 +3489,7 @@ module OneM2M_Templates {
labels := p_labels,//MA O
expirationTime := ?,//MA M
link := ?,//M
+ announceSyncType := *, //O
privileges := ?,//MA M
selfPrivileges := ?,//MA M
authorizationDecisionResourceIDs := *,//MA O
@@ -3594,6 +3599,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit,//OA O
+ announceSyncType := omit,//OA O
e2eSecInfo := omit,//OA O
supportedReleaseVersions := {"1", "2", "2a", "3"}, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
@@ -3615,6 +3621,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := *,//OA O
+ announceSyncType := *, //OA
e2eSecInfo := ?,//OA O
supportedReleaseVersions := ?, //MA M Mandatory for RemoteCSE from Release 2
choice := omit//NA
@@ -3797,6 +3804,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := omit,//M TODO Put the right value
dynamicAuthorizationConsultationIDs := omit, //O
+ announceSyncType := omit, //O
memberType := p_memberType,//O
specializationType := omit,//O
currentNrOfMembers := omit,//NP
@@ -3828,6 +3836,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //OA O
+ announceSyncType := *, //OA O
memberType := *, //OA M
specializationType := *,//O O
currentNrOfMembers := *,//OA M
@@ -3915,6 +3924,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,
dynamicAuthorizationConsultationIDs := *, //OA
+ announceSyncType := *, //OA
mgmtDefinition := ?, //MA
objectIDs := *, //OA
objectPaths := *, //OA
@@ -4003,6 +4013,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
+ announceSyncType := *,//O
nodeID := ?,//M
hostedCSELink := *,//O
hostedAELinks := *,//O
@@ -4609,6 +4620,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//NA O
+ announceSyncType := omit, //OA O
scheduleElement := p_scheduleEntries,//OA M
networkCoordinated := omit,//OA O
choice := omit//NP
@@ -4629,6 +4641,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,//M
dynamicAuthorizationConsultationIDs := omit,//NA O
+ announceSyncType := *,//OA O
scheduleElement := * ,//OA M
networkCoordinated := *,//OA O
choice := omit//NP
@@ -5135,6 +5148,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
+ location := omit,//O
stateTag := omit,//NP
creator := omit,//O
contentInfo := "application/text:1",//O
@@ -5162,6 +5176,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := omit,//O
+ location := *,//O
stateTag := omit,//NP
creator := *,//O
contentInfo := *,//O
@@ -5186,6 +5201,8 @@ module OneM2M_Templates {
labels := omit,//MA O
expirationTime := "29991231T235959",//NA M
link := "NotInitialized", //M
+ announceSyncType := omit, //OA O
+ location := omit,//O
stateTag := omit,//OA M
contentInfo := omit,//OA O
contentSize := omit,//OA M
@@ -5207,6 +5224,8 @@ module OneM2M_Templates {
labels := *,//MA O
expirationTime := ?,//NA M
link := ?, //M
+ announceSyncType := *,//OA O
+ location := *,//O
stateTag := *,//OA M
contentInfo := *,//OA O
contentSize := *,//OA M
@@ -5306,6 +5325,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
+ announceSyncType := omit,//O
stateTag := omit,//NP
location := omit, //O
maxNrOfInstances := omit,//O
@@ -5524,6 +5544,7 @@ module OneM2M_Templates {
expirationTime := "29991231T235959",//MA M
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit,//OA O
+ announceSyncType := omit,//OA O
location := omit,//O
cseType := omit,//OA O
pointOfAccess := omit,//OA O
@@ -5557,6 +5578,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?, //M
dynamicAuthorizationConsultationIDs := *,//OA O
+ announceSyncType := *,//OA O
stateTag := *,//OA M
location := *,//O
maxNrOfInstances := *,//OA O
@@ -5648,6 +5670,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,
dynamicAuthorizationConsultationIDs := *, //OA
+ announceSyncType := *,//OA O
locationSource := *, //OA
locationInformationType := *,//OA
locationUpdatePeriod := *, //OA
@@ -5695,7 +5718,7 @@ module OneM2M_Templates {
notificationEvent := omit,
verificationRequest := omit,
subscriptionDeletion := omit,
- subscriptionReference := omit,
+ subscriptionReference := "NotInitialized",
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
@@ -6318,6 +6341,7 @@ module OneM2M_Templates {
expirationTime := omit,//O
link := "NotInitialized",//M
dynamicAuthorizationConsultationIDs := omit, //O
+ announceSyncType := omit,//OA O
location := omit,//O
maxNrOfInstances := omit,//O
maxByteSize := omit,//O
@@ -6351,6 +6375,7 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?, //M NA
dynamicAuthorizationConsultationIDs := *, //OA
+ announceSyncType := *,//OA O
location := *,//O
maxNrOfInstances := *,//O OA
maxByteSize := *,//O OA
@@ -6382,6 +6407,8 @@ module OneM2M_Templates {
labels := *,//MA
expirationTime := ?,//MA M To be double checked SDS-2019-0668R01
link := ?, //M NA
+ announceSyncType := *,//OA O
+ location := *,//O
dataGenerationTime := *,//M OA
content := *,//M OA
sequenceNr := *,//O OA
@@ -6460,6 +6487,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
+ location := omit,//O
dataGenerationTime := {alt_ := "00000101T000000"},//M
content := "AnyValue",//M
sequenceNr := omit,//O
@@ -6483,6 +6511,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
+ location := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
@@ -6504,6 +6533,8 @@ module OneM2M_Templates {
labels := omit,//MA O
expirationTime := omit,//NA M
link := "NotInitialized", //M
+ announceSyncType := omit,//OA O
+ location := omit,//O
dataGenerationTime := omit,//OA M
content := omit,//OA M
sequenceNr := omit,//OA O
@@ -7396,7 +7427,7 @@ module OneM2M_Templates {
triggerEnable := omit, //O
activityPatternElements := omit, //O
enableTimeCompensation := omit,//O
- Trigger_Recipient_ID := omit,//O
+ trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit //NP
@@ -7739,6 +7770,7 @@ module OneM2M_Templates {
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
+ location := omit,//O
stateTag := omit,
creator := omit,
contentInfo := omit,
@@ -7901,6 +7933,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
+ announceSyncType := omit,//O
location := omit,//O
appName := omit,
app_ID := omit,
@@ -7933,6 +7966,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
+ announceSyncType := omit,//O
stateTag := omit,
location := omit,//O
maxNrOfInstances := omit,
@@ -7958,7 +7992,8 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
- memberType := omit,
+ announceSyncType := omit,//O
+ memberType := omit,
specializationType := omit,
currentNrOfMembers := omit,
maxNrOfMembers := omit,
@@ -8056,6 +8091,7 @@ module OneM2M_Templates {
announceTo := omit,
announcedAttribute := omit,
announceSyncType := omit,//O
+ location := omit,//O
dataGenerationTime := omit,
content := omit,
sequenceNr := omit,
@@ -8064,7 +8100,7 @@ module OneM2M_Templates {
};
/**
- * @desc Base primitiveContent for UPDATE operation for TimeSeriesInstance resource
+ * @desc Base primitiveContent for UPDATE operation for Role resource
*/
template (value) Role_optional m_contentUpdateRole := {
resourceName := omit,
@@ -8698,7 +8734,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
- Trigger_Recipient_ID := *,//O
+ trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//O
@@ -8737,7 +8773,7 @@ module OneM2M_Templates {
triggerEnable := omit,//O
activityPatternElements := omit,//O
enableTimeCompensation := omit,//O
- Trigger_Recipient_ID := omit,//O
+ trigger_Recipient_ID := omit,//O
triggerReferenceNumber := omit,//O
externalGroupID := omit,//O
choice := omit//O
@@ -8776,7 +8812,7 @@ module OneM2M_Templates {
triggerEnable := *, //O
activityPatternElements := *, //O
enableTimeCompensation := *,//O
- Trigger_Recipient_ID := *,//O
+ trigger_Recipient_ID := *,//O
triggerReferenceNumber := *,//O
externalGroupID := *,//O
choice := *//O
@@ -8794,6 +8830,7 @@ module OneM2M_Templates {
expirationTime := ?,//M MA
link := ?,//M,
dynamicAuthorizationConsultationIDs := *, //O OA
+ announceSyncType := *,//O
location := omit,//O
appName := *,//O OA
app_ID := *,//M OA
@@ -8827,6 +8864,7 @@ module OneM2M_Templates {
expirationTime := *,//M
link := *,//M,
dynamicAuthorizationConsultationIDs := *, //O
+ announceSyncType := *,//O
location := *,//O
appName := *,//O
app_ID := *,//M
@@ -8977,6 +9015,7 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
+ announceSyncType := *,//O
privileges := ?,//M
selfPrivileges := ?,//M
authorizationDecisionResourceIDs := *,//O
@@ -9122,6 +9161,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
+ announceSyncType := *,//O
memberType := *,//O
specializationType := *,//O
currentNrOfMembers := *,//O
@@ -9666,6 +9706,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
+ location := *,//O
stateTag := ?,//M
creator := *,//O
contentInfo := *,//O
@@ -9694,6 +9735,7 @@ module OneM2M_Templates {
announceTo := omit,//O
announcedAttribute := omit,//O
announceSyncType := omit,//O
+ location := omit,//O
stateTag := omit,//M
creator := omit,//O
contentInfo := omit,//O
@@ -9715,6 +9757,8 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
+ announceSyncType := *,//O
+ location := *,//O
stateTag := *,//O
contentInfo := *,//O
contentSize := *,//O
@@ -9880,6 +9924,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *, //O
+ announceSyncType := *,//O
stateTag := *,//O
location := *,//O
maxNrOfInstances := *,//O
@@ -9897,7 +9942,7 @@ module OneM2M_Templates {
notificationEvent:= omit,
verificationRequest := omit,
subscriptionDeletion := omit,
- subscriptionReference := omit,
+ subscriptionReference := "NotInitialized",
creator := omit,
notificationForwardingURI := omit,
notificationTarget := omit,
@@ -9920,7 +9965,7 @@ module OneM2M_Templates {
notificationEvent := *,
verificationRequest := *,
subscriptionDeletion := *,
- subscriptionReference := *,
+ subscriptionReference := ?,
creator := *,
notificationForwardingURI := *,
notificationTarget := *,
@@ -10138,6 +10183,7 @@ module OneM2M_Templates {
expirationTime := ?,//M
link := ?,//M
dynamicAuthorizationConsultationIDs := *,//O
+ announceSyncType := *,//O
location := *,//O
maxNrOfInstances := *,//O
maxByteSize := *,//O
@@ -10167,6 +10213,7 @@ module OneM2M_Templates {
announceTo := *,//O
announcedAttribute := *,//O
announceSyncType := *,//O
+ location := *,//O
dataGenerationTime := ?,//M
content := ?,//M
sequenceNr := *,//O
@@ -10184,6 +10231,8 @@ module OneM2M_Templates {
labels := *,//O
expirationTime := ?,//M
link := ?,//M
+ announceSyncType := *,//O
+ location := *,//O
dataGenerationTime := *,//O
content := *,//O
sequenceNr := *,//O
diff --git a/LibOneM2M/OneM2M_TypesAndValues.ttcn b/LibOneM2M/OneM2M_TypesAndValues.ttcn
index 7b549822d111b255437ab265a6eeea9929df4270..fc7768704eb96255813c848b28584585c9ce1011 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 {
- DependencyAnnc dependencyAnnc,
+ Dependency dependency,
Subscription subscription,
Transaction transaction
} choice_list
@@ -348,6 +348,7 @@ group OptionalResourceTypes {
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
+ AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges optional,
SetOfAcrs selfPrivileges optional,
ListOfURIs authorizationDecisionResourceIDs optional,
@@ -406,7 +407,7 @@ group OptionalResourceTypes {
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
XSD.Boolean enableTimeCompensation optional,
- TriggerRecipientID Trigger_Recipient_ID optional,
+ TriggerRecipientID trigger_Recipient_ID optional,
XSD.UnsignedInt triggerReferenceNumber optional,
ExternalID externalGroupID optional,
union {
@@ -449,12 +450,14 @@ group OptionalResourceTypes {
//variant (triggerEnable) "text 'false' as '0'";
//variant (enableTimeCompensation) "text 'true' as '1'";
//variant (enableTimeCompensation) "text 'false' as '0'";
+ variant (trigger_Recipient_ID) "name as 'Trigger-Recipient-ID'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
variant (choice.choice_list) "untagged";
variant (choice.choice_list[-]) "untagged";
variant (choice.choice_list[-].group_) "name as 'group'";
+ variant (choice.choice_list[-].action_) "name as 'action'";
};
type record AEAnnc_optional
@@ -470,6 +473,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
@@ -622,6 +626,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition optional,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -650,8 +655,8 @@ group OptionalResourceTypes {
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
- XSD.ID custodian optional,
GeoCoordinates location optional,
+ XSD.ID custodian optional,
XSD.AnyURI containerDefinition optional,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
@@ -766,6 +771,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
@@ -823,6 +829,7 @@ group OptionalResourceTypes {
AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
XSD.ID creator optional,
+ GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
ContentRef contentRef optional,
@@ -860,7 +867,9 @@ group OptionalResourceTypes {
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
ContentInfo contentInfo optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI ontologyRef optional,
@@ -977,6 +986,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions optional,
union {
@@ -1207,6 +1217,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
MemberType memberType optional,
SpecializationType specializationType optional,
XSD.NonNegativeInteger currentNrOfMembers optional,
@@ -1313,6 +1324,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
LocationSource locationSource optional,
LocationInformationType locationInformationType optional,
ListOfDuration locationUpdatePeriod optional,
@@ -1482,6 +1494,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
NodeID nodeID optional,
XSD.ID hostedCSELink optional,
ListOfM2MID hostedAELinks optional,
@@ -1916,6 +1929,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
@@ -2076,6 +2090,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement optional,
XSD.Boolean networkCoordinated optional,
union {
@@ -2159,6 +2174,7 @@ group OptionalResourceTypes {
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional,
XSD.Base64Binary descriptor optional,
@@ -2787,6 +2803,7 @@ type record TriggerRequest_optional
Timestamp expirationTime optional,
XSD.AnyURI link optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
@@ -2838,6 +2855,7 @@ type record TriggerRequest_optional
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
@@ -2874,6 +2892,8 @@ type record TriggerRequest_optional
Labels labels optional,
Timestamp expirationTime optional,
XSD.AnyURI link optional,
+ AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
AbsRelTimestamp dataGenerationTime optional,
XSD.AnySimpleType content optional,
XSD.NonNegativeInteger sequenceNr optional,
diff --git a/LibOneM2M/oneM2M_Types b/LibOneM2M/oneM2M_Types
index 5ef46b0b7c963ae2cc4ab3db94ff36509349d4da..813919f40804131efae3c31165b603861117e363 160000
--- a/LibOneM2M/oneM2M_Types
+++ b/LibOneM2M/oneM2M_Types
@@ -1 +1 @@
-Subproject commit 5ef46b0b7c963ae2cc4ab3db94ff36509349d4da
+Subproject commit 813919f40804131efae3c31165b603861117e363
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 7f28ec28879811e96b73854f208e8b251e49e3eb..519e87eebd8f14ee207edaccf52bdb3259217623 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -9654,8 +9654,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_1"};
- var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
- var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
@@ -9733,8 +9733,8 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
- var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
- var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
@@ -9803,7 +9803,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
- var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
const ResourceType c_containerResourceType := int3;
var AttributeAux v_invalidAttribute;
@@ -9870,7 +9870,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var integer v_childResourceIndex_1 := -1;
- var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
const ResourceType c_containerResourceType := int3;
@@ -10086,8 +10086,8 @@ module OneM2M_PermutationFunctions {
var integer v_childResourceIndex_1 := -1;
var integer v_childResourceIndex_2 := -1;
var Labels v_labels := {"VALUE_0"};
- var ListOfCoordinates v_location_1 := "[2.3514616,48.8566969]";
- var ListOfCoordinates v_location_2 := "[-4.4216366,36.7213028]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location_2 := "[-4.4216366,36.7213028]";
var integer i;
// Test control
@@ -10170,7 +10170,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
- var ListOfCoordinates v_location := "[2.3514616,48.8566969]";
+ var GeoJsonCoordinates v_location := "[2.3514616,48.8566969]";
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -10247,7 +10247,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_createRequest := m_createContainerBase;
var integer v_childResourceIndex := -1;
var Labels v_labels := {"VALUE_0"};
- var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
+ var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
// Test control
if(not(PICS_ACP_SUPPORT)) {
@@ -15618,4 +15618,4 @@ module OneM2M_PermutationFunctions {
}//end group CSE
-}
\ No newline at end of file
+}
diff --git a/OneM2M_Testcases_CSE_Release_4.ttcn b/OneM2M_Testcases_CSE_Release_4.ttcn
index 14e5efd2debec61b36026c90a7fbaad5366a749a..89b9565d9cbbbf828076041c9a6c55e66e0f49f8 100644
--- a/OneM2M_Testcases_CSE_Release_4.ttcn
+++ b/OneM2M_Testcases_CSE_Release_4.ttcn
@@ -5997,7 +5997,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
- var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
+ var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
// Test control
@@ -6067,8 +6067,8 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
- var ListOfCoordinates v_location := "[-4.4216366, 36.7213028]";
- var ListOfCoordinates v_location_1 := "[2.3514616, 48.8566969]";
+ var GeoJsonCoordinates v_location := "[-4.4216366, 36.7213028]";
+ var GeoJsonCoordinates v_location_1 := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template (omit) ListOfURIs uRIList := {"NotInitialized"};
var MsgIn v_response;
@@ -6146,7 +6146,7 @@ module OneM2M_Testcases_CSE_Release_4 {
var integer v_resourceIndex := -1;
var integer v_childResourceIndex := -1;
var template RequestPrimitive v_requestretrievePrimitive;// m_retrieveFilterUsageOption
- var ListOfCoordinates v_location := "[2.3514616, 48.8566969]";
+ var GeoJsonCoordinates v_location := "[2.3514616, 48.8566969]";
var template RequestPrimitive v_createRequest := m_createContainerBase;
var Labels v_labels := {"VALUE_1"};
var template (omit) ListOfURIs uRIList := {"NotInitialized"};