Skip to content
Snippets Groups Projects

Stf531 dmr

Merged Miguel Angel Reina Ortega requested to merge STF531-DMR into master
+ 940
50
Compare changes
  • Side-by-side
  • Inline
Files
@@ -258,6 +258,18 @@ module OneM2M_Templates {
@@ -258,6 +258,18 @@ module OneM2M_Templates {
}
}
};
};
 
//@ACV
 
/**
 
* @desc Base UPDATE request primitive for ContentInstance resource
 
*/
 
template (value) RequestPrimitive m_updateContentInstanceBase modifies m_update:= {
 
from_ := PX_AE_ID_STEM,
 
requestIdentifier := "m_updateContentInstance" & f_rnd(1, 1000000),
 
primitiveContent:= {
 
any_1 := {{ContentInstance_optional := m_contentUpdateContentInstance}}
 
}
 
};
 
/**
/**
* @desc Base UPDATE request primitive for AccessControlPolicy resource
* @desc Base UPDATE request primitive for AccessControlPolicy resource
*/
*/
@@ -541,14 +553,14 @@ module OneM2M_Templates {
@@ -541,14 +553,14 @@ module OneM2M_Templates {
};
};
/**
/**
* @desc Reception template for CREATE ContainerAnnc
* @desc Base Reception template for CREATE ContainerAnnc
*/
*/
template RequestPrimitive mw_createContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
template RequestPrimitive mw_createContainerAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10003,
resourceType := int10003,
primitiveContent := {
primitiveContent := {
any_1 := {{ContainerAnnc_optional := ?}}
any_1 := {{ContainerAnnc_optional := mw_contentCreateContainerAnncBase}}
}
}
};
};
/**
/**
* @desc Reception template for CREATE FlexContainer
* @desc Reception template for CREATE FlexContainer
@@ -601,6 +613,16 @@ module OneM2M_Templates {
@@ -601,6 +613,16 @@ module OneM2M_Templates {
any_1 := {{ContentInstanceAnnc_optional := ?}}
any_1 := {{ContentInstanceAnnc_optional := ?}}
}
}
};
};
 
 
/**
 
* @desc Base Reception template for CREATE ContentInstanceAnnc
 
*/
 
template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 
resourceType := int10014,
 
primitiveContent := {
 
any_1 := {{ContentInstanceAnnc_optional := mw_contentCreateContentInstanceAnncBase}}
 
}
 
};
/**
/**
@@ -637,6 +659,16 @@ module OneM2M_Templates {
@@ -637,6 +659,16 @@ module OneM2M_Templates {
any_1 := {{GroupAnnc_optional := ?}}
any_1 := {{GroupAnnc_optional := ?}}
}
}
};
};
 
 
/**
 
* @desc Base Reception template for CREATE GroupAnnc
 
*/
 
template RequestPrimitive mw_createGroupAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 
resourceType := int10009,
 
primitiveContent := {
 
any_1 := {{GroupAnnc_optional := mw_contentCreateGroupAnncBase}}
 
}
 
};
/**
/**
* @desc Base CREATE request primitive for MgmtObj resource
* @desc Base CREATE request primitive for MgmtObj resource
@@ -671,6 +703,16 @@ module OneM2M_Templates {
@@ -671,6 +703,16 @@ module OneM2M_Templates {
};
};
/**
/**
 
* @desc Base Reception template for CREATE MgmtObjAnnc
 
*/
 
template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 
resourceType := int10013,
 
primitiveContent := {
 
any_1 := {{MgmtObjAnnc_optional := mw_contentCreateMgmtObjAnncBase}}
 
}
 
};
 
 
/**
* @desc Base CREATE request primitive for Node resource
* @desc Base CREATE request primitive for Node resource
*/
*/
template (value) RequestPrimitive m_createNodeBase modifies m_create := {
template (value) RequestPrimitive m_createNodeBase modifies m_create := {
@@ -753,8 +795,17 @@ module OneM2M_Templates {
@@ -753,8 +795,17 @@ module OneM2M_Templates {
any_1 := {{ScheduleAnnc_optional := ?}}
any_1 := {{ScheduleAnnc_optional := ?}}
}
}
};
};
 
 
/**
 
* @desc Base Reception template for CREATE ScheduleAnnc
 
*/
 
template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 
resourceType := int10018,
 
primitiveContent := {
 
any_1 := {{ScheduleAnnc_optional := mw_contentCreateScheduleAnncBase}}
 
}
 
};
//Added by @Naum
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
from_ := PX_AE_ID_STEM,
from_ := PX_AE_ID_STEM,
requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000),
requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule" & f_rnd(1, 1000000),
@@ -819,8 +870,18 @@ module OneM2M_Templates {
@@ -819,8 +870,18 @@ module OneM2M_Templates {
primitiveContent := {
primitiveContent := {
any_1 := {{LocationPolicyAnnc_optional := ?}}
any_1 := {{LocationPolicyAnnc_optional := ?}}
}
}
};
};
//@Martin
 
/**
 
* @desc Base Reception template for CREATE LocationPolicyAnnc
 
*/
 
template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
 
resourceType := int10010,
 
primitiveContent := {
 
any_1 := {{LocationPolicyAnnc_optional := mw_contentCreateLocationPolicyAnncBase}}
 
}
 
};
 
template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
template (value) RequestPrimitive m_createNotification(in template (value) Representation p_resourcePresentation, in template (omit)NotificationEventType p_notifEventType, in template (omit) XSD.AnyURI p_subscriptionReference, in template (omit) XSD.AnyURI p_notifForwardingURI) modifies m_create := {
requestIdentifier := testcasename() & "-m_createNotification" & f_rnd(1, 1000000),
requestIdentifier := testcasename() & "-m_createNotification" & f_rnd(1, 1000000),
primitiveContent := {
primitiveContent := {
@@ -1184,6 +1245,32 @@ module OneM2M_Templates {
@@ -1184,6 +1245,32 @@ module OneM2M_Templates {
choice := omit//NP
choice := omit//NP
};
};
 
/**
 
* @desc Base reception template of primitiveContent for CREATE operation for GroupAnnc resource
 
*/
 
template GroupAnnc_optional mw_contentCreateGroupAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA
 
accessControlPolicyIDs := ?,//MA
 
expirationTime := ?,//MA M
 
link := ?,
 
dynamicAuthorizationConsultationIDs := *, //OA
 
memberType := *, //OA
 
currentNrOfMembers := *, //OA
 
maxNrOfMembers := *, //OA
 
memberIDs := *, //OA
 
membersAccessControlPolicyIDs := *, //OA
 
memberTypeValidated := *, //OA
 
consistencyStrategy := *, //OA
 
groupName := *, //OA
 
choice := omit //NA
 
};
 
/**
/**
* @desc Base primitiveContent for CREATE operation for MgmtObj resource
* @desc Base primitiveContent for CREATE operation for MgmtObj resource
* @param p_name Resource name
* @param p_name Resource name
@@ -1210,6 +1297,27 @@ module OneM2M_Templates {
@@ -1210,6 +1297,27 @@ module OneM2M_Templates {
};
};
/**
/**
 
* @desc Base reception template of primitiveContent for CREATE operation for MgmtObjAnnc resource
 
*/
 
template MgmtObjAnnc_optional mw_contentCreateMgmtObjAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA
 
accessControlPolicyIDs := ?,//MA
 
expirationTime := ?,//MA M
 
link := ?,
 
dynamicAuthorizationConsultationIDs := *, //OA
 
mgmtDefinition := ?, //MA
 
objectIDs := *, //OA
 
objectPaths := *, //OA
 
description := * //OA
 
};
 
 
/**
* @desc Base primitiveContent for CREATE operation for Node resource
* @desc Base primitiveContent for CREATE operation for Node resource
* @param p_name Resource name
* @param p_name Resource name
* @param p_accessControlPolicyIds ACP IDs for the AE
* @param p_accessControlPolicyIds ACP IDs for the AE
@@ -1269,7 +1377,23 @@ module OneM2M_Templates {
@@ -1269,7 +1377,23 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
announcedAttribute := omit,//O
scheduleElement := p_scheduleElement,//M
scheduleElement := p_scheduleElement,//M
choice := omit//NP
choice := omit//NP
};
};
 
 
/**
 
* @desc Base reception template of primitiveContent for CREATE operation for ScheduleAnnc resource
 
*/
 
template ScheduleAnnc_optional mw_contentCreateScheduleAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA
 
expirationTime := ?,//MA M
 
link := ?,
 
scheduleElement := * //OA
 
};
template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) := {
template (value) ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) := {
resourceName := omit,//TODO TS-0004 7.4.29.1 2 Missing attribute
resourceName := omit,//TODO TS-0004 7.4.29.1 2 Missing attribute
@@ -1395,6 +1519,28 @@ module OneM2M_Templates {
@@ -1395,6 +1519,28 @@ module OneM2M_Templates {
choice := omit //O
choice := omit //O
};
};
 
/**
 
* @desc Base primitiveContent for CREATE operation for ContentInstanceAnnc resource
 
* @param p_primitiveContent Content for the ContentInstanceAnnc
 
*/
 
template ContentInstanceAnnc_optional mw_contentCreateContentInstanceAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA
 
expirationTime := omit,//O NA
 
link := omit, //O NA
 
stateTag := *,// OA
 
contentInfo := *,//OA
 
contentSize := *,//OA
 
ontologyRef := *,//OA
 
content := *, //OA
 
choice := omit //O
 
};
 
/**
/**
* @desc Base primitiveContent for CREATE operation for Container resource
* @desc Base primitiveContent for CREATE operation for Container resource
* @param p_name Resource name
* @param p_name Resource name
@@ -1425,6 +1571,34 @@ module OneM2M_Templates {
@@ -1425,6 +1571,34 @@ module OneM2M_Templates {
choice := omit//NP
choice := omit//NP
};
};
 
/**
 
* @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
 
*/
 
template ContainerAnnc_optional mw_contentCreateContainerAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA M
 
accessControlPolicyIDs := ?,//MA
 
expirationTime := ?,//MA M
 
link := ?, //M
 
dynamicAuthorizationConsultationIDs := *, //OA
 
stateTag := *, //OA
 
maxNrOfInstances := *, //OA
 
maxByteSize := *, //OA
 
maxInstanceAge := *, //OA
 
currentNrOfInstances := *, //OA
 
currentByteSize := *, //OA
 
locationID := *, //OA
 
ontologyRef := *, //OA
 
disableRetrieval := *, //OA
 
choice := omit //NA
 
};
 
 
//@Martin
//@Martin
template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod, in template (value) NodeID p_locationTargetID, in template (value) XSD.AnyURI p_locationServerAddress) := {
template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod, in template (value) NodeID p_locationTargetID, in template (value) XSD.AnyURI p_locationServerAddress) := {
resourceName := c_defaultLocationPolicyResourceName, //O
resourceName := c_defaultLocationPolicyResourceName, //O
@@ -1450,6 +1624,31 @@ module OneM2M_Templates {
@@ -1450,6 +1624,31 @@ module OneM2M_Templates {
};
};
 
//@ACV
 
/**
 
* @desc Base reception template of primitiveContent for CREATE operation for LocationPolicyAnnc resource
 
*/
 
template LocationPolicyAnnc_optional mw_contentCreateLocationPolicyAnncBase := {
 
resourceName := omit,//NA M
 
resourceType := omit,//NA M
 
resourceID := omit,//NA M
 
parentID := omit,//NA M
 
creationTime := omit,//NA M
 
lastModifiedTime := omit,//NA M
 
labels := ?,//MA
 
accessControlPolicyIDs := ?,//MA
 
expirationTime := ?,//MA M
 
link := ?,
 
dynamicAuthorizationConsultationIDs := *, //OA
 
locationSource := *, //OA
 
locationUpdatePeriod := *, //OA
 
locationTargetID := *, //OA
 
locationServer := *, //OA
 
locationContainerID := *, //OA
 
locationContainerName := *, //OA
 
locationStatus := * //OA
 
};
 
//@Martin
//@Martin
template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
in template (omit) NotificationEventType p_notifEventType,
in template (omit) NotificationEventType p_notifEventType,
@@ -1682,6 +1881,31 @@ module OneM2M_Templates {
@@ -1682,6 +1881,31 @@ module OneM2M_Templates {
choice := omit//NP
choice := omit//NP
};
};
 
//@ACV
 
/**
 
* @desc Base primitiveContent for UPDATE operation for ContentInstance resource
 
*/
 
template (value) ContentInstance_optional m_contentUpdateContentInstance := {
 
resourceName := omit,//O
 
resourceType := omit,//NP
 
resourceID := omit,//NP
 
parentID := omit,//NP
 
creationTime := omit,//NP
 
lastModifiedTime := omit,//NP
 
labels := omit,//O
 
expirationTime := omit,//O
 
announceTo := omit,//O
 
announcedAttribute := omit,//O
 
stateTag := omit,//NP
 
creator := omit,//O
 
contentInfo := omit,//O
 
contentSize := omit,//NP
 
contentRef := omit, //O
 
ontologyRef := omit,//O
 
content := omit, //M
 
choice := omit //O
 
};
 
//@Martin
//@Martin
template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
resourceName := omit,//NP
resourceName := omit,//NP
Loading