diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 80fbb33f1aa6313a1eb47e5312a1ad42aed64bcf..fbf273c8ef162143da152fa0a11a9c614eddfbc3 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -15,7 +15,7 @@ module OneM2M_Types {
import from XSD all;
-import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type PrimitiveProfileApplicability};//TODO Manually added until XSD files are updated
+import from OneM2M_TypesAndValues {type Resource_2; type ResourceTypeList_1; type PrimitiveContent; type RecordOfDynAuthJWT};//TODO Manually added until XSD files are updated
import from OneM2M_Types_homeDevice {type Battery; type BatteryAnnc};
@@ -31,6 +31,7 @@ type record AccessControlPolicy
Timestamp expirationTime,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
SetOfAcrs privileges,
SetOfAcrs selfPrivileges,
ListOfURIs authorizationDecisionResourceIDs,
@@ -99,6 +100,98 @@ with {
+type record Action
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.PositiveInteger actionPriority optional,
+ XSD.AnyURI subjectResourceID optional,
+ EvalCriteria evalCriteria,
+ EvalMode evalMode,
+ XSD.PositiveInteger evalControlParam optional,
+ ListOfURIs dependencies optional,
+ XSD.AnyURI objectResourceID,
+ RequestPrimitive actionPrimitive,
+ ActionInput input optional,
+ ResponsePrimitive actionResult,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Dependency dependency,
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ 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";
+};
+
+
+type record ActionAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.PositiveInteger actionPriority optional,
+ XSD.AnyURI subjectResourceID optional,
+ EvalCriteria evalCriteria optional,
+ EvalMode evalMode optional,
+ XSD.PositiveInteger evalControlParam optional,
+ ListOfURIs dependencies optional,
+ XSD.AnyURI objectResourceID,
+ RequestPrimitive actionPrimitive,
+ ActionInput input optional,
+ ResponsePrimitive actionResult optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Dependency dependency,
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
type record ActiveCmdhPolicy
{
ResourceName resourceName,
@@ -111,8 +204,10 @@ type record ActiveCmdhPolicy
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -140,6 +235,7 @@ type record AEContactListPerCSE
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.NonNegativeInteger cSE_ID,
ListOfM2MID aE_IDList optional
}
@@ -163,6 +259,7 @@ type record AEContactList
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.NonNegativeInteger numberImpactedCSEs,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -197,8 +294,11 @@ type record AE
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID,
XSD.ID aE_ID,
@@ -215,6 +315,7 @@ type record AE
SessionCapabilities sessionCapabilities optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
+ XSD.Boolean enableTimeCompensation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -232,7 +333,10 @@ type record AE
TriggerRequest triggerRequest,
TransactionMgmt transactionMgmt,
Transaction transaction,
- PrimitveProfile primitiveProfile//TODO Manually added until XSD files are updated
+ E2eQosSession e2eQosSession,
+ TimeSyncBeacon timeSyncBeacon,
+ NwMonitoringReq nwMonitoringReq,
+ PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
@@ -249,6 +353,8 @@ with {
//variant (trackRegistrationPoints) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
+ //variant (enableTimeCompensation) "text 'true' as '1'";
+ //variant (enableTimeCompensation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -271,6 +377,7 @@ type record AEAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ GeoCoordinates location optional,
XSD.String appName optional,
XSD.String app_ID optional,
XSD.ID aE_ID optional,
@@ -308,7 +415,10 @@ type record AEAnnc
CrossResourceSubscription crossResourceSubscription,
TriggerRequest triggerRequest,
TransactionMgmt transactionMgmt,
- Transaction transaction
+ Transaction transaction,
+ E2eQosSession e2eQosSession,
+ NwMonitoringReq nwMonitoringReq,
+ PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
@@ -346,12 +456,20 @@ type record AllJoynApp
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
AllJoynDirection direction,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -387,11 +505,18 @@ type record AllJoynAppAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
AllJoynDirection direction,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -430,12 +555,20 @@ type record AllJoynInterface
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.AnyURI interfaceIntrospectXmlRef,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -473,11 +606,18 @@ type record AllJoynInterfaceAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.AnyURI interfaceIntrospectXmlRef optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -520,12 +660,20 @@ type record AllJoynMethodCall
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.String input optional,
XSD.String callStatus optional,
XSD.String output optional,
@@ -562,11 +710,18 @@ type record AllJoynMethodCallAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -602,12 +757,20 @@ type record AllJoynMethod
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -642,11 +805,18 @@ type record AllJoynMethodAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -684,12 +854,20 @@ type record AllJoynProperty
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.String currentValue,
XSD.String requestedValue optional,
union {
@@ -725,11 +903,18 @@ type record AllJoynPropertyAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -765,12 +950,20 @@ type record AllJoynSvcObject
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.String objectPath,
XSD.Boolean enable,
union {
@@ -809,11 +1002,18 @@ type record AllJoynSvcObjectAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
XSD.String objectPath,
XSD.Boolean enable optional,
union {
@@ -853,8 +1053,10 @@ type record AreaNwkDeviceInfo
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -939,14 +1141,16 @@ type record AreaNwkInfo
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
XSD.String description optional,
XSD.AnyURI mgmtSchema optional,
- XSD.String areaNwkType,
+ AreaNwkType areaNwkType,
ListOfURIs listOfDevices,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -984,7 +1188,7 @@ type record AreaNwkInfoAnnc
ListOfURIs objectPaths optional,
XSD.String description optional,
XSD.AnyURI mgmtSchema optional,
- XSD.String areaNwkType optional,
+ AreaNwkType areaNwkType optional,
ListOfURIs listOfDevices optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -1015,6 +1219,7 @@ type record AuthorizationDecision_1
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
AuthorizationDecision_1 decision optional,
AuthorizationStatus status optional,
XSD.AnyURI to_ optional,
@@ -1065,6 +1270,7 @@ type record AuthorizationInformation
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
AuthorizationStatus status optional,
XSD.ID from_ optional,
record length(1 .. infinity) of RoleID roleIDs optional,
@@ -1106,6 +1312,7 @@ type record AuthorizationPolicy
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
SetOfPermissions policies optional,
AcpCombiningAlgorithm combiningAlgorithm optional,
AuthorizationStatus status optional,
@@ -1143,6 +1350,7 @@ type record BackgroundDataTransfer
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
XSD.PositiveInteger volumePerNode,
XSD.PositiveInteger numberOfNodes,
@@ -1183,8 +1391,10 @@ type record BatteryMgmt //TODO According to XSDs, it should be Battery, but ther
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1259,8 +1469,10 @@ type record CmdhBuffer
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1290,8 +1502,10 @@ type record CmdhDefaults
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1321,8 +1535,10 @@ type record CmdhDefEcValue
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1357,8 +1573,10 @@ type record CmdhEcDefParamValues
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1393,8 +1611,10 @@ type record CmdhLimits
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1441,8 +1661,10 @@ type record CmdhNetworkAccessRules
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1473,8 +1695,10 @@ type record CmdhNwAccessRule
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1507,8 +1731,10 @@ type record CmdhPolicy
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -1833,9 +2059,7 @@ with {
};
-type XSD.String ScheduleEntry (pattern "(((([*]|(([1-5]#(0,1)\d)\-([1-5]#(0,1)\d)))(\/([1-5]#(0,1)\d))#(0,1)|([1-5]#(0,1)\d))\,)#(0,)((([*]|(([1-5]#(0,1)\d)\-([1-5]#(0,1)\d)))(\/([1-5]#(0,1)\d))#(0,1))|([1-5]#(0,1)\d))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))#2((([*]|((1#(0,1)\d|2[0-3])\-(1#(0,1)\d|2[0-3])))(\/1#(0,1)\d|2[0-3])#(0,1)|(1#(0,1)\d|2[0-3]))\,)#(0,)((([*]|((1#(0,1)\d|2[0-3])\-(1#(0,1)\d|2[0-3])))(\/1#(0,1)\d|2[0-3])#(0,1))|(1#(0,1)\d|2[0-3]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])#(0,1)|([1-9]|1\d|2\d|3[01]))\,)#(0,)((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])#(0,1))|([1-9]|1\d|2\d|3[01]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])#(0,1)|([1-9]|1[0-2]))\,)#(0,)((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])#(0,1))|([1-9]|1[0-2]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([0-6])\-([0-6])))(\/[0-6])#(0,1)|([0-6]))\,)#(0,)((([*]|(([0-6])\-([0-6])))(\/[0-6])#(0,1))|([0-6]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1)|([2-9]\d\d\d))\,)#(0,)((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1))|([2-9]\d\d\d))")
-
- //"(([*]|[1-5]#(0,1)\d([,\-\/][1-5]#(0,1)\d)#(0,))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))#2([*]|((1#(0,1)\d|2[0-3])([,\-\/](1#(0,1)\d|2[0-3]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|(([1-9]|1\d|2\d|3[01])([,\-\/]([1-9]|1\d|2\d|3[01]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|(([1-9]|1[0-2])([,\-\/]([1-9]|1[0-2]))#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*]|([0-6]([,\-\/][0-6])#(0,)))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,)([*](/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1))|(([2-9]\d\d\d)([,\-][2-9]\d\d\d[,]#(0,1))#(0,1)([/]\d#(0,1)\d#(0,1)\d#(0,1)\d[,]#(0,1))#(0,1))#(0,)")
+type XSD.String ScheduleEntry (pattern "(((([*]|(([1-5]#(0,1)\d)-([1-5]#(0,1)\d)))(/([1-5]#(0,1)\d))#(0,1)|([1-5]#(0,1)\d)),)#(0,)((([*]|(([1-5]#(0,1)\d)-([1-5]#(0,1)\d)))(/([1-5]#(0,1)\d))#(0,1))|([1-5]#(0,1)\d))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))#(2)(((([*]|((1#(0,1)\d|2[0-3])-(1#(0,1)\d|2[0-3])))(/1#(0,1)\d|2[0-3])#(0,1)|(1#(0,1)\d|2[0-3])),)#(0,)((([*]|((1#(0,1)\d|2[0-3])-(1#(0,1)\d|2[0-3])))(/1#(0,1)\d|2[0-3])#(0,1))|(1#(0,1)\d|2[0-3]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))(((([*]|(([1-9]|1\d|2\d|3[01])-([1-9]|1\d|2\d|3[01])))(/[1-9]|1\d|2\d|3[01])#(0,1)|([1-9]|1\d|2\d|3[01])),)#(0,)((([*]|(([1-9]|1\d|2\d|3[01])-([1-9]|1\d|2\d|3[01])))(/[1-9]|1\d|2\d|3[01])#(0,1))|([1-9]|1\d|2\d|3[01]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))(((([*]|(([1-9]|1[0-2])-([1-9]|1[0-2])))(/[1-9]|1[0-2])#(0,1)|([1-9]|1[0-2])),)#(0,)((([*]|(([1-9]|1[0-2])-([1-9]|1[0-2])))(/[1-9]|1[0-2])#(0,1))|([1-9]|1[0-2]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))(((([*]|(([0-6])-([0-6])))(/[0-6])#(0,1)|([0-6])),)#(0,)((([*]|(([0-6])-([0-6])))(/[0-6])#(0,1))|([0-6]))[\q{0,0,0,32}\q{0,0,0,10}\t\r]#(1,))(((([*]|(([2-9]\d\d\d)-([2-9]\d\d\d)))(/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1)|([2-9]\d\d\d)),)#(0,)((([*]|(([2-9]\d\d\d)-([2-9]\d\d\d)))(/\d#(0,1)\d#(0,1)\d#(0,1)\d)#(0,1))|([2-9]\d\d\d)))")
with {
variant "name as uncapitalized";
};
@@ -1921,13 +2145,13 @@ with {
};
-type XSD.String ReleaseVersion (pattern "(2a|3)") //FIXME All available releases backwards till 2a. XSD will define it as this
+type XSD.String ReleaseVersion (pattern "(2a|3|4)") //FIXME All available releases backwards till 2a. XSD will define it as this
with {
variant "name as uncapitalized";
};
-type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3)") //FIXME All available release backwards. XSD will define it as this
+type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a|3|4)") //FIXME All available release backwards. XSD will define it as this
with {
variant "name as uncapitalized";
};
@@ -1956,6 +2180,44 @@ with {
};
+type XSD.String ListOfCoordinates (pattern "(\[(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])(,(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\]))#(1,)(\]))|(\[[-+]#(0,1)([1-8]#(0,1)\d(.\d#(1,))#(0,1)|90(.0#(1,))#(0,1)),[\q{0,0,0,32}\t]#(0,)[-+]#(0,1)(180(.0#(1,))#(0,1)|((1[0-7]\d)|([1-9]#(0,1)\d))(.\d#(1,))#(0,1))(,\d#(1,))#(0,1)\])")
+with {
+ variant "name as uncapitalized";
+};
+
+
+type XSD.Integer QosLevel (0 .. 100)
+with {
+ variant "name as uncapitalized";
+};
+
+
+type XSD.Integer CongestionLevel (0 .. 31)
+with {
+ variant "name as uncapitalized";
+};
+
+
+type record length(1 .. infinity) of CongestionLevel CongestionLevels
+with {
+ variant "name as uncapitalized";
+ variant "list";
+};
+
+
+type record length(1 .. infinity) of Operation ListOfOperations
+with {
+ variant "name as uncapitalized";
+ variant "list";
+};
+
+
+type XSD.String AreaNwkType (pattern "urn:[a-z0-9][a-z0-9-]#(0,31):[a-z0-9\(\)+,\-.:=@;$_!*'%/?#]+")
+with {
+ variant "name as uncapitalized";
+};
+
+
type record of XSD.AnyURI ResourceList
with {
variant "name as uncapitalized";
@@ -2018,17 +2280,20 @@ type record MetaInformation
DesIdResType desiredIdentifierResultType optional,
record length(1 .. infinity) of RoleID roleIDs optional,
XSD.Boolean tokenRequestIndicator optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,
+ RecordOfDynAuthJWT tokens optional,//TODO Use the RecordOfDynAuthJWT
record length(1 .. infinity) of TokenID tokenIDs optional,
record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
ListOfURIs groupRequestTargetMembers optional,
+ XSD.PositiveInteger groupSomecastTargetNumber optional,
XSD.Boolean authorSignIndicator optional,
SignatureList authorSigns optional,
XSD.Boolean authorRelIndicator optional,
XSD.Boolean semanticQueryIndicator optional,
+ ListOfM2MID ontologyMappingResources optional,
ReleaseVersion releaseVersionIndicator,
XSD.String vendorInformation optional,
- XSD.ID primitiveProfileIdentifier optional//TODO Manually added until XSD files are updated
+ XSD.AnyURI primitiveProfileIdentifier optional,
+ XSD.ID m2mServiceUser optional
}
with {
variant "name as uncapitalized";
@@ -2066,18 +2331,18 @@ type record EventNotificationCriteria
Timestamp expireAfter optional,
XSD.NonNegativeInteger sizeAbove optional,
XSD.PositiveInteger sizeBelow optional,
- record of OperationMonitor operationMonitor_list,
+ record of OperationMonitor operationMonitor_list optional,//TODO: It should be optional
AttributeList_1 attribute optional,
- record length(0 .. 6) of NotificationEventType notificationEventType_list,
+ record length(0 .. 5) of NotificationEventType notificationEventType_list optional,//TODO: It should be optional
record length(1 .. infinity) of ResourceType childResourceType optional,
MissingData missingData optional,
FilterOperation filterOperation optional
}
with {
variant "name as uncapitalized";
- variant (operationMonitor_list) "untagged";
+// variant (operationMonitor_list) "untagged";
variant (operationMonitor_list[-]) "name as 'operationMonitor'";
- variant (notificationEventType_list) "untagged";
+// variant (notificationEventType_list) "untagged";
variant (notificationEventType_list[-]) "name as 'notificationEventType'";
variant (childResourceType) "list";
};
@@ -2113,10 +2378,11 @@ type record FilterCriteria
FilterOperation filterOperation optional,
ContentFilterSyntax contentFilterSyntax optional,
XSD.String contentFilterQuery optional,
- GeoQuery geoQuery optional, //TODO Manually added until XSD files are updated
XSD.PositiveInteger level optional,
XSD.PositiveInteger offset optional,
- XSD.AnyURI applyRelativePath optional
+ XSD.AnyURI applyRelativePath optional,
+ GeoQuery geoQuery optional,
+ AccessControlOperations operations optional
}
with {
variant "name as uncapitalized";
@@ -2365,18 +2631,22 @@ type record AccessControlRule
record length(1 .. infinity) of Ipv4 ipv4Addresses optional,
record length(1 .. infinity) of Ipv6 ipv6Addresses optional
} accessControlIpAddresses optional,
- LocationRegion accessControlLocationRegion optional
- } accessControlContexts_list,
+ LocationRegion accessControlLocationRegion optional,
+ ListOfM2MID accessControlUserIDs optional,
+ EvalCriteria accessControlEvalCriteria optional,
+ XSD.NonNegativeInteger accessControlLimit optional
+ } accessControlContexts_list optional,//TODO It should be optional
XSD.Boolean accessControlAuthenticationFlag optional,
record of record {
ResourceType resourceType optional,
SpecializationType specializationID optional,
record length(1 .. infinity) of ResourceType childResourceType
- } accessControlObjectDetails_list
+ } accessControlObjectDetails_list optional, //TODO It should be optional
+ AttributeList_1 accessControlAttributes optional
}
with {
variant "name as uncapitalized";
- variant (accessControlContexts_list) "untagged";
+// variant (accessControlContexts_list) "untagged";
variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
@@ -2384,7 +2654,7 @@ with {
variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
//variant (accessControlAuthenticationFlag) "text 'true' as '1'";
//variant (accessControlAuthenticationFlag) "text 'false' as '0'";
- variant (accessControlObjectDetails_list) "untagged";
+// variant (accessControlObjectDetails_list) "untagged";
variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
variant (accessControlObjectDetails_list[-].childResourceType) "list";
};
@@ -2724,7 +2994,7 @@ type record DynAuthRelMapRequest
{
XSD.ID originator optional,
record length(1 .. infinity) of TokenID tokenIDs optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,
+ RecordOfDynAuthJWT tokens optional,//TODO Use the RecordOfDynAuthJWT
SignatureList authorSigns optional,
XSD.Boolean authorSignReqInfo optional
}
@@ -2740,7 +3010,7 @@ with {
type record DynAuthRelMapResponse
{
record length(1 .. infinity) of TokenID tokenIDs optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,
+ RecordOfDynAuthJWT tokens optional,//TODO Use the RecordOfDynAuthJWT
XSD.Boolean authorSignReqInfo optional,
SignatureList signature_ optional
}
@@ -2845,123 +3115,300 @@ with {
};
+type record GeoCoordinates
+{
+ GeometryType type_,
+ ListOfCoordinates coordinates
+}
+with {
+ variant "name as uncapitalized";
+ variant (type_) "name as 'type'";
+};
-type record Resource_1
+type record GeoQuery
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional
+ GeometryType geometryType,
+ ListOfCoordinates geometry,
+ GeoSpatialFunctionType geoSpatialFunction
}
with {
- variant "name as 'resource'";
- variant (resourceName) "attribute";
+ variant "name as uncapitalized";
};
-type record RegularResource
+type record E2eQosRequirements
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional
+ record length(1 .. infinity) of record {
+ QosLevel qosLevel,
+ ListOfM2MID resourceIDList optional,
+ ScheduleEntry sessionSchedule optional,
+ XSD.PositiveInteger numOfRequests optional,
+ XSD.PositiveInteger numOfBytes optional
+ } e2eQosRequirement_list
}
with {
variant "name as uncapitalized";
- variant (resourceName) "attribute";
+ variant (e2eQosRequirement_list) "untagged";
+ variant (e2eQosRequirement_list[-]) "name as 'e2eQosRequirement'";
};
-type record AnnounceableResource
+type record E2eQosPolicies
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional
+ record length(1 .. infinity) of record {
+ E2eQosPolicyStatus status,
+ E2eQosAction action_
+ } e2eQosPolicy_list
}
with {
variant "name as uncapitalized";
- variant (resourceName) "attribute";
- variant (announcedAttribute) "list";
+ variant (e2eQosPolicy_list) "untagged";
+ variant (e2eQosPolicy_list[-]) "name as 'e2eQosPolicy'";
+ variant (e2eQosPolicy_list[-].action_) "name as 'action'";
};
-type record AnnouncedResource
+type record SetOfNotificationStatsInfo
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs,
- Timestamp expirationTime,
- XSD.AnyURI link,
- ListOfURIs dynamicAuthorizationConsultationIDs optional
+ record length(1 .. infinity) of record {
+ XSD.AnyURI target,
+ XSD.NonNegativeInteger requestsSent,
+ XSD.NonNegativeInteger responsesReceived
+ } notificationStats_list
}
with {
variant "name as uncapitalized";
- variant (resourceName) "attribute";
+ variant (notificationStats_list) "untagged";
+ variant (notificationStats_list[-]) "name as 'notificationStats'";
};
-type record AnnounceableSubordinateResource
+type record ListOfAttributes
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- Timestamp expirationTime,
- ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional
+ record length(1 .. infinity) of record {
+ XSD.NCName name,
+ XSD.AnySimpleType value_ optional //TODO Use XSD.AnySimpleType instead
+ } attribute_list
}
with {
variant "name as uncapitalized";
- variant (resourceName) "attribute";
- variant (announcedAttribute) "list";
+ variant (attribute_list) "untagged";
+ variant (attribute_list[-]) "name as 'attribute'";
+ variant (attribute_list[-].value_) "name as 'value'";
};
-type record SubordinateResource
+type record EvalCriteria
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- Timestamp expirationTime
+ EvalCriteriaOperator operator,
+ XSD.NCName subject,
+ XSD.AnySimpleType threshold
}
with {
variant "name as uncapitalized";
- variant (resourceName) "attribute";
};
-type record AnnouncedSubordinateResource
+type record ActionInput
+{
+ union {
+ XSD.NCName contentString,
+ XSD.AnyURI resourceID,
+ XSD.AnyURI resourceAttributeID
+ } choice
+}
+with {
+ variant "name as uncapitalized";
+ variant (choice) "untagged";
+};
+
+
+type record ListOfSoftwareTriggerCriteria
+{
+ record length(1 .. infinity) of SoftwareTriggerCriterion softwareTriggerCriterionEntry_list
+}
+with {
+ variant "name as uncapitalized";
+ variant (softwareTriggerCriterionEntry_list) "untagged";
+ variant (softwareTriggerCriterionEntry_list[-]) "name as 'softwareTriggerCriterionEntry'";
+};
+
+
+type record SoftwareTriggerCriterion
+{
+ XSD.AnyURI subjectResourceID,
+ EvalCriteria evalCriteria
+}
+with {
+ variant "name as uncapitalized";
+};
+
+
+type record ListOfActionStatuses
+{
+ record length(1 .. infinity) of ActionStatus actionStatusEntry_list
+}
+with {
+ variant "name as uncapitalized";
+ variant (actionStatusEntry_list) "untagged";
+ variant (actionStatusEntry_list[-]) "name as 'actionStatusEntry'";
+};
+
+
+type record ListOfStateTransitions
+{
+ record length(1 .. infinity) of StateTransition stateTransition_list
+}
+with {
+ variant "name as uncapitalized";
+ variant (stateTransition_list) "untagged";
+ variant (stateTransition_list[-]) "name as 'stateTransition'";
+};
+
+
+type record StateTransition
+{
+ EvalCriteria evalCriteria,
+ XSD.AnyURI nextState
+}
+with {
+ variant "name as uncapitalized";
+};
+
+
+type record ListOfEvalCriteria
+{
+ record length(1 .. infinity) of EvalCriteria evalCriteria_list
+}
+with {
+ variant "name as uncapitalized";
+ variant (evalCriteria_list) "untagged";
+ variant (evalCriteria_list[-]) "name as 'evalCriteria'";
+};
+
+
+
+
+type record Resource_1
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional
+}
+with {
+ variant "name as 'resource'";
+ variant (resourceName) "attribute";
+};
+
+
+type record RegularResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+};
+
+
+type record AnnounceableResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+};
+
+
+type record AnnouncedResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+};
+
+
+type record AnnounceableSubordinateResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ Timestamp expirationTime,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+};
+
+
+type record SubordinateResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ Timestamp expirationTime
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+};
+
+
+type record AnnouncedSubordinateResource
{
ResourceName resourceName,
ResourceType resourceType,
@@ -2991,8 +3438,10 @@ type record MgmtResource
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3054,12 +3503,20 @@ type record FlexContainerResource
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
- XSD.AnyURI nodeLink optional
+ XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional
}
with {
variant "name as uncapitalized";
@@ -3080,11 +3537,36 @@ type record AnnouncedFlexContainerResource
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
- XSD.AnyURI nodeLink optional
+ XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourceName) "attribute";
+};
+
+
+type record FlexContainerInstanceResource
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp expirationTime,
+ Labels labels optional,
+ XSD.NonNegativeInteger contentSize,
+ XSD.ID originator
}
with {
variant "name as uncapitalized";
@@ -3094,6 +3576,14 @@ with {
+type FlexContainerInstanceResource Sg_flexContainerInstanceResource
+with {
+ variant "name as uncapitalized";
+ variant "abstract";
+ variant "element";
+};
+
+
type union Sg_announceableSubordinateResource_group
{
AnnounceableSubordinateResource sg_announceableSubordinateResource,
@@ -3122,6 +3612,88 @@ with {
};
+type union Sg_announceableResource_group
+{
+ AnnounceableResource sg_announceableResource,
+ AE aE,
+ Action action_,
+ Container container,
+ Dependency dependency,
+ Group group_,
+ LocationPolicy locationPolicy,
+ MultimediaSession multimediaSession,
+ Node node,
+ Ontology ontology,
+ OntologyMapping ontologyMapping,
+ OntologyMappingAlgorithm ontologyMappingAlgorithm,
+ OntologyMappingAlgorithmRepository ontologyMappingAlgorithmRepository,
+ OntologyRepository ontologyRepository,
+ PrimitiveProfile primitiveProfile,
+ ProcessManagement processManagement,
+ ReasoningJobInstance reasoningJobInstance,
+ ReasoningRules reasoningRules,
+ RemoteCSE remoteCSE,
+ Schedule schedule,
+ SemanticDescriptor semanticDescriptor,
+ SemanticMashupInstance semanticMashupInstance,
+ SemanticMashupJobProfile semanticMashupJobProfile,
+ SemanticRuleRepository semanticRuleRepository,
+ SoftwareCampaign softwareCampaign,
+ State state,
+ TimeSeries timeSeries,
+ TimeSyncBeacon timeSyncBeacon
+}
+with {
+ variant "untagged";
+ variant (sg_announceableResource) "form as qualified";
+ variant (sg_announceableResource) "abstract";
+ variant (aE) "name as capitalized";
+ variant (action_) "name as 'action'";
+ variant (group_) "name as 'group'";
+};
+
+
+type union Sg_announcedResource_group
+{
+ AnnouncedResource sg_announcedResource,
+ AEAnnc aEAnnc,
+ ActionAnnc actionAnnc,
+ CSEBaseAnnc cSEBaseAnnc,
+ ContainerAnnc containerAnnc,
+ DependencyAnnc dependencyAnnc,
+ GroupAnnc groupAnnc,
+ LocationPolicyAnnc locationPolicyAnnc,
+ MultimediaSessionAnnc multimediaSessionAnnc,
+ NodeAnnc nodeAnnc,
+ OntologyAnnc ontologyAnnc,
+ OntologyMappingAlgorithmAnnc ontologyMappingAlgorithmAnnc,
+ OntologyMappingAlgorithmRepositoryAnnc ontologyMappingAlgorithmRepositoryAnnc,
+ OntologyMappingAnnc ontologyMappingAnnc,
+ OntologyRepositoryAnnc ontologyRepositoryAnnc,
+ PrimitiveProfileAnnc primitiveProfileAnnc,
+ ProcessManagementAnnc processManagementAnnc,
+ ReasoningJobInstanceAnnc reasoningJobInstanceAnnc,
+ ReasoningRulesAnnc reasoningRulesAnnc,
+ RemoteCSEAnnc remoteCSEAnnc,
+ ScheduleAnnc scheduleAnnc,
+ SemanticDescriptorAnnc semanticDescriptorAnnc,
+ SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
+ SemanticMashupJobProfileAnnc semanticMashupJobProfileAnnc,
+ SemanticRuleRepositoryAnnc semanticRuleRepositoryAnnc,
+ SoftwareCampaignAnnc softwareCampaignAnnc,
+ StateAnnc stateAnnc,
+ TimeSeriesAnnc timeSeriesAnnc,
+ TimeSyncBeaconAnnc timeSyncBeaconAnnc
+}
+with {
+ variant "untagged";
+ variant (sg_announcedResource) "form as qualified";
+ variant (sg_announcedResource) "abstract";
+ variant (aEAnnc) "name as capitalized";
+ variant (cSEBaseAnnc) "name as capitalized";
+};
+
+
type union Sg_mgmtResource_group
{
MgmtResource sg_mgmtResource,
@@ -3164,6 +3736,7 @@ type union Sg_regularResource_group
CrossResourceSubscription crossResourceSubscription,
Delivery delivery,
DynamicAuthorizationConsultation dynamicAuthorizationConsultation,
+ E2eQosSession e2eQosSession,
EventConfig eventConfig,
ExecInstance execInstance,
LocalMulticastGroup localMulticastGroup,
@@ -3171,6 +3744,7 @@ type union Sg_regularResource_group
MgmtCmd mgmtCmd,
NotificationTargetMgmtPolicyRef notificationTargetMgmtPolicyRef,
NotificationTargetPolicy notificationTargetPolicy,
+ NwMonitoringReq nwMonitoringReq,
PolicyDeletionRules policyDeletionRules,
Request request,
Role role,
@@ -3178,6 +3752,7 @@ type union Sg_regularResource_group
SemanticMashupResultAnnc semanticMashupResultAnnc,
ServiceSubscribedAppRule serviceSubscribedAppRule,
ServiceSubscribedNode serviceSubscribedNode,
+ ServiceSubscribedUserProfile serviceSubscribedUserProfile,
StatsCollect statsCollect,
StatsConfig statsConfig,
Subscription subscription,
@@ -3195,60 +3770,7 @@ with {
};
-type union Sg_announceableResource_group
-{
- AnnounceableResource sg_announceableResource,
- AE aE,
- Container container,
- Group group_,
- LocationPolicy locationPolicy,
- MultimediaSession multimediaSession,
- Node node,
- Ontology ontology,
- OntologyRepository ontologyRepository,
- RemoteCSE remoteCSE,
- Schedule schedule,
- SemanticDescriptor semanticDescriptor,
- SemanticMashupInstance semanticMashupInstance,
- SemanticMashupJobProfile semanticMashupJobProfile,
- TimeSeries timeSeries
-}
-with {
- variant "untagged";
- variant (sg_announceableResource) "form as qualified";
- variant (sg_announceableResource) "abstract";
- variant (aE) "name as capitalized";
- variant (group_) "name as 'group'";
-};
-
-
-type union Sg_announcedResource_group
-{
- AnnouncedResource sg_announcedResource,
- AEAnnc aEAnnc,
- ContainerAnnc containerAnnc,
- GroupAnnc groupAnnc,
- LocationPolicyAnnc locationPolicyAnnc,
- MultimediaSessionAnnc multimediaSessionAnnc,
- NodeAnnc nodeAnnc,
- OntologyAnnc ontologyAnnc,
- OntologyRepositoryAnnc ontologyRepositoryAnnc,
- RemoteCSEAnnc remoteCSEAnnc,
- ScheduleAnnc scheduleAnnc,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
- SemanticMashupJobProfileAnnc semanticMashupJobProfileAnnc,
- TimeSeriesAnnc timeSeriesAnnc
-}
-with {
- variant "untagged";
- variant (sg_announcedResource) "form as qualified";
- variant (sg_announcedResource) "abstract";
- variant (aEAnnc) "name as capitalized";
-};
-
-
-type union Sg_flexContainerResource_group
+type union Sg_flexContainerResource_group
{
FlexContainerResource sg_flexContainerResource,
AllJoynApp allJoynApp,
@@ -3257,8 +3779,6 @@ type union Sg_flexContainerResource_group
AllJoynMethodCall allJoynMethodCall,
AllJoynProperty allJoynProperty,
AllJoynSvcObject allJoynSvcObject,
- GenericInterworkingOperationInstance genericInterworkingOperationInstance,
- GenericInterworkingService genericInterworkingService,
SvcFwWrapper svcFwWrapper,
SvcObjWrapper svcObjWrapper
}
@@ -3278,8 +3798,6 @@ type union Sg_announcedFlexContainerResource_group
AllJoynMethodCallAnnc allJoynMethodCallAnnc,
AllJoynPropertyAnnc allJoynPropertyAnnc,
AllJoynSvcObjectAnnc allJoynSvcObjectAnnc,
- GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
- GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
SvcFwWrapperAnnc svcFwWrapperAnnc,
SvcObjWrapperAnnc svcObjWrapperAnnc
}
@@ -3348,10 +3866,13 @@ type record Container
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
@@ -3402,6 +3923,7 @@ type record ContainerAnnc
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
XSD.NonNegativeInteger stateTag,
+ GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
@@ -3454,6 +3976,7 @@ type record ContentInstance
Timestamp expirationTime,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
ContentInfo contentInfo optional,
@@ -3461,6 +3984,7 @@ type record ContentInstance
ContentRef contentRef optional,
XSD.AnyURI ontologyRef optional,
XSD.AnySimpleType content,//FIXME Use AnySimpleType instead
+ XSD.PositiveInteger deletionCnt optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -3530,6 +4054,7 @@ type record CrossResourceSubscription
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator,
ListOfURIs regularResourcesAsTarget optional,
ListOfURIs subscriptionResourcesAsTarget optional,
@@ -3539,7 +4064,9 @@ type record CrossResourceSubscription
EventCat notificationEventCat optional,
XSD.PositiveInteger expirationCounter optional,
record of XSD.AnyURI notificationURI,
- XSD.ID subscriberURI optional,
+ XSD.AnyURI subscriberURI optional,
+ XSD.Boolean notificationStatsEnable,
+ SetOfNotificationStatsInfo notificationStatsInfo optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -3554,6 +4081,8 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (notificationURI) "list";
+ //variant (notificationStatsEnable) "text 'true' as '1'";
+ //variant (notificationStatsEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -3578,12 +4107,15 @@ type record CSEBase
PoaList pointOfAccess,
XSD.AnyURI nodeLink optional,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ GeoCoordinates location optional,
Serializations contentSerialization optional,
E2eSecInfo e2eSecInfo optional,
SupportedReleaseVersions supportedReleaseVersions,
+ Timestamp currentTime,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
+ CSEBaseAnnc cSEBaseAnnc,
RemoteCSE remoteCSE,
RemoteCSEAnnc remoteCSEAnnc,
Node node,
@@ -3616,7 +4148,11 @@ type record CSEBase
BackgroundDataTransfer backgroundDataTransfer,
TransactionMgmt transactionMgmt,
Transaction transaction,
- PrimitveProfile primitiveProfile//TODO Manually added until XSD files are updated
+ SemanticRuleRepository semanticRuleRepository,
+ E2eQosSession e2eQosSession,
+ TimeSyncBeacon timeSyncBeacon,
+ NwMonitoringReq nwMonitoringReq,
+ PrimitiveProfile primitiveProfile
} choice_list
} choice optional
}
@@ -3636,6 +4172,53 @@ with {
};
+type record CSEBaseAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ E2eSecInfo e2eSecInfo optional,
+ SupportedReleaseVersions supportedReleaseVersions,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ RemoteCSEAnnc remoteCSEAnnc,
+ NodeAnnc nodeAnnc,
+ ContainerAnnc containerAnnc,
+ GroupAnnc groupAnnc,
+ AccessControlPolicyAnnc accessControlPolicyAnnc,
+ TimeSeriesAnnc timeSeriesAnnc,
+ LocationPolicyAnnc locationPolicyAnnc,
+ AEAnnc aEAnnc,
+ Sg_announcedFlexContainerResource_group sg_announcedFlexContainerResource,
+ OntologyRepositoryAnnc ontologyRepositoryAnnc,
+ SemanticMashupJobProfileAnnc semanticMashupJobProfileAnnc,
+ SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
+ TimeSyncBeaconAnnc timeSyncBeaconAnnc,
+ PrimitiveProfileAnnc primitiveProfileAnnc
+ } choice_list
+ } choice optional
+}
+with {
+ variant "element";
+ variant (resourceName) "attribute";
+ 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[-].aEAnnc) "name as capitalized";
+};
+
+
type record Delivery
{
ResourceName resourceName,
@@ -3648,6 +4231,7 @@ type record Delivery
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID source,
XSD.ID target,
Timestamp lifespan,
@@ -3673,6 +4257,86 @@ with {
};
+type record Dependency
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.Boolean sufficient,
+ EvalCriteria evalCriteria,
+ XSD.AnyURI referencedResourceID,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ //variant (sufficient) "text 'true' as '1'";
+ //variant (sufficient) "text 'false' as '0'";
+ 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";
+};
+
+
+type record DependencyAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.Boolean sufficient optional,
+ EvalCriteria evalCriteria optional,
+ XSD.AnyURI referencedResourceID,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ //variant (sufficient) "text 'true' as '1'";
+ //variant (sufficient) "text 'false' as '0'";
+ 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";
+};
+
+
type record DeviceCapability
{
ResourceName resourceName,
@@ -3685,8 +4349,10 @@ type record DeviceCapability
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3785,8 +4451,10 @@ type record DeviceInfo
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -3893,6 +4561,7 @@ type record DynamicAuthorizationConsultation
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.Boolean dynamicAuthorizationEnabled,
PoaList dynamicAuthorizationPoA,
Timestamp dynamicAuthorizationLifetime optional,
@@ -3918,6 +4587,43 @@ with {
};
+type record E2eQosSession
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfM2MID sessionEndpoints,
+ E2eQosRequirements e2eQosRequirements,
+ E2eQosPolicies e2eQosPolicies optional,
+ E2eQosStatus e2eQosStatus,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
type enumerated ResourceType
{
int1(1),
@@ -3970,12 +4676,28 @@ type enumerated ResourceType
int49(49),
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
+ int52(52),
+ int53(53),
+ int54(54),
+ int55(55),
+ int56(56),
+ int57(57),
+ int58(58),
+ int59(59),
+ int60(60),
+ int61(61),
+ int62(62),
+ int63(63),
+ int64(64),
+ int65(65),
+ int66(66),
+ int67(67),
+ int68(68),
int10001(10001),
int10002(10002),
int10003(10003),
int10004(10004),
+ int10005(10005),
int10009(10009),
int10010(10010),
int10013(10013),
@@ -3986,12 +4708,24 @@ type enumerated ResourceType
int10028(10028),
int10029(10029),
int10030(10030),
- int10034(10034),
int10038(10038),
int10039(10039),
int10040(10040),
int10041(10041),
- int10042(10042)
+ int10042(10042),
+ int10052(10052),
+ int10053(10053),
+ int10054(10054),
+ int10055(10055),
+ int10056(10056),
+ int10057(10057),
+ int10060(10060),
+ int10062(10062),
+ int10063(10063),
+ int10064(10064),
+ int10065(10065),
+ int10066(10066),
+ int10068(10068)
}
with {
variant "useNumber";
@@ -4010,12 +4744,6 @@ with {
variant "name as uncapitalized";
};
- //TODO To be removed/replaced by the type defined in XSDs
-type enumerated ServiceSubscriptionStatus
-{
- active(1),
- inactive(2)
-}
type enumerated LocationSource
{
@@ -4082,7 +4810,8 @@ type enumerated ResultContent
int8(8),
int9(9),
int10(10),
- int11(11) //TODO Manually added until XSD files are updated
+ int11(11),
+ int12(12)
}
with {
variant "useNumber";
@@ -4144,6 +4873,20 @@ type enumerated ResponseStatusCode
int4126(4126),
int4127(4127),
int4128(4128),
+ int4130(4130),
+ int4131(4131),
+ int4132(4132),
+ int4133(4133),
+ int4134(4134),
+ int4135(4135),
+ int4136(4136),
+ int4137(4137),
+ int4138(4138),
+ int4139(4139),
+ int4140(4140),
+ int4141(4141),
+ int4142(4142),
+ int4143(4143),
int5000(5000),
int5001(5001),
int5103(5103),
@@ -4169,6 +4912,9 @@ type enumerated ResponseStatusCode
int5220(5220),
int5221(5221),
int5222(5222),
+ int5230(5230),
+ int5231(5231),
+ int5232(5232),
int6003(6003),
int6005(6005),
int6010(6010),
@@ -4182,7 +4928,9 @@ type enumerated ResponseStatusCode
int6028(6028),
int6029(6029),
int6030(6030),
- int6031(6031)
+ int6031(6031),
+ int6033(6033),
+ int6034(6034)
}
with {
variant "useNumber";
@@ -4256,7 +5004,23 @@ type enumerated MemberType
int49(49),
int50(50),
int51(51),
- int59(59), // TODO primitive profile - Manually added until XSD files are updated
+ int52(52),
+ int53(53),
+ int54(54),
+ int55(55),
+ int56(56),
+ int57(57),
+ int58(58),
+ int59(59),
+ int60(60),
+ int61(61),
+ int62(62),
+ int63(63),
+ int64(64),
+ int65(65),
+ int66(66),
+ int67(67),
+ int68(68),
int10001(10001),
int10002(10002),
int10003(10003),
@@ -4271,13 +5035,25 @@ type enumerated MemberType
int10028(10028),
int10029(10029),
int10030(10030),
- int10034(10034),
int10038(10038),
int10039(10039),
int10040(10040),
int10041(10041),
int10042(10042),
int10046(10046),
+ int10052(10052),
+ int10053(10053),
+ int10054(10054),
+ int10055(10055),
+ int10056(10056),
+ int10057(10057),
+ int10060(10060),
+ int10062(10062),
+ int10063(10063),
+ int10064(10064),
+ int10065(10065),
+ int10066(10066),
+ int10068(10068),
int20001(20001),
int20002(20002),
int20003(20003)
@@ -4399,7 +5175,8 @@ type enumerated NotificationContentType
int1(1),
int2(2),
int3(3),
- int4(4)
+ int4(4),
+ int5(5)
}
with {
variant "useNumber";
@@ -4415,7 +5192,8 @@ type enumerated NotificationEventType
int4(4),
int5(5),
int6(6),
- int7(7)
+ int7(7),
+ int8(8)
}
with {
variant "useNumber";
@@ -4640,7 +5418,7 @@ type enumerated FilterUsage
int1(1),
int2(2),
int3(3),
- int4(4) //TODO Manually added until XSD files are updated
+ int4(4)
}
with {
variant "useNumber";
@@ -4675,7 +5453,8 @@ with {
type enumerated FilterOperation
{
int1(1),
- int2(2)
+ int2(2),
+ int3(3)
}
with {
variant "useNumber";
@@ -5060,40 +5839,735 @@ with {
};
-type record EventConfig
+type enumerated NodeType
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.ID creator optional,
- XSD.String eventID,
- EventType eventType,
- Timestamp eventStart optional,
- Timestamp eventEnd optional,
- record of Operation operationType optional,
- XSD.NonNegativeInteger dataSize optional,
- ResourceTypeList eventResourceTypes optional,
- ListOfURIs eventResourceIDs optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- Subscription subscription,
- Transaction transaction
- } choice_list
+ int0(0),
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated OntologyMappingPolicy
+{
+ int1(1),
+ int2(2),
+ int3(3)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated OntologyMappingAlgorithmType
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated GeometryType
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated GeoSpatialFunctionType
+{
+ int1(1),
+ int2(2),
+ int3(3)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ReasoningType
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ReasoningJobWorkingMode
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ReasoningRuleFormat
+{
+ int1(1)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated SomecastAlgorithm
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated E2eQosStatus
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated E2eQosPolicyStatus
+{
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated E2eQosAction
+{
+ int1(1),
+ int2(2),
+ int3(3)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated BeaconCriteria
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated AnnounceSyncType
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated MonitorEnable
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated MonitorStatus
+{
+ int0(0),
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated FailureReason
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6),
+ int7(7),
+ int8(8),
+ int9(9),
+ int10(10)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated PrimitiveProfileApplicability
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6),
+ int7(7)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated EvalCriteriaOperator
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated EvalMode
+{
+ int0(0),
+ int1(1),
+ int2(2),
+ int3(3)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ServiceSubscriptionStatus
+{
+ int1(1),
+ int2(2)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated SoftwareOperation
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ProcessStatus
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type enumerated ProcessControl
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4)
+}
+with {
+ variant "useNumber";
+ variant "name as uncapitalized";
+};
+
+
+type record EventConfig
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ XSD.ID creator optional,
+ XSD.String eventID,
+ EventType eventType,
+ Timestamp eventStart optional,
+ Timestamp eventEnd optional,
+ record of Operation operationType optional,
+ XSD.NonNegativeInteger dataSize optional,
+ ResourceTypeList eventResourceTypes optional,
+ ListOfURIs eventResourceIDs optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (operationType) "list";
+ 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";
+};
+
+
+type record EventLog
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ MgmtDefinition mgmtDefinition,
+ ListOfURIs objectIDs optional,
+ ListOfURIs objectPaths optional,
+ XSD.String description optional,
+ XSD.AnyURI mgmtSchema optional,
+ LogTypeId logTypeId,
+ XSD.String logData,
+ LogStatus logStatus,
+ XSD.Boolean logStart,
+ XSD.Boolean logStop,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of Subscription subscription_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ //variant (logStart) "text 'true' as '1'";
+ //variant (logStart) "text 'false' as '0'";
+ //variant (logStop) "text 'true' as '1'";
+ //variant (logStop) "text 'false' as '0'";
+ variant (choice) "untagged";
+ variant (choice.childResource_list) "untagged";
+ variant (choice.childResource_list[-]) "name as 'childResource'";
+ variant (choice.subscription_list) "untagged";
+ variant (choice.subscription_list[-]) "name as 'subscription'";
+};
+
+
+type record EventLogAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ MgmtDefinition mgmtDefinition,
+ ListOfURIs objectIDs optional,
+ ListOfURIs objectPaths optional,
+ XSD.String description optional,
+ XSD.AnyURI mgmtSchema optional,
+ LogTypeId logTypeId optional,
+ XSD.String logData optional,
+ LogStatus logStatus optional,
+ XSD.Boolean logStart optional,
+ XSD.Boolean logStop optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of Subscription subscription_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ //variant (logStart) "text 'true' as '1'";
+ //variant (logStart) "text 'false' as '0'";
+ //variant (logStop) "text 'true' as '1'";
+ //variant (logStop) "text 'false' as '0'";
+ variant (choice) "untagged";
+ variant (choice.childResource_list) "untagged";
+ variant (choice.childResource_list[-]) "name as 'childResource'";
+ variant (choice.subscription_list) "untagged";
+ variant (choice.subscription_list[-]) "name as 'subscription'";
+};
+
+
+type record ExecInstance
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ExecStatusType execStatus,
+ ExecResultType execResult,
+ XSD.Boolean execDisable optional,
+ NodeID execTarget,
+ ExecModeType execMode optional,
+ XSD.Duration execFrequency optional,
+ XSD.Duration execDelay optional,
+ XSD.NonNegativeInteger execNumber optional,
+ ExecReqArgsListType execReqArgs optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ //variant (execDisable) "text 'true' as '1'";
+ //variant (execDisable) "text 'false' as '0'";
+ 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";
+};
+
+
+type record Firmware
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ MgmtDefinition mgmtDefinition,
+ ListOfURIs objectIDs optional,
+ ListOfURIs objectPaths optional,
+ XSD.String description optional,
+ XSD.AnyURI mgmtSchema optional,
+ XSD.String version,
+ XSD.String firmwareName,
+ XSD.AnyURI uRL,
+ XSD.Boolean update,
+ ActionStatus updateStatus,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of Subscription subscription_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ variant (uRL) "name as capitalized";
+ //variant (update) "text 'true' as '1'";
+ //variant (update) "text 'false' as '0'";
+ variant (choice) "untagged";
+ variant (choice.childResource_list) "untagged";
+ variant (choice.childResource_list[-]) "name as 'childResource'";
+ variant (choice.subscription_list) "untagged";
+ variant (choice.subscription_list[-]) "name as 'subscription'";
+};
+
+
+type record FirmwareAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ MgmtDefinition mgmtDefinition,
+ ListOfURIs objectIDs optional,
+ ListOfURIs objectPaths optional,
+ XSD.String description optional,
+ XSD.AnyURI mgmtSchema optional,
+ XSD.String version optional,
+ XSD.String firmwareName optional,
+ XSD.AnyURI uRL optional,
+ XSD.Boolean update optional,
+ ActionStatus updateStatus optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of Subscription subscription_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (uRL) "name as capitalized";
+ //variant (update) "text 'true' as '1'";
+ //variant (update) "text 'false' as '0'";
+ variant (choice) "untagged";
+ variant (choice.childResource_list) "untagged";
+ variant (choice.childResource_list[-]) "name as 'childResource'";
+ variant (choice.subscription_list) "untagged";
+ variant (choice.subscription_list[-]) "name as 'subscription'";
+};
+
+
+type record Group
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID creator optional,
+ MemberType memberType,
+ SpecializationType specializationType optional,
+ XSD.NonNegativeInteger currentNrOfMembers,
+ XSD.PositiveInteger maxNrOfMembers,
+ record of XSD.AnyURI memberIDs,
+ ListOfURIs membersAccessControlPolicyIDs optional,
+ XSD.Boolean memberTypeValidated optional,
+ ConsistencyStrategy consistencyStrategy optional,
+ XSD.String groupName optional,
+ XSD.Boolean semanticSupportIndicator optional,
+ BatchNotify notifyAggregation optional,
+ XSD.Boolean somecastEnable,
+ SomecastAlgorithm somecastAlgorithm optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ SemanticDescriptor semanticDescriptor,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ variant (memberIDs) "list";
+ //variant (memberTypeValidated) "text 'true' as '1'";
+ //variant (memberTypeValidated) "text 'false' as '0'";
+ //variant (semanticSupportIndicator) "text 'true' as '1'";
+ //variant (semanticSupportIndicator) "text 'false' as '0'";
+ //variant (somecastEnable) "text 'true' as '1'";
+ //variant (somecastEnable) "text 'false' as '0'";
+ 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";
+};
+
+
+type record GroupAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ MemberType memberType optional,
+ SpecializationType specializationType optional,
+ XSD.NonNegativeInteger currentNrOfMembers optional,
+ XSD.PositiveInteger maxNrOfMembers optional,
+ record of XSD.AnyURI memberIDs optional,
+ ListOfURIs membersAccessControlPolicyIDs optional,
+ XSD.Boolean memberTypeValidated optional,
+ ConsistencyStrategy consistencyStrategy optional,
+ XSD.String groupName optional,
+ XSD.Boolean semanticSupportIndicator optional,
+ BatchNotify notifyAggregation optional,
+ XSD.Boolean somecastEnable optional,
+ SomecastAlgorithm somecastAlgorithm optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ SemanticDescriptor semanticDescriptor,
+ SemanticDescriptorAnnc semanticDescriptorAnnc,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (memberIDs) "list";
+ //variant (memberTypeValidated) "text 'true' as '1'";
+ //variant (memberTypeValidated) "text 'false' as '0'";
+ //variant (semanticSupportIndicator) "text 'true' as '1'";
+ //variant (semanticSupportIndicator) "text 'false' as '0'";
+ //variant (somecastEnable) "text 'true' as '1'";
+ //variant (somecastEnable) "text 'false' as '0'";
+ 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";
+};
+
+
+
+
+
+
+type record LocalMulticastGroup
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ExternalID externalGroupID optional,
+ IpAddress multicastAddress,
+ XSD.AnyURI multicastGroupFanoutTarget,
+ ListOfURIs memberList,
+ XSD.AnyURI responseTarget,
+ XSD.Duration responseTimeWindow optional,
+ TMGI tMGI optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ record length(0 .. 1) of enumerated { NULL_ } choice
+ } choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (operationType) "list";
+ variant (tMGI) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5102,7 +6576,106 @@ with {
};
-type record EventLog
+type record LocationPolicy
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ LocationSource locationSource,
+ LocationInformationType locationInformationType,
+ ListOfDuration locationUpdatePeriod optional,
+ LocationTargetID locationTargetID optional,
+ XSD.AnyURI locationServer optional,
+ XSD.AnyURI locationContainerID,
+ XSD.String locationContainerName optional,
+ XSD.String locationStatus,
+ XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+ GeofenceEventCriteria geofenceEventCriteria optional,
+ ExternalID authID optional,
+ XSD.Boolean retrieveLastKnownLocation optional,
+ LocationUpdateEventCriteria locationUpdateEventCriteria optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ //variant (retrieveLastKnownLocation) "text 'true' as '1'";
+ //variant (retrieveLastKnownLocation) "text 'false' as '0'";
+ 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";
+};
+
+
+type record LocationPolicyAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ LocationSource locationSource optional,
+ LocationInformationType locationInformationType optional,
+ ListOfDuration locationUpdatePeriod optional,
+ LocationTargetID locationTargetID optional,
+ XSD.AnyURI locationServer optional,
+ XSD.AnyURI locationContainerID optional,
+ XSD.String locationContainerName optional,
+ XSD.String locationStatus optional,
+ XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
+ GeofenceEventCriteria geofenceEventCriteria optional,
+ ExternalID authID optional,
+ XSD.Boolean retrieveLastKnownLocation optional,
+ LocationUpdateEventCriteria locationUpdateEventCriteria optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ //variant (retrieveLastKnownLocation) "text 'true' as '1'";
+ //variant (retrieveLastKnownLocation) "text 'false' as '0'";
+ 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";
+};
+
+
+type record M2mServiceSubscriptionProfile
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5114,18 +6687,80 @@ type record EventLog
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ XSD.ID m2M_Sub_ID,
+ XSD.ID m2M_SS_ID optional,
+ ServiceSubscriptionStatus status,
+ XSD.Boolean activate_,
+ Timestamp activationTime optional,
+ Timestamp deactivationTime optional,
+ XSD.Duration serviceSubscriptionDuration optional,
+ XSD.NonNegativeInteger currentNumAEs,
+ XSD.NonNegativeInteger maxNumAEs optional,
+ XSD.NonNegativeInteger currentNumNodes,
+ XSD.NonNegativeInteger maxNumNodes optional,
+ XSD.NonNegativeInteger maxNumBytes optional,
+ XSD.NonNegativeInteger maxNumUsers optional,
+ XSD.NonNegativeInteger maxRequestRate optional,
+ XSD.NonNegativeInteger maxNumContainers optional,
+ XSD.NonNegativeInteger maxNumInstancesPerContainer optional,
+ XSD.NonNegativeInteger maxNumTimeSeries optional,
+ XSD.NonNegativeInteger maxNumInstancesPerTimeSeries optional,
+ XSD.NonNegativeInteger maxMembersPerGroup optional,
+ XSD.NonNegativeInteger maxNotificationRate optional,
+ XSD.NonNegativeInteger maxNumFlexContainers optional,
+ XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
+ SetOfAcrs defaultAccessControlPrivileges optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ ServiceSubscribedNode serviceSubscribedNode,
+ Subscription subscription,
+ Transaction transaction,
+ ServiceSubscribedUserProfile serviceSubscribedUserProfile
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (m2M_Sub_ID) "name as 'M2M-Sub-ID'";
+ variant (m2M_SS_ID) "name as 'M2M-SS-ID'";
+ variant (activate_) "name as 'activate'";
+ //variant (activate_) "text 'true' as '1'";
+ //variant (activate_) "text 'false' as '0'";
+ 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";
+};
+
+
+type record Memory
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
XSD.String description optional,
XSD.AnyURI mgmtSchema optional,
- LogTypeId logTypeId,
- XSD.String logData,
- LogStatus logStatus,
- XSD.Boolean logStart,
- XSD.Boolean logStop,
+ XSD.UnsignedLong memAvailable,
+ XSD.UnsignedLong memTotal,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
@@ -5136,10 +6771,6 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
- //variant (logStart) "text 'true' as '1'";
- //variant (logStart) "text 'false' as '0'";
- //variant (logStop) "text 'true' as '1'";
- //variant (logStop) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5148,7 +6779,7 @@ with {
};
-type record EventLogAnnc
+type record MemoryAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5166,11 +6797,8 @@ type record EventLogAnnc
ListOfURIs objectPaths optional,
XSD.String description optional,
XSD.AnyURI mgmtSchema optional,
- LogTypeId logTypeId optional,
- XSD.String logData optional,
- LogStatus logStatus optional,
- XSD.Boolean logStart optional,
- XSD.Boolean logStop optional,
+ XSD.UnsignedLong memAvailable optional,
+ XSD.UnsignedLong memTotal optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of Subscription subscription_list
@@ -5180,10 +6808,6 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- //variant (logStart) "text 'true' as '1'";
- //variant (logStart) "text 'false' as '0'";
- //variant (logStop) "text 'true' as '1'";
- //variant (logStop) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5192,7 +6816,7 @@ with {
};
-type record ExecInstance
+type record MgmtCmd
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5204,29 +6828,31 @@ type record ExecInstance
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ExecStatusType execStatus,
- ExecResultType execResult,
- XSD.Boolean execDisable optional,
+ XSD.ID custodian optional,
+ XSD.String description optional,
+ CmdType cmdType,
+ ExecReqArgsListType execReqArgs optional,
+ XSD.Boolean execEnable,
NodeID execTarget,
ExecModeType execMode optional,
XSD.Duration execFrequency optional,
XSD.Duration execDelay optional,
XSD.NonNegativeInteger execNumber optional,
- ExecReqArgsListType execReqArgs optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
+ ExecInstance execInstance,
Subscription subscription,
Transaction transaction
} choice_list
- } choice optional
+ } choice
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- //variant (execDisable) "text 'true' as '1'";
- //variant (execDisable) "text 'false' as '0'";
+ //variant (execEnable) "text 'true' as '1'";
+ //variant (execEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5235,7 +6861,7 @@ with {
};
-type record Firmware
+type record MultimediaSession
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5247,21 +6873,20 @@ type record Firmware
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- MgmtDefinition mgmtDefinition,
- ListOfURIs objectIDs optional,
- ListOfURIs objectPaths optional,
- XSD.String description optional,
- XSD.AnyURI mgmtSchema optional,
- XSD.String version,
- XSD.String firmwareName,
- XSD.AnyURI uRL,
- XSD.Boolean update,
- ActionStatus updateStatus,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID sessionOriginatorID,
+ SessionDescriptions acceptedSessionDescriptions,
+ SessionDescriptions offeredSessionDescriptions,
+ SessionState sessionState,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
} choice optional
}
with {
@@ -5269,18 +6894,15 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
- variant (uRL) "name as capitalized";
- //variant (update) "text 'true' as '1'";
- //variant (update) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
-type record FirmwareAnnc
+type record MultimediaSessionAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5293,67 +6915,72 @@ type record FirmwareAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- MgmtDefinition mgmtDefinition,
- ListOfURIs objectIDs optional,
- ListOfURIs objectPaths optional,
- XSD.String description optional,
- XSD.AnyURI mgmtSchema optional,
- XSD.String version optional,
- XSD.String firmwareName optional,
- XSD.AnyURI uRL optional,
- XSD.Boolean update optional,
- ActionStatus updateStatus optional,
+ XSD.ID sessionOriginatorID,
+ SessionDescriptions acceptedSessionDescriptions,
+ SessionState sessionState,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (uRL) "name as capitalized";
- //variant (update) "text 'true' as '1'";
- //variant (update) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
-type record GenericInterworkingOperationInstance
+type record Node
{
ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime optional,
+ Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
- ListOfNCNames announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize,
- XSD.AnyURI nodeLink optional,
- XSD.String operationName,
- XSD.String operationState,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- ListOfDataLinks inputLinks optional,
- ListOfDataLinks outputLinks optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ NodeID nodeID,
+ NodeType nodeType optional,
+ XSD.ID hostedCSELink optional,
+ ListOfM2MID hostedAELinks optional,
+ ListOfM2MID hostedServiceLinks optional,
+ XSD.String mgmtClientAddress optional,
+ XSD.Boolean roamingStatus optional,
+ XSD.String networkID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
+ Memory memory,
+ Battery battery,
+ AreaNwkInfo areaNwkInfo,
+ AreaNwkDeviceInfo areaNwkDeviceInfo,
+ Firmware firmware,
+ Software software,
+ DeviceInfo deviceInfo,
+ DeviceCapability deviceCapability,
+ Reboot reboot,
+ EventLog eventLog,
+ CmdhPolicy cmdhPolicy,
+ ActiveCmdhPolicy activeCmdhPolicy,
+ Subscription subscription,
SemanticDescriptor semanticDescriptor,
- Subscription subscription
+ Transaction transaction,
+ Schedule schedule
} choice_list
} choice optional
}
@@ -5361,6 +6988,9 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ //variant (roamingStatus) "text 'true' as '1'";
+ //variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5369,36 +6999,44 @@ with {
};
-type record GenericInterworkingOperationInstanceAnnc
+type record NodeAnnc
{
ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
Labels labels optional,
AcpType accessControlPolicyIDs,
- Timestamp expirationTime optional,
+ Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize optional,
- XSD.AnyURI nodeLink optional,
- XSD.String operationName optional,
- XSD.String operationState optional,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
- ListOfDataLinks inputLinks optional,
- ListOfDataLinks outputLinks optional,
+ NodeID nodeID,
+ XSD.ID hostedCSELink optional,
+ ListOfM2MID hostedAELinks optional,
+ ListOfM2MID hostedServiceLinks optional,
+ XSD.String mgmtClientAddress optional,
+ XSD.Boolean roamingStatus optional,
+ XSD.String networkID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
+ MemoryAnnc memoryAnnc,
+ BatteryAnnc batteryAnnc,
+ AreaNwkInfoAnnc areaNwkInfoAnnc,
+ AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
+ FirmwareAnnc firmwareAnnc,
+ SoftwareAnnc softwareAnnc,
+ DeviceInfoAnnc deviceInfoAnnc,
+ DeviceCapabilityAnnc deviceCapabilityAnnc,
+ RebootAnnc rebootAnnc,
+ EventLogAnnc eventLogAnnc,
+ Subscription subscription,
SemanticDescriptor semanticDescriptor,
SemanticDescriptorAnnc semanticDescriptorAnnc,
- Subscription subscription
+ Transaction transaction,
+ Schedule schedule
} choice_list
} choice optional
}
@@ -5406,6 +7044,8 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ //variant (roamingStatus) "text 'true' as '1'";
+ //variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5414,36 +7054,26 @@ with {
};
-type record GenericInterworkingService
+type record NotificationTargetMgmtPolicyRef
{
ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
Labels labels optional,
AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime optional,
+ Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- ListOfNCNames announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize,
- XSD.AnyURI nodeLink optional,
- XSD.String serviceName,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
+ XSD.ID custodian optional,
+ ListOfURIs notificationTargetURI optional,
+ XSD.AnyURI notificationlPolicyID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record of union {
- GenericInterworkingService genericInterworkingService,
- GenericInterworkingOperationInstance genericInterworkingOperationInstance,
- SemanticDescriptor semanticDescriptor,
- Subscription subscription
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
} choice_list
} choice optional
}
@@ -5459,35 +7089,29 @@ with {
};
-type record GenericInterworkingServiceAnnc
+type record NotificationTargetPolicy
{
ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
- Timestamp creationTime optional,
- Timestamp lastModifiedTime optional,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs,
- Timestamp expirationTime optional,
- XSD.AnyURI link,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag optional,
- XSD.AnyURI containerDefinition,
- XSD.AnyURI ontologyRef optional,
- XSD.NonNegativeInteger contentSize optional,
- XSD.AnyURI nodeLink optional,
- XSD.String serviceName,
- ListOfDataLinks inputDataPointLinks optional,
- ListOfDataLinks outputDataPointLinks optional,
+ XSD.ID custodian optional,
+ XSD.ID creator optional,
+ NotificationTargetPolicyAction action_,
+ XSD.Token policyLabel,
+ LogicalOperator rulesRelationship optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record of union {
- GenericInterworkingServiceAnnc genericInterworkingServiceAnnc,
- GenericInterworkingOperationInstanceAnnc genericInterworkingOperationInstanceAnnc,
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- Subscription subscription
+ record length(1 .. infinity) of union {
+ PolicyDeletionRules policyDeletionRules,
+ Subscription subscription,
+ Transaction transaction
} choice_list
} choice optional
}
@@ -5495,6 +7119,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (action_) "name as 'action'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5503,115 +7128,154 @@ with {
};
-type record Group
+type Notification_1 Notification
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
+type AggregatedNotification_1 AggregatedNotification
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
+type record AggregatedNotification_1
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs optional,
- Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ record of Notification notification_list
+}
+with {
+ variant "name as 'aggregatedNotification'";
+ variant (notification_list) "untagged";
+ variant (notification_list[-]) "name as 'notification'";
+};
+
+type record Notification_1
+{
+ record {
+ Representation representation optional,
+ record {
+ Operation operation optional,
+ XSD.ID originator optional
+ } operationMonitor optional,
+ NotificationEventType notificationEventType
+ } notificationEvent optional,
+ XSD.Boolean verificationRequest optional,
+ XSD.Boolean subscriptionDeletion optional,
+ XSD.AnyURI subscriptionReference optional,
XSD.ID creator optional,
- MemberType memberType,
- SpecializationType specializationType optional,
- XSD.NonNegativeInteger currentNrOfMembers,
- XSD.PositiveInteger maxNrOfMembers,
- record length(0 .. infinity) of XSD.AnyURI memberIDs,//TODO A list that can be empty as defined in TS-0004,
- ListOfURIs membersAccessControlPolicyIDs optional,
- XSD.Boolean memberTypeValidated optional,
- ConsistencyStrategy consistencyStrategy optional,
- XSD.String groupName optional,
- XSD.Boolean semanticSupportIndicator optional,
- BatchNotify notifyAggregation optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- Subscription subscription,
- SemanticDescriptor semanticDescriptor,
- Transaction transaction
- } choice_list
- } choice optional
+ XSD.AnyURI notificationForwardingURI optional,
+ XSD.ID notificationTarget optional,
+ XSD.Boolean targetRemovalRequest optional,
+ XSD.Boolean targetRemovalAllowance optional,
+ record {
+ XSD.ID originator,
+ FilterCriteria filterCriteria
+ } iPEDiscoveryRequest optional,
+ XSD.Boolean aERegistrationPointChange optional,
+ XSD.Boolean aEReferenceIDChange optional,
+ XSD.ID trackingID1 optional,
+ XSD.ID trackingID2 optional
+}
+with {
+ variant "name as 'notification'";
+ //variant (verificationRequest) "text 'true' as '1'";
+ //variant (verificationRequest) "text 'false' as '0'";
+ //variant (subscriptionDeletion) "text 'true' as '1'";
+ //variant (subscriptionDeletion) "text 'false' as '0'";
+ //variant (targetRemovalRequest) "text 'true' as '1'";
+ //variant (targetRemovalRequest) "text 'false' as '0'";
+ //variant (targetRemovalAllowance) "text 'true' as '1'";
+ //variant (targetRemovalAllowance) "text 'false' as '0'";
+ variant (iPEDiscoveryRequest) "name as capitalized";
+ variant (aERegistrationPointChange) "name as capitalized";
+ //variant (aERegistrationPointChange) "text 'true' as '1'";
+ //variant (aERegistrationPointChange) "text 'false' as '0'";
+ variant (aEReferenceIDChange) "name as capitalized";
+ //variant (aEReferenceIDChange) "text 'true' as '1'";
+ //variant (aEReferenceIDChange) "text 'false' as '0'";
+};
+
+
+type SecurityInfo_1 SecurityInfo
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
+type record SecurityInfo_1
+{
+ SecurityInfoType securityInfoType optional,
+ DynAuthDasRequest dasRequest optional,
+ DynAuthDasResponse dasResponse optional,
+ ReceiverESPrimRandObject esprimRandObject optional,
+ E2eCompactJWE esprimObject optional,
+ XSD.Base64Binary escertkeMessage optional,
+ DynAuthRelMapRequest dynAuthRelMapRequest optional,
+ DynAuthRelMapResponse dynAuthRelMapResponse optional
+}
+with {
+ variant "name as 'securityInfo'";
+};
+
+
+type enumerated SecurityInfoType
+{
+ int1(1),
+ int2(2),
+ int3(3),
+ int4(4),
+ int5(5),
+ int6(6),
+ int7(7),
+ int8(8)
}
with {
+ variant "useNumber";
variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (announcedAttribute) "list";
- variant (memberIDs) "list";
- //variant (memberTypeValidated) "text 'true' as '1'";
- //variant (memberTypeValidated) "text 'false' as '0'";
- //variant (semanticSupportIndicator) "text 'true' as '1'";
- //variant (semanticSupportIndicator) "text 'false' as '0'";
- 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";
};
-type record GroupAnnc
+type record DynAuthDasResponse
{
- ResourceName resourceName,
- ResourceType resourceType,
- XSD.ID resourceID,
- NhURI parentID,
- Timestamp creationTime,
- Timestamp lastModifiedTime,
- Labels labels optional,
- AcpType accessControlPolicyIDs,
- Timestamp expirationTime,
- XSD.AnyURI link,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- MemberType memberType optional,
- SpecializationType specializationType optional,
- XSD.NonNegativeInteger currentNrOfMembers optional,
- XSD.PositiveInteger maxNrOfMembers optional,
- record of XSD.AnyURI memberIDs optional,
- ListOfURIs membersAccessControlPolicyIDs optional,
- XSD.Boolean memberTypeValidated optional,
- ConsistencyStrategy consistencyStrategy optional,
- XSD.String groupName optional,
- XSD.Boolean semanticSupportIndicator optional,
- BatchNotify notifyAggregation optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- Subscription subscription,
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- Transaction transaction
- } choice_list
- } choice optional
+ record {
+ SetOfAcrs grantedPrivileges optional,
+ AbsRelTimestamp privilegesLifetime optional
+ } dynamicACPInfo optional,
+ record length(1 .. infinity) of DynAuthJWT tokens optional,
+ XSD.Boolean authorSignReqInfo optional
}
with {
variant "name as uncapitalized";
- variant "element";
- variant (resourceName) "attribute";
- variant (memberIDs) "list";
- //variant (memberTypeValidated) "text 'true' as '1'";
- //variant (memberTypeValidated) "text 'false' as '0'";
- //variant (semanticSupportIndicator) "text 'true' as '1'";
- //variant (semanticSupportIndicator) "text 'false' as '0'";
- 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 (tokens) "list";
+ //variant (authorSignReqInfo) "text 'true' as '1'";
+ //variant (authorSignReqInfo) "text 'false' as '0'";
};
+//FIXME To replace Representation type by this
+type union Representation {
+ Resource_2 resource,
+ URI uRI,
+ TimeSeriesNotification timeSeriesNotification
+}
+with {
+ variant "name as 'representation'";
+ variant (uRI) "name as capitalized";
+ };
+type TimeSyncBeaconNotification_1 TimeSyncBeaconNotification
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
-type record LocalMulticastGroup
+type record NwMonitoringReq
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5623,17 +7287,20 @@ type record LocalMulticastGroup
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ MonitorEnable monitorEnable,
+ MonitorStatus monitorStatus,
+ FailureReason failureReason optional,
+ LocationRegion geographicArea,
+ CongestionLevels congestionLevel optional,
+ CongestionLevel congestionStatus optional,
+ XSD.NonNegativeInteger numberOfDevices optional,
ExternalID externalGroupID optional,
- IpAddress multicastAddress,
- XSD.AnyURI multicastGroupFanoutTarget,
- ListOfURIs memberList,
- XSD.AnyURI responseTarget,
- XSD.Duration responseTimeWindow optional,
- TMGI tMGI optional,
+ ExternalID m2M_Ext_IDs optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- record length(0 .. 1) of enumerated { NULL_ } choice
+ Subscription subscription
} choice_list
} choice optional
}
@@ -5641,7 +7308,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (tMGI) "name as capitalized";
+ variant (m2M_Ext_IDs) "name as 'M2M-Ext-IDs'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5650,7 +7317,7 @@ with {
};
-type record LocationPolicy
+type record OntologyMappingAlgorithmRepository
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5662,26 +7329,17 @@ type record LocationPolicy
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- LocationSource locationSource,
- LocationInformationType locationInformationType,
- ListOfDuration locationUpdatePeriod optional,
- LocationTargetID locationTargetID optional,
- XSD.AnyURI locationServer optional,
- XSD.AnyURI locationContainerID,
- XSD.String locationContainerName optional,
- XSD.String locationStatus,
- XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
- GeofenceEventCriteria geofenceEventCriteria optional,
- ExternalID authID optional,
- XSD.Boolean retrieveLastKnownLocation optional,
- LocationUpdateEventCriteria locationUpdateEventCriteria optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID creator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Transaction transaction,
+ OntologyMappingAlgorithm ontologyMappingAlgorithm
} choice_list
} choice optional
}
@@ -5690,8 +7348,6 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
- //variant (retrieveLastKnownLocation) "text 'true' as '1'";
- //variant (retrieveLastKnownLocation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5700,7 +7356,7 @@ with {
};
-type record LocationPolicyAnnc
+type record OntologyMappingAlgorithmRepositoryAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5713,23 +7369,11 @@ type record LocationPolicyAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- LocationSource locationSource optional,
- LocationInformationType locationInformationType optional,
- ListOfDuration locationUpdatePeriod optional,
- LocationTargetID locationTargetID optional,
- XSD.AnyURI locationServer optional,
- XSD.AnyURI locationContainerID optional,
- XSD.String locationContainerName optional,
- XSD.String locationStatus optional,
- XSD.AnySimpleType geographicalTargetArea optional,//FIXME Use AnySimpleType instead
- GeofenceEventCriteria geofenceEventCriteria optional,
- ExternalID authID optional,
- XSD.Boolean retrieveLastKnownLocation optional,
- LocationUpdateEventCriteria locationUpdateEventCriteria optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Transaction transaction
+ Subscription subscription,
+ OntologyMappingAlgorithmAnnc ontologyMappingAlgorithmAnnc
} choice_list
} choice optional
}
@@ -5737,8 +7381,6 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- //variant (retrieveLastKnownLocation) "text 'true' as '1'";
- //variant (retrieveLastKnownLocation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5747,7 +7389,7 @@ with {
};
-type record M2mServiceSubscriptionProfile
+type record OntologyMappingAlgorithm
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5759,10 +7401,18 @@ type record M2mServiceSubscriptionProfile
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID creator optional,
+ XSD.Base64Binary executable optional,
+ OntologyMappingAlgorithmType algorithmType optional,
+ XSD.String description optional,
+ XSD.Float mappingThreshold optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- ServiceSubscribedNode serviceSubscribedNode,
Subscription subscription,
Transaction transaction
} choice_list
@@ -5772,6 +7422,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5780,7 +7431,7 @@ with {
};
-type record Memory
+type record OntologyMappingAlgorithmAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5789,37 +7440,30 @@ type record Memory
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
+ AcpType accessControlPolicyIDs,
Timestamp expirationTime,
+ XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- MgmtDefinition mgmtDefinition,
- ListOfURIs objectIDs optional,
- ListOfURIs objectPaths optional,
- XSD.String description optional,
- XSD.AnyURI mgmtSchema optional,
- XSD.UnsignedLong memAvailable,
- XSD.UnsignedLong memTotal,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription
+ } choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
-type record MemoryAnnc
+type record OntologyMapping
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5828,35 +7472,42 @@ type record MemoryAnnc
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs,
+ AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
- XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- MgmtDefinition mgmtDefinition,
- ListOfURIs objectIDs optional,
- ListOfURIs objectPaths optional,
- XSD.String description optional,
- XSD.AnyURI mgmtSchema optional,
- XSD.UnsignedLong memAvailable optional,
- XSD.UnsignedLong memTotal optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID creator optional,
+ XSD.AnyURI sourceOntology,
+ XSD.AnyURI targetOntology,
+ OntologyMappingPolicy mappingPolicy,
+ ListOfURIs mappingAlgorithmLinks,
+ SemanticFormat mappingResultFormat,
+ XSD.Base64Binary mappingResult,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of Subscription subscription_list
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
} choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
- variant (choice.subscription_list) "untagged";
- variant (choice.subscription_list[-]) "name as 'subscription'";
+ variant (choice.choice_list) "untagged";
+ variant (choice.choice_list[-]) "untagged";
};
-type record MgmtCmd
+type record OntologyMappingAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5865,33 +7516,21 @@ type record MgmtCmd
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
+ AcpType accessControlPolicyIDs,
Timestamp expirationTime,
+ XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.String description optional,
- CmdType cmdType,
- ExecReqArgsListType execReqArgs optional,
- XSD.Boolean execEnable,
- NodeID execTarget,
- ExecModeType execMode optional,
- XSD.Duration execFrequency optional,
- XSD.Duration execDelay optional,
- XSD.NonNegativeInteger execNumber optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- ExecInstance execInstance,
- Subscription subscription,
- Transaction transaction
+ Subscription subscription
} choice_list
- } choice
+ } choice optional
}
with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- //variant (execEnable) "text 'true' as '1'";
- //variant (execEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -5900,7 +7539,7 @@ with {
};
-type record MultimediaSession
+type record OntologyRepository
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5912,17 +7551,20 @@ type record MultimediaSession
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- XSD.ID sessionOriginatorID,
- SessionDescriptions acceptedSessionDescriptions,
- SessionDescriptions offeredSessionDescriptions,
- SessionState sessionState,
+ AnnounceSyncType announceSyncType optional,
+ XSD.NonNegativeInteger stateTag,
+ XSD.ID creator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Ontology ontology,
+ Transaction transaction,
+ OntologyMapping ontologyMapping,
+ OntologyMappingAlgorithmRepository ontologyMappingAlgorithmRepository
} choice_list
} choice optional
}
@@ -5939,7 +7581,7 @@ with {
};
-type record MultimediaSessionAnnc
+type record OntologyRepositoryAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5952,14 +7594,16 @@ type record MultimediaSessionAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.ID sessionOriginatorID,
- SessionDescriptions acceptedSessionDescriptions,
- SessionState sessionState,
+ XSD.NonNegativeInteger stateTag,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Ontology ontology,
+ OntologyAnnc ontologyAnnc,
+ Transaction transaction,
+ OntologyMappingAnnc ontologyMappingAnnc,
+ OntologyMappingAlgorithmRepositoryAnnc ontologyMappingAlgorithmRepositoryAnnc
} choice_list
} choice optional
}
@@ -5975,7 +7619,7 @@ with {
};
-type record Node
+type record Ontology
{
ResourceName resourceName,
ResourceType resourceType,
@@ -5987,34 +7631,21 @@ type record Node
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- NodeID nodeID,
- XSD.ID hostedCSELink optional,
- ListOfM2MID hostedAELinks optional,
- ListOfM2MID hostedServiceLinks optional,
- XSD.String mgmtClientAddress optional,
- XSD.Boolean roamingStatus optional,
- XSD.String networkID optional,
- union {
- record length(1 .. infinity) of ChildResourceRef childResource_list,
- record length(1 .. infinity) of union {
- Memory memory,
- Battery battery,
- AreaNwkInfo areaNwkInfo,
- AreaNwkDeviceInfo areaNwkDeviceInfo,
- Firmware firmware,
- Software software,
- DeviceInfo deviceInfo,
- DeviceCapability deviceCapability,
- Reboot reboot,
- EventLog eventLog,
- CmdhPolicy cmdhPolicy,
- ActiveCmdhPolicy activeCmdhPolicy,
+ AnnounceSyncType announceSyncType optional,
+ XSD.NonNegativeInteger stateTag,
+ XSD.ID creator optional,
+ XSD.String description optional,
+ SemanticFormat ontologyFormat,
+ XSD.AnySimpleType ontologyContent,
+ Sparql semanticOpExec optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
Subscription subscription,
- SemanticDescriptor semanticDescriptor,
- Transaction transaction,
- Schedule schedule
+ Transaction transaction
} choice_list
} choice optional
}
@@ -6023,8 +7654,6 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
- //variant (roamingStatus) "text 'true' as '1'";
- //variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6033,7 +7662,7 @@ with {
};
-type record NodeAnnc
+type record OntologyAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6046,31 +7675,16 @@ type record NodeAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- NodeID nodeID,
- XSD.ID hostedCSELink optional,
- ListOfM2MID hostedAELinks optional,
- ListOfM2MID hostedServiceLinks optional,
- XSD.String mgmtClientAddress optional,
- XSD.Boolean roamingStatus optional,
- XSD.String networkID optional,
+ XSD.NonNegativeInteger stateTag,
+ XSD.String description optional,
+ SemanticFormat ontologyFormat optional,
+ XSD.AnySimpleType ontologyContent optional,
+ Sparql semanticOpExec optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- MemoryAnnc memoryAnnc,
- BatteryAnnc batteryAnnc,
- AreaNwkInfoAnnc areaNwkInfoAnnc,
- AreaNwkDeviceInfoAnnc areaNwkDeviceInfoAnnc,
- FirmwareAnnc firmwareAnnc,
- SoftwareAnnc softwareAnnc,
- DeviceInfoAnnc deviceInfoAnnc,
- DeviceCapabilityAnnc deviceCapabilityAnnc,
- RebootAnnc rebootAnnc,
- EventLogAnnc eventLogAnnc,
Subscription subscription,
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
- Transaction transaction,
- Schedule schedule
+ Transaction transaction
} choice_list
} choice optional
}
@@ -6078,8 +7692,6 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- //variant (roamingStatus) "text 'true' as '1'";
- //variant (roamingStatus) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6088,7 +7700,7 @@ with {
};
-type record NotificationTargetMgmtPolicyRef
+type record PolicyDeletionRules
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6100,8 +7712,9 @@ type record NotificationTargetMgmtPolicyRef
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfURIs notificationTargetURI optional,
- XSD.AnyURI notificationlPolicyID optional,
+ XSD.ID custodian optional,
+ DeletionContexts deletionRules optional,
+ LogicalOperator deletionRulesRelation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6122,7 +7735,7 @@ with {
};
-type record NotificationTargetPolicy
+type record PollingChannel
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6131,18 +7744,10 @@ type record NotificationTargetPolicy
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
- ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.ID creator optional,
- NotificationTargetPolicyAction action_,
- XSD.Token policyLabel,
- LogicalOperator rulesRelationship optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- PolicyDeletionRules policyDeletionRules,
- Subscription subscription,
Transaction transaction
} choice_list
} choice optional
@@ -6151,7 +7756,6 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (action_) "name as 'action'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6160,147 +7764,7 @@ with {
};
-type Notification_1 Notification
-with {
- variant "name as uncapitalized";
- variant "element";
-};
-
-
-type AggregatedNotification_1 AggregatedNotification
-with {
- variant "name as uncapitalized";
- variant "element";
-};
-
-
-type record AggregatedNotification_1
-{
- record of Notification notification_list
-}
-with {
- variant "name as 'aggregatedNotification'";
- variant (notification_list) "untagged";
- variant (notification_list[-]) "name as 'notification'";
-};
-
-type record Notification_1
-{
- record {
- Representation representation optional,
- record {
- Operation operation optional,
- XSD.ID originator optional
- } operationMonitor optional,
- NotificationEventType notificationEventType optional
- } notificationEvent optional,
- XSD.Boolean verificationRequest optional,
- XSD.Boolean subscriptionDeletion optional,
- XSD.AnyURI subscriptionReference optional,
- XSD.ID creator optional,
- XSD.AnyURI notificationForwardingURI optional,
- XSD.ID notificationTarget optional,
- XSD.Boolean targetRemovalRequest optional,
- XSD.Boolean targetRemovalAllowance optional,
- record {
- XSD.ID originator,
- FilterCriteria filterCriteria
- } iPEDiscoveryRequest optional,
- XSD.Boolean aERegistrationPointChange optional,
- XSD.Boolean aEReferenceIDChange optional,
- XSD.ID trackingID1 optional,
- XSD.ID trackingID2 optional
-}
-with {
- variant "name as 'notification'";
- //variant (verificationRequest) "text 'true' as '1'";
- //variant (verificationRequest) "text 'false' as '0'";
- //variant (subscriptionDeletion) "text 'true' as '1'";
- //variant (subscriptionDeletion) "text 'false' as '0'";
- //variant (targetRemovalRequest) "text 'true' as '1'";
- //variant (targetRemovalRequest) "text 'false' as '0'";
- //variant (targetRemovalAllowance) "text 'true' as '1'";
- //variant (targetRemovalAllowance) "text 'false' as '0'";
- variant (iPEDiscoveryRequest) "name as capitalized";
- variant (aERegistrationPointChange) "name as capitalized";
- //variant (aERegistrationPointChange) "text 'true' as '1'";
- //variant (aERegistrationPointChange) "text 'false' as '0'";
- variant (aEReferenceIDChange) "name as capitalized";
- //variant (aEReferenceIDChange) "text 'true' as '1'";
- //variant (aEReferenceIDChange) "text 'false' as '0'";
-};
-
-
-type SecurityInfo_1 SecurityInfo
-with {
- variant "name as uncapitalized";
- variant "element";
-};
-
-
-type record SecurityInfo_1
-{
- SecurityInfoType securityInfoType optional,
- DynAuthDasRequest dasRequest optional,
- DynAuthDasResponse dasResponse optional,
- ReceiverESPrimRandObject esprimRandObject optional,
- E2eCompactJWE esprimObject optional,
- XSD.Base64Binary escertkeMessage optional,
- DynAuthRelMapRequest dynAuthRelMapRequest optional,
- DynAuthRelMapResponse dynAuthRelMapResponse optional
-}
-with {
- variant "name as 'securityInfo'";
-};
-
-
-type enumerated SecurityInfoType
-{
- int1(1),
- int2(2),
- int3(3),
- int4(4),
- int5(5),
- int6(6),
- int7(7),
- int8(8)
-}
-with {
- variant "useNumber";
- variant "name as uncapitalized";
-};
-
-
-type record DynAuthDasResponse
-{
- record {
- SetOfAcrs grantedPrivileges optional,
- AbsRelTimestamp privilegesLifetime optional
- } dynamicACPInfo optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,
- XSD.Boolean authorSignReqInfo optional
-}
-with {
- variant "name as uncapitalized";
- variant (tokens) "list";
- //variant (authorSignReqInfo) "text 'true' as '1'";
- //variant (authorSignReqInfo) "text 'false' as '0'";
-};
-
-
-//FIXME To replace Representation type by this
-type union Representation {
- Resource_2 resource,
- URI uRI
-}
-with {
- variant "name as 'representation'";
- variant (uRI) "name as capitalized";
- };
-
-
-
-type record OntologyRepository
+type record PrimitiveProfile
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6312,15 +7776,22 @@ type record OntologyRepository
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
+ AnnounceSyncType announceSyncType optional,
+ ListOfM2MID iDList,
+ ResourceTypeList resourceTypes optional,
+ ListOfOperations operations optional,
+ ListOfURIs resourceIDs optional,
+ SupportedReleaseVersions releaseVersions optional,
+ ListOfAttributes additions optional,
+ AttributeList_1 deletions optional,
+ PrimitiveProfileApplicability applicability optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Ontology ontology,
Transaction transaction
} choice_list
} choice optional
@@ -6330,6 +7801,7 @@ with {
variant "element";
variant (resourceName) "attribute";
variant (announcedAttribute) "list";
+ variant (iDList) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6338,7 +7810,7 @@ with {
};
-type record OntologyRepositoryAnnc
+type record PrimitiveProfileAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6351,13 +7823,18 @@ type record OntologyRepositoryAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag,
+ ListOfM2MID iDList optional,
+ ResourceTypeList resourceTypes optional,
+ ListOfOperations operations optional,
+ ListOfURIs resourceIDs optional,
+ SupportedReleaseVersions releaseVersions optional,
+ ListOfAttributes additions optional,
+ AttributeList_1 deletions optional,
+ PrimitiveProfileApplicability applicability optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Ontology ontology,
- OntologyAnnc ontologyAnnc,
Transaction transaction
} choice_list
} choice optional
@@ -6366,6 +7843,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (iDList) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6374,7 +7852,7 @@ with {
};
-type record Ontology
+type record ProcessManagement
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6386,19 +7864,22 @@ type record Ontology
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- XSD.NonNegativeInteger stateTag,
- XSD.ID creator optional,
- XSD.String description optional,
- SemanticFormat ontologyFormat,
- XSD.AnySimpleType ontologyContent,
- Sparql semanticOpExec optional,
+ AnnounceSyncType announceSyncType optional,
+ ProcessStatus processStatus,
+ ProcessControl processControl,
+ XSD.AnyURI currentState,
+ ListOfEvalCriteria activateConditions optional,
+ ListOfEvalCriteria endConditions optional,
+ XSD.AnyURI initialState,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Transaction transaction,
+ State state
} choice_list
} choice optional
}
@@ -6415,7 +7896,7 @@ with {
};
-type record OntologyAnnc
+type record ProcessManagementAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6428,16 +7909,60 @@ type record OntologyAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.NonNegativeInteger stateTag,
- XSD.String description optional,
- SemanticFormat ontologyFormat optional,
- XSD.AnySimpleType ontologyContent optional,
- Sparql semanticOpExec optional,
+ ProcessStatus processStatus optional,
+ ProcessControl processControl optional,
+ XSD.AnyURI currentState optional,
+ ListOfEvalCriteria activateConditions optional,
+ ListOfEvalCriteria endConditions optional,
+ XSD.AnyURI initialState optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Transaction transaction,
+ State state
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
+type record ReasoningJobInstance
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ ReasoningType reasoningType,
+ ReasoningJobWorkingMode reasoningMode optional,
+ XSD.PositiveInteger reasoningPeriod optional,
+ XSD.AnyURI factSet,
+ XSD.AnyURI ruleSet,
+ XSD.Base64Binary resultRepresentation,
+ SemanticFormat resultRepresentationFormat,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription
} choice_list
} choice optional
}
@@ -6445,6 +7970,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6453,7 +7979,7 @@ with {
};
-type record PolicyDeletionRules
+type record ReasoningJobInstanceAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6462,16 +7988,21 @@ type record PolicyDeletionRules
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
+ AcpType accessControlPolicyIDs,
Timestamp expirationTime,
+ XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- DeletionContexts deletionRules optional,
- LogicalOperator deletionRulesRelation optional,
+ ReasoningType reasoningType optional,
+ ReasoningJobWorkingMode reasoningMode optional,
+ XSD.PositiveInteger reasoningPeriod optional,
+ XSD.AnyURI factSet optional,
+ XSD.AnyURI ruleSet optional,
+ XSD.Base64Binary resultRepresentation,
+ SemanticFormat resultRepresentationFormat,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Subscription subscription,
- Transaction transaction
+ Subscription subscription
} choice_list
} choice optional
}
@@ -6487,7 +8018,7 @@ with {
};
-type record PollingChannel
+type record ReasoningRules
{
ResourceName resourceName,
ResourceType resourceType,
@@ -6496,11 +8027,20 @@ type record PollingChannel
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.AnyURI ontologyRef,
+ ReasoningRuleFormat ruleRepresentationFormat,
+ XSD.Base64Binary ruleRepresentation,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Transaction transaction
+ Subscription subscription
} choice_list
} choice optional
}
@@ -6508,6 +8048,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6515,48 +8056,41 @@ with {
variant (choice.choice_list[-]) "untagged";
};
-//TODO Manually added until XSD files are updated
-type record length(1 .. infinity) of Operation ListOfOperations
-with {
- variant "name as uncapitalized";
- variant "list";
-};
-
-type record length(1 .. infinity) of Attribute ListOfAttributes;
-type record PrimitveProfile
+type record ReasoningRulesAnnc
{
ResourceName resourceName,
ResourceType resourceType,
XSD.ID resourceID,
NhURI parentID,
- AcpType accessControlPolicyIDs optional,
Timestamp creationTime,
- Timestamp expirationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- ListOfURIs announceTo optional,
- record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- XSD.ID creator optional,
- ListOfM2MID IDList,
- ResourceTypeList_1 resourceTypes,
- ListOfOperations operations,
- ListOfURIs resourceIDs,
- SupportedReleaseVersions releaseVersions,
- ListOfAttributes additions,
- AttributeList deletions,
- ListOfAttributes modifications,
- PrimitiveProfileApplicability applicability,
+ XSD.AnyURI ontologyRef optional,
+ ReasoningRuleFormat ruleRepresentationFormat optional,
+ XSD.Base64Binary ruleRepresentation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
- Subscription subscription,
- Transaction transaction
+ Subscription subscription
} choice_list
} choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
};
-//TODO ********
+
type record Reboot
{
@@ -6570,8 +8104,10 @@ type record Reboot
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -6654,8 +8190,11 @@ type record RemoteCSE
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
XSD.AnyURI cSEBase,
@@ -6673,6 +8212,7 @@ type record RemoteCSE
ExternalID externalGroupID optional,
XSD.Boolean triggerEnable optional,
ActivityPatternElements activityPatternElements optional,
+ XSD.Boolean enableTimeCompensation optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -6699,7 +8239,12 @@ type record RemoteCSE
CrossResourceSubscription crossResourceSubscription,
TransactionMgmt transactionMgmt,
Transaction transaction,
- PrimitveProfile primitiveProfile//TODO Manually added until XSD files are updated
+ E2eQosSession e2eQosSession,
+ TimeSyncBeacon timeSyncBeacon,
+ TimeSyncBeaconAnnc timeSyncBeaconAnnc,
+ NwMonitoringReq nwMonitoringReq,
+ PrimitiveProfile primitiveProfile,
+ PrimitiveProfileAnnc primitiveProfileAnnc
} choice_list
} choice optional
}
@@ -6716,6 +8261,8 @@ with {
//variant (requestReachability) "text 'false' as '0'";
//variant (triggerEnable) "text 'true' as '1'";
//variant (triggerEnable) "text 'false' as '0'";
+ //variant (enableTimeCompensation) "text 'true' as '1'";
+ //variant (enableTimeCompensation) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -6739,6 +8286,7 @@ type record RemoteCSEAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ GeoCoordinates location optional,
CseTypeID cseType optional,
PoaList pointOfAccess optional,
XSD.AnyURI cSEBase optional,
@@ -6778,7 +8326,11 @@ type record RemoteCSEAnnc
SemanticMashupInstanceAnnc semanticMashupInstanceAnnc,
CrossResourceSubscription crossResourceSubscription,
TransactionMgmt transactionMgmt,
- Transaction transaction
+ Transaction transaction,
+ E2eQosSession e2eQosSession,
+ NwMonitoringReq nwMonitoringReq,
+ PrimitiveProfile primitiveProfile,
+ PrimitiveProfileAnnc primitiveProfileAnnc
} choice_list
} choice optional
}
@@ -6802,7 +8354,14 @@ with {
};
-type record RequestPrimitive
+type RequestPrimitive_1 RequestPrimitive
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
+type record RequestPrimitive_1
{
Operation operation,
XSD.AnyURI to_,
@@ -6823,23 +8382,24 @@ type record RequestPrimitive
XSD.String groupRequestIdentifier optional,
FilterCriteria filterCriteria optional,
DesIdResType desiredIdentifierResultType optional,
- record length(1 .. infinity) of DynAuthJWT tokens optional,
+ RecordOfDynAuthJWT tokens optional,//TODO Use the RecordOfDynAuthJWT
record length(1 .. infinity) of TokenID tokenIDs optional,
record length(1 .. infinity) of XSD.NCName localTokenIDs optional,
XSD.Boolean tokenRequestIndicator optional,
ListOfURIs groupRequestTargetMembers optional,
+ XSD.PositiveInteger groupSomecastTargetNumber optional,
XSD.Boolean authorSignIndicator optional,
SignatureList authorSigns optional,
XSD.Boolean authorRelIndicator optional,
XSD.Boolean semanticQueryIndicator optional,
+ ListOfM2MID ontologyMappingResources optional,
ReleaseVersion releaseVersionIndicator,
XSD.String vendorInformation optional,
- XSD.ID primitiveProfileIdentifier optional,//TODO Manually added until XSD files are updated
- XSD.ID m2mServiceUser optional//TODO Manually added until XSD files are updated
+ XSD.AnyURI primitiveProfileIdentifier optional,
+ XSD.ID m2mServiceUser optional
}
with {
- variant "name as uncapitalized";
- variant "element";
+ variant "name as 'requestPrimitive'";
variant (to_) "name as 'to'";
variant (from_) "name as 'from'";
variant (roleIDs) "list";
@@ -6878,6 +8438,7 @@ type record Request
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
Operation operation,
XSD.AnyURI target,
XSD.ID originator,
@@ -6905,7 +8466,14 @@ with {
};
-type record ResponsePrimitive
+type ResponsePrimitive_1 ResponsePrimitive
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
+type record ResponsePrimitive_1
{
ResponseStatusCode responseStatusCode,
RequestID requestIdentifier,
@@ -6921,11 +8489,11 @@ type record ResponsePrimitive
DynAuthTokenReqInfo tokenRequestInformation optional,
XSD.Boolean authorSignReqInfo optional,
ReleaseVersion releaseVersionIndicator,
- XSD.String vendorInformation optional
+ XSD.String vendorInformation optional,
+ XSD.ID m2mServiceUser optional
}
with {
- variant "name as uncapitalized";
- variant "element";
+ variant "name as 'responsePrimitive'";
variant (to_) "name as 'to'";
variant (from_) "name as 'from'";
//variant (authorSignReqInfo) "text 'true' as '1'";
@@ -6940,7 +8508,7 @@ with {
};
-type record length(0 .. infinity) of XSD.AnyURI URIList //TODO Allow URIList to be empty as defined in TS-0004
+type record of XSD.AnyURI URIList
with {
variant "list";
variant "element";
@@ -6981,6 +8549,13 @@ with {
};
+type ResourcePermissions Permissions
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
type record ResourceWrapper
{
// union {
@@ -7020,7 +8595,7 @@ with {
type record ListOfChildResourceRef
{
- record length(1 .. infinity) of ChildResourceRef resourceRef_list
+ record of ChildResourceRef resourceRef_list
}
with {
variant "name as uncapitalized";
@@ -7029,6 +8604,21 @@ with {
};
+type record ResourcePermissions
+{
+ record length(1 .. infinity) of record {
+ XSD.AnyURI uRI,
+ SetOfAcrs setOfAcrs
+ } resourcePermission_list
+}
+with {
+ variant "name as uncapitalized";
+ variant (resourcePermission_list) "untagged";
+ variant (resourcePermission_list[-]) "name as 'resourcePermission'";
+ variant (resourcePermission_list[-].uRI) "name as capitalized";
+};
+
+
type record Role
{
ResourceName resourceName,
@@ -7041,6 +8631,7 @@ type record Role
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
RoleID roleID,
XSD.ID issuer,
XSD.ID holder,
@@ -7080,8 +8671,10 @@ type record Schedule
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
ScheduleEntries scheduleElement,
XSD.Boolean networkCoordinated,
union {
@@ -7155,8 +8748,10 @@ type record SemanticDescriptor
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.ID creator optional,
SemanticFormat descriptorRepresentation optional,
Sparql semanticOpExec optional,
@@ -7246,8 +8841,10 @@ type record SemanticMashupInstance
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
XSD.AnyURI smjpID,
@@ -7335,8 +8932,10 @@ type record SemanticMashupJobProfile
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
Sparql memberFilter,
@@ -7422,6 +9021,7 @@ type record SemanticMashupResult
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
XSD.Base64Binary smjpInputParameter optional,
@@ -7460,6 +9060,7 @@ type record SemanticMashupResultAnnc
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.NonNegativeInteger stateTag optional,
XSD.Base64Binary smjpInputParameter optional,
Serializations mashupResultFormat optional,
@@ -7468,8 +9069,210 @@ type record SemanticMashupResultAnnc
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- SemanticDescriptor semanticDescriptor,
- SemanticDescriptorAnnc semanticDescriptorAnnc,
+ SemanticDescriptor semanticDescriptor,
+ SemanticDescriptorAnnc semanticDescriptorAnnc,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
+type record SemanticRuleRepository
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ ReasoningRules reasoningRules,
+ ReasoningJobInstance reasoningJobInstance
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ 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";
+};
+
+
+type record SemanticRuleRepositoryAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ ReasoningRulesAnnc reasoningRulesAnnc,
+ ReasoningJobInstanceAnnc reasoningJobInstanceAnnc
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
+type record ServiceSubscribedAppRule
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfM2MID applicableCredIDs optional,
+ ListOfM2MID allowedApp_IDs optional,
+ ListOfM2MID allowedAEs optional,
+ record length(1 .. infinity) of RoleID allowedRole_IDs optional,
+ ListOfURIs allowedUsers optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
+ variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
+ variant (allowedRole_IDs) "list";
+ 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";
+};
+
+
+type record ServiceSubscribedNode
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ NodeID nodeID,
+ XSD.ID cSE_ID optional,
+ record of DeviceID deviceIdentifier optional,
+ ListOfURIs ruleLinks optional,
+ XSD.Boolean niddRequired optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (cSE_ID) "name as 'CSE-ID'";
+ variant (deviceIdentifier) "list";
+ //variant (niddRequired) "text 'true' as '1'";
+ //variant (niddRequired) "text 'false' as '0'";
+ 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";
+};
+
+
+type record ServiceSubscribedUserProfile
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ XSD.ID m2M_User_ID,
+ XSD.NonNegativeInteger maxNumAEs optional,
+ XSD.NonNegativeInteger maxNumNodes optional,
+ XSD.NonNegativeInteger maxNumBytes optional,
+ XSD.NonNegativeInteger maxRequestRate optional,
+ XSD.NonNegativeInteger maxNumContainers optional,
+ XSD.NonNegativeInteger maxNumInstancesPerContainer optional,
+ XSD.NonNegativeInteger maxNumTimeSeries optional,
+ XSD.NonNegativeInteger maxNumInstancesPerTimeSeries optional,
+ XSD.NonNegativeInteger maxMembersPerGroup optional,
+ XSD.NonNegativeInteger maxNotificationRate optional,
+ XSD.NonNegativeInteger maxNumFlexContainers optional,
+ XSD.NonNegativeInteger maxNumInstancesPerFlexContainer optional,
+ SetOfAcrs defaultAccessControlPrivileges optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
Transaction transaction
} choice_list
} choice optional
@@ -7478,6 +9281,7 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
+ variant (m2M_User_ID) "name as 'M2M-User-ID'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -7486,7 +9290,7 @@ with {
};
-type record ServiceSubscribedAppRule
+type record SoftwareCampaign
{
ResourceName resourceName,
ResourceType resourceType,
@@ -7498,15 +9302,27 @@ type record ServiceSubscribedAppRule
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- ListOfM2MID applicableCredIDs optional,
- ListOfM2MID allowedApp_IDs optional,
- ListOfM2MID allowedAEs optional,
- record length(1 .. infinity) of RoleID allowedRole_IDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.Boolean campaignEnabled,
+ ExecStatusType campaignStatus,
+ XSD.String version,
+ XSD.String softwareName,
+ XSD.AnyURI uRL,
+ ListOfURIs softwareTargets,
+ ListOfSoftwareTriggerCriteria softwareTriggerCriteria optional,
+ SoftwareOperation softwareOperation,
+ ListOfURIs softwareLinks,
+ Status aggregatedSoftwareStatus,
+ ListOfActionStatuses individualSoftwareStatuses,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Transaction transaction,
+ Schedule schedule
} choice_list
} choice optional
}
@@ -7514,9 +9330,10 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (allowedApp_IDs) "name as 'allowedApp-IDs'";
- variant (allowedRole_IDs) "name as 'allowedRole-IDs'";
- variant (allowedRole_IDs) "list";
+ variant (announcedAttribute) "list";
+ //variant (campaignEnabled) "text 'true' as '1'";
+ //variant (campaignEnabled) "text 'false' as '0'";
+ variant (uRL) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -7525,7 +9342,7 @@ with {
};
-type record ServiceSubscribedNode
+type record SoftwareCampaignAnnc
{
ResourceName resourceName,
ResourceType resourceType,
@@ -7534,19 +9351,27 @@ type record ServiceSubscribedNode
Timestamp creationTime,
Timestamp lastModifiedTime,
Labels labels optional,
- AcpType accessControlPolicyIDs optional,
+ AcpType accessControlPolicyIDs,
Timestamp expirationTime,
+ XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
- NodeID nodeID,
- XSD.ID cSE_ID optional,
- record of DeviceID deviceIdentifier optional,
- ListOfURIs ruleLinks optional,
- XSD.Boolean niddRequired optional,
+ XSD.Boolean campaignEnabled optional,
+ ExecStatusType campaignStatus optional,
+ XSD.String version optional,
+ XSD.String softwareName optional,
+ XSD.AnyURI uRL optional,
+ ListOfURIs softwareTargets optional,
+ ListOfSoftwareTriggerCriteria softwareTriggerCriteria optional,
+ SoftwareOperation softwareOperation optional,
+ ListOfURIs softwareLinks optional,
+ Status aggregatedSoftwareStatus optional,
+ ListOfActionStatuses individualSoftwareStatuses optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
Subscription subscription,
- Transaction transaction
+ Transaction transaction,
+ Schedule schedule
} choice_list
} choice optional
}
@@ -7554,10 +9379,9 @@ with {
variant "name as uncapitalized";
variant "element";
variant (resourceName) "attribute";
- variant (cSE_ID) "name as 'CSE-ID'";
- variant (deviceIdentifier) "list";
- //variant (niddRequired) "text 'true' as '1'";
- //variant (niddRequired) "text 'false' as '0'";
+ //variant (campaignEnabled) "text 'true' as '1'";
+ //variant (campaignEnabled) "text 'false' as '0'";
+ variant (uRL) "name as capitalized";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -7578,8 +9402,10 @@ type record Software
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
MgmtDefinition mgmtDefinition,
ListOfURIs objectIDs optional,
ListOfURIs objectPaths optional,
@@ -7678,6 +9504,90 @@ with {
};
+type record State
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.Boolean stateActive,
+ XSD.AnyURI stateAction optional,
+ ListOfStateTransitions stateTransitions optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction,
+ Action action_
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ //variant (stateActive) "text 'true' as '1'";
+ //variant (stateActive) "text 'false' as '0'";
+ 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[-].action_) "name as 'action'";
+};
+
+
+type record StateAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.Boolean stateActive optional,
+ XSD.AnyURI stateAction optional,
+ ListOfStateTransitions stateTransitions optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction,
+ Action action_
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ //variant (stateActive) "text 'true' as '1'";
+ //variant (stateActive) "text 'false' as '0'";
+ 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[-].action_) "name as 'action'";
+};
+
+
type record StatsCollect
{
ResourceName resourceName,
@@ -7690,6 +9600,7 @@ type record StatsCollect
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
XSD.String statsCollectID,
XSD.ID collectingEntityID,
@@ -7730,6 +9641,7 @@ type record StatsConfig
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
@@ -7764,6 +9676,7 @@ type record Subscription
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
EventNotificationCriteria eventNotificationCriteria optional,
XSD.PositiveInteger expirationCounter optional,
@@ -7780,6 +9693,9 @@ type record Subscription
EventCat notificationEventCat optional,
XSD.AnyURI subscriberURI optional,
ListOfURIs associatedCrossResourceSub optional,
+ XSD.Boolean notificationStatsEnable,
+ SetOfNotificationStatsInfo notificationStatsInfo optional,
+ XSD.AnyURI primitiveProfileID optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record length(1 .. infinity) of union {
@@ -7795,6 +9711,8 @@ with {
variant (resourceName) "attribute";
//variant (latestNotify) "text 'true' as '1'";
//variant (latestNotify) "text 'false' as '0'";
+ //variant (notificationStatsEnable) "text 'true' as '1'";
+ //variant (notificationStatsEnable) "text 'false' as '0'";
variant (choice) "untagged";
variant (choice.childResource_list) "untagged";
variant (choice.childResource_list[-]) "name as 'childResource'";
@@ -7837,12 +9755,20 @@ type record SvcFwWrapper
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -7876,11 +9802,18 @@ type record SvcFwWrapperAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -7916,12 +9849,20 @@ type record SvcObjWrapper
ListOfURIs dynamicAuthorizationConsultationIDs optional,
ListOfURIs announceTo optional,
ListOfNCNames announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag,
XSD.ID creator optional,
+ XSD.ID custodian optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -7956,11 +9897,18 @@ type record SvcObjWrapperAnnc
Timestamp expirationTime optional,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ AnnounceSyncType announceSyncType optional,
XSD.NonNegativeInteger stateTag optional,
+ GeoCoordinates location optional,
XSD.AnyURI containerDefinition,
XSD.AnyURI ontologyRef optional,
XSD.NonNegativeInteger contentSize optional,
XSD.AnyURI nodeLink optional,
+ XSD.NonNegativeInteger maxNrOfInstances optional,
+ XSD.NonNegativeInteger maxInstanceAge optional,
+ XSD.NonNegativeInteger maxByteSize optional,
+ XSD.NonNegativeInteger currentNrOfInstances optional,
+ XSD.NonNegativeInteger currentByteSize optional,
union {
record length(1 .. infinity) of ChildResourceRef childResource_list,
record of union {
@@ -7995,6 +9943,7 @@ type record TimeSeriesInstance
Timestamp expirationTime,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
AbsRelTimestamp dataGenerationTime,
XSD.AnySimpleType content,
XSD.NonNegativeInteger sequenceNr optional,
@@ -8055,6 +10004,17 @@ with {
};
+type record TimeSeriesNotification
+{
+ MissingDataList missingDataList,
+ XSD.NonNegativeInteger missingDataCurrentNr
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+};
+
+
type record TimeSeries
{
ResourceName resourceName,
@@ -8067,15 +10027,19 @@ type record TimeSeries
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ListOfURIs announceTo optional,
record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
- XSD.ID creator optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID creator,
+ GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances,
XSD.NonNegativeInteger currentByteSize,
XSD.PositiveInteger periodicInterval optional,
+ XSD.NonNegativeInteger periodicIntervalDelta optional,
XSD.Boolean missingDataDetect optional,
XSD.PositiveInteger missingDataMaxNr optional,
MissingDataList missingDataList optional,
@@ -8121,12 +10085,14 @@ type record TimeSeriesAnnc
Timestamp expirationTime,
XSD.AnyURI link,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ GeoCoordinates location optional,
XSD.NonNegativeInteger maxNrOfInstances optional,
XSD.NonNegativeInteger maxByteSize optional,
XSD.NonNegativeInteger maxInstanceAge optional,
XSD.NonNegativeInteger currentNrOfInstances,
XSD.NonNegativeInteger currentByteSize,
XSD.PositiveInteger periodicInterval optional,
+ XSD.NonNegativeInteger periodicIntervalDelta optional,
XSD.PositiveInteger missingDataMaxNr optional,
MissingDataList missingDataList optional,
XSD.NonNegativeInteger missingDataCurrentNr optional,
@@ -8157,6 +10123,96 @@ with {
};
+type record TimeSyncBeacon
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs optional,
+ Timestamp expirationTime,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
+ ListOfURIs announceTo optional,
+ record length(1 .. infinity) of XSD.NCName announcedAttribute optional,
+ AnnounceSyncType announceSyncType optional,
+ XSD.ID beaconRequester optional,
+ BeaconCriteria beaconCriteria,
+ XSD.Duration beaconInterval optional,
+ XSD.Duration beaconThreshold optional,
+ ListOfURIs beaconNotificationURIs,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Subscription subscription,
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ variant (announcedAttribute) "list";
+ 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";
+};
+
+
+type record TimeSyncBeaconAnnc
+{
+ ResourceName resourceName,
+ ResourceType resourceType,
+ XSD.ID resourceID,
+ NhURI parentID,
+ Timestamp creationTime,
+ Timestamp lastModifiedTime,
+ Labels labels optional,
+ AcpType accessControlPolicyIDs,
+ Timestamp expirationTime,
+ XSD.AnyURI link,
+ ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID beaconRequester optional,
+ BeaconCriteria beaconCriteria optional,
+ XSD.Duration beaconInterval optional,
+ XSD.Duration beaconThreshold optional,
+ ListOfURIs beaconNotificationURIs optional,
+ union {
+ record length(1 .. infinity) of ChildResourceRef childResource_list,
+ record length(1 .. infinity) of union {
+ Transaction transaction
+ } choice_list
+ } choice optional
+}
+with {
+ variant "name as uncapitalized";
+ variant "element";
+ variant (resourceName) "attribute";
+ 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";
+};
+
+
+type record TimeSyncBeaconNotification_1
+{
+ XSD.AnyURI timeSyncBeaconReference,
+ Timestamp currentTime,
+ XSD.Duration timeOffset optional
+}
+with {
+ variant "name as 'timeSyncBeaconNotification'";
+};
+
+
type record Token
{
ResourceName resourceName,
@@ -8169,6 +10225,7 @@ type record Token
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
TokenID tokenID,
DynAuthJWT tokenObject,
XSD.String version optional,
@@ -8213,6 +10270,7 @@ type record TransactionMgmt
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
Timestamp transactionLockTime optional,
Timestamp transactionExecuteTime optional,
@@ -8257,6 +10315,7 @@ type record Transaction
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
XSD.ID creator optional,
XSD.String transactionID,
TransactionControl transactionControl,
@@ -8315,6 +10374,7 @@ type record TriggerRequest
AcpType accessControlPolicyIDs optional,
Timestamp expirationTime,
ListOfURIs dynamicAuthorizationConsultationIDs optional,
+ XSD.ID custodian optional,
ExternalID m2M_Ext_ID,
TriggerRecipientID trigger_Recipient_ID,
TriggerPurpose triggerPurpose,
@@ -8347,67 +10407,11 @@ with {
variant (choice.choice_list[-]) "untagged";
};
-type enumerated GeometryType //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 GeoSpatialFunctionType //TODO Manually added until XSD files are updated
-{
- int1(1),
- int2(2),
- int3(3)
-}
-with {
- variant "useNumber";
- variant "name as uncapitalized";
-};
-
-
-type record length(1 .. infinity) of Float ListOfCoordinates //TODO Manually added until XSD files are updated
-with {
- variant "name as uncapitalized";
- variant "list";
-};
-
-
-type record GeoCoordinates //TODO Manually added until XSD files are updated
-{
- GeometryType type_,
- ListOfCoordinates coordinates
-}
-with {
- variant "name as uncapitalized";
- variant "element";
- variant (type_) "name as 'type'";
-};
-
-type record GeoQuery //TODO Manually added until XSD files are updated
-{
- GeometryType geometryType,
- ListOfCoordinates geometry,
- GeoSpatialFunctionType geoSpatialFunction
}
with {
- variant "name as uncapitalized";
- variant "element";
-};
-
- }
- 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"
+ 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"
}