Commit 75e24b22 authored by Carre's avatar Carre
Browse files

Addition of Delete and Subscription resource

parent 49a2b3b1
......@@ -223,6 +223,17 @@ module OneM2M_Templates {
tokenReqIndicator := omit
};
/**
* @desc Base UPDATE request primitive for Ae resource
*/
template (value) RequestPrimitive m_updateAeBase modifies m_update:= {
from_ := PX_AE_ID_STEM,
requestIdentifier := "m_updateAe" & f_rnd(1, 1000000),
primitiveContent:= {
any_1 := {{AE_optional := m_contentUpdateAe}}
}
};
/**
* @desc Base UPDATE request primitive for Container resource
*/
......@@ -555,6 +566,19 @@ module OneM2M_Templates {
}
};
template (value) RequestPrimitive m_createSubscriptionAdvanced( in template (value) ListOfURIs p_notificationURI := {"Not Initialized"},
in template (omit) EventNotificationCriteria p_eventNotificationCriteria := omit,
in template (omit) XSD.PositiveInteger p_expirationCounter := omit,
in template (omit) BatchNotify p_batchNotify := omit,
in template (omit) XSD.Boolean p_latestNotify := omit,
in template (omit) XSD.AnyURI p_subscriberURI := omit) modifies m_create := {
requestIdentifier := "m_createSubscription" & f_rnd(1, 1000000),
resourceType := int23,
primitiveContent := {
any_1 := {{Subscription_optional := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI)}}
}
};
//@Martin
template (value) RequestPrimitive m_createLocationPolicy(XSD.ID p_parentResourceAddress, in template (omit) AcpType p_accessControlPolicyIDs, in template (omit) XSD.Duration locationUpdatePeriod, in template (omit) NodeID locationTargetID, in template (omit) XSD.AnyURI locationServerAddress) modifies m_create := {
to_ := p_parentResourceAddress,
......@@ -874,6 +898,41 @@ module OneM2M_Templates {
choice := omit//NP
};
template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
in template (omit) EventNotificationCriteria p_eventNotificationCriteria,
in template (omit) XSD.PositiveInteger p_expirationCounter,
in template (omit) BatchNotify p_batchNotify,
in template (omit) XSD.Boolean p_latestNotify,
in template (omit) XSD.AnyURI p_subscriberURI,
in template (omit) XSD.String p_name := c_defaultResourceName) := {
resourceName := c_defaultResourceName,//O
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
creator := omit,//O
eventNotificationCriteria := p_eventNotificationCriteria,//O
expirationCounter := p_expirationCounter,//O
notificationURI := p_notificationURI,//M
groupID := omit,//O
notificationForwardingURI := omit,//O
batchNotify := p_batchNotify,//O
rateLimit := omit,//O
preSubscriptionNotify := omit,//O
pendingNotification := omit,//O
notificationStoragePriority := omit,//O
latestNotify := p_latestNotify,//O
notificationContentType := int1, //TODO Set to omit once xsd is fixed,//O
notificationEventCat := omit,//O
subscriberURI := p_subscriberURI,//O
choice := omit//NP
};
/**
* @desc Base primitiveContent for CREATE operation for ContentInstance resource
* @param p_primitiveContent Content for the ContentInstance
......@@ -1802,6 +1861,28 @@ module OneM2M_Templates {
locationID := omit,
ontologyRef := omit
};
template (value) EventNotificationCriteria m_eventNotificationCriteria (in NotificationEventType p_notificationEventType) := {
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
unmodifiedSince := omit,
stateTagSmaller := omit,
stateTagBigger := omit,
expireBefore := omit,
expireAfter := omit,
sizeAbove := omit,
sizeBelow := omit,
operationMonitor_list := {},
attribute_list := {}, // TODO this list should be able to be omited see 9.6.8
notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8
missingData := omit
}
template (value) BatchNotify m_batchNotifyNumber3Duration1 := {
number := 3,
duration := " " //TODO duration has to be set to 1s and match to the Duration regex
}//normaly duration can be omited 6.3.5.6 (TS0004)
}//end group SpecialContents
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment