diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 53edce85d8b35ea8695287be4f880ba6d142a15e..f7a382183b3ca4f8ae5139113af69a3789df2bf6 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -22,35 +22,35 @@ module OneM2M_Templates {
/**
- * @desc Get a converted to string random number
- * @param p_lower Lower limit
+ * @desc Get a converted to string random number
+ * @param p_lower Lower limit
* @param p_upper Upper limit
* @return Random number converted to string
- * @verdict
+ * @verdict
*/
function f_rnd(in integer p_lower, in integer p_upper) return charstring {
- return int2str(float2int(rnd() * int2float(p_upper - p_lower + 1)) + p_lower);
+ return int2str(float2int(rnd() * int2float(p_upper - p_lower + 1)) + p_lower);
}
/* Templates */
group Primitives {
- /**
- * @desc Base template for request sending operations
- * @param p_requestPrimitive
- */
- template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
- primitive := { requestPrimitive := p_requestPrimitive},
- host := PX_SUT_ADDRESS,
- xmlNamespace := PX_XML_NAMESPACE,
- protocolBinding := PX_PROTOCOL_BINDING,
- serialization := PX_SERIALIZATION,
- forcedFields := p_forcedFields
- };
+ /**
+ * @desc Base template for request sending operations
+ * @param p_requestPrimitive
+ */
+ template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeAux_list p_forcedFields := omit) := {
+ primitive := { requestPrimitive := p_requestPrimitive},
+ host := PX_SUT_ADDRESS,
+ xmlNamespace := PX_XML_NAMESPACE,
+ protocolBinding := PX_PROTOCOL_BINDING,
+ serialization := PX_SERIALIZATION,
+ forcedFields := p_forcedFields
+ };
- /**
+ /**
* @desc Base template for response sending operations
* @param p_responsePrimitive
*/
@@ -59,11 +59,11 @@ module OneM2M_Templates {
host := PX_SUT_ADDRESS,
xmlNamespace := PX_XML_NAMESPACE,
protocolBinding := PX_PROTOCOL_BINDING,
- serialization := PX_SERIALIZATION,
+ serialization := PX_SERIALIZATION,
forcedFields := p_forcedFields
};
- /**
+ /**
* @desc Base template for response sending operations
* @param p_responsePrimitive
*/
@@ -72,15 +72,15 @@ module OneM2M_Templates {
host := PX_SUT_ADDRESS,
xmlNamespace := PX_XML_NAMESPACE,
protocolBinding := "HTTP",
- serialization := PX_SERIALIZATION,
+ serialization := PX_SERIALIZATION,
forcedFields := p_forcedFields
};
- template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
- primitive := { requestPrimitive := p_requestPrimitive}
- };
+ template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := {
+ primitive := { requestPrimitive := p_requestPrimitive}
+ };
- /**
+ /**
* @desc Base template for response receiving operations
* @param p_responsePrimitive
*/
@@ -90,7 +90,7 @@ module OneM2M_Templates {
}//end of group primitives
- group RequestPrimitives {
+ group RequestPrimitives {
group Retrieve {
@@ -106,7 +106,7 @@ module OneM2M_Templates {
requestIdentifier := "m_retrieve" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -136,7 +136,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := omit,
primitiveContent := *,
- roleIDs := *,
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -161,12 +161,12 @@ module OneM2M_Templates {
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveAttributeToOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
- operation := int2,
- to_ := p_targetResourceAddress,
- from_ := p_originator,
- requestIdentifier := "m_retrieveResourceAttributeOptionTo" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
+ operation := int2,
+ to_ := p_targetResourceAddress,
+ from_ := p_originator,
+ requestIdentifier := "m_retrieveResourceAttributeOptionTo" & f_rnd(1, 1000000),
+ resourceType := omit,
+ primitiveContent := omit,
roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
@@ -184,11 +184,11 @@ module OneM2M_Templates {
tokenIDs := omit,
localTokenIDs := omit,
tokenRequestIndicator := omit
- };
+ };
/**
* @desc RETRIEVE request primtive containing the target attributes in the primitiveContent field
- * @param p_targetResourceAddress Target resource address
+ * @param p_targetResourceAddress Target resource address
* @param p_attributeList Target attribute list
* @param p_originator Originator (from)
*/
@@ -219,11 +219,11 @@ module OneM2M_Templates {
};
/**
- * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
- * @param p_targetResourceAddress Target resource address
- * @param p_filterCriteria FilterCriteria
- * @param p_originator Originator (from)
- */
+ * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+ * @param p_targetResourceAddress Target resource address
+ * @param p_filterCriteria FilterCriteria
+ * @param p_originator Originator (from)
+ */
template (value) RequestPrimitive m_retrieveFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
filterCriteria := {
@@ -253,10 +253,10 @@ module OneM2M_Templates {
};
/**
- * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
- * @param p_targetResourceAddress Target resource address
- * @param p_filterCriteria FilterCriteria
- * @param p_originator Originator (from)
+ * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+ * @param p_targetResourceAddress Target resource address
+ * @param p_filterCriteria FilterCriteria
+ * @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveFilterCriteria(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterCriteria p_filterCriteria) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
@@ -264,11 +264,11 @@ module OneM2M_Templates {
};
/**
- * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
- * @param p_targetResourceAddress Target resource address
- * @param p_originator Originator (from)
- * @param p_filterUsage FilterUsage
- * @param p_labels Labels
+ * @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
+ * @param p_targetResourceAddress Target resource address
+ * @param p_originator Originator (from)
+ * @param p_filterUsage FilterUsage
+ * @param p_labels Labels
*/
template (value) RequestPrimitive m_retrieveFilterUsageOptionLabel(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterUsage p_filterUsage, in Labels p_labels) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOptionLabel" & f_rnd(1, 1000000),
@@ -287,7 +287,7 @@ module OneM2M_Templates {
sizeBelow := omit,
contentType_list := {},
attribute_list := {},
- filterUsage := p_filterUsage,
+ filterUsage := p_filterUsage,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
@@ -298,10 +298,10 @@ module OneM2M_Templates {
}
};
/**
- * @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
- * @param p_targetResourceAddress Target resource address
- * @param p_filterCriteria FilterCriteria
- * @param p_originator Originator (from)
+ * @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
+ * @param p_targetResourceAddress Target resource address
+ * @param p_filterCriteria FilterCriteria
+ * @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveDiscResTypeFilterUsageOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) DiscResType p_discResType, in template (value) FilterUsage p_filterUsage) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
@@ -333,41 +333,41 @@ module OneM2M_Templates {
};
/**
- * @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
- * @param p_targetResourceAddress Target resource address
- * @param p_filterCriteria FilterCriteria
- * @param p_originator Originator (from)
- */
- template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
- requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
- filterCriteria := {
- createdBefore := omit,
- createdAfter := omit,
- modifiedSince := omit,
- unmodifiedSince := omit,
- stateTagSmaller := omit,
- stateTagBigger := omit,
- expireBefore := omit,
- expireAfter := omit,
- labels := omit,
- resourceType := omit,
- sizeAbove := omit,
- sizeBelow := omit,
- contentType_list := {},
- attribute_list := {},
- filterUsage := omit,
- limit := omit,
- semanticsFilter_list := {},
- filterOperation := omit,
- contentFilterSyntax := omit,
- contentFilterQuery := omit,
- level := omit,
- offset := omit
- }
- };
+ * @desc RETRIEVE request primtive containing the Discovery Type in the discoveryResultType field and Filter Criteria in the filterCriteria field
+ * @param p_targetResourceAddress Target resource address
+ * @param p_filterCriteria FilterCriteria
+ * @param p_originator Originator (from)
+ */
+ template (value) RequestPrimitive m_retrieveInvalidFormatOption(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_retrieve := {
+ requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
+ filterCriteria := {
+ createdBefore := omit,
+ createdAfter := omit,
+ modifiedSince := omit,
+ unmodifiedSince := omit,
+ stateTagSmaller := omit,
+ stateTagBigger := omit,
+ expireBefore := omit,
+ expireAfter := omit,
+ labels := omit,
+ resourceType := omit,
+ sizeAbove := omit,
+ sizeBelow := omit,
+ contentType_list := {},
+ attribute_list := {},
+ filterUsage := omit,
+ limit := omit,
+ semanticsFilter_list := {},
+ filterOperation := omit,
+ contentFilterSyntax := omit,
+ contentFilterQuery := omit,
+ level := omit,
+ offset := omit
+ }
+ };
/**
- * @desc FilterCriteria empty template
+ * @desc FilterCriteria empty template
*/
template (value) FilterCriteria m_filterCriteria := {
createdBefore := omit,
@@ -397,18 +397,18 @@ module OneM2M_Templates {
- }//end group Retrieve
+ }//end group Retrieve
- group Update {
+ group Update {
- template (value) RequestPrimitive m_update := {
+ template (value) RequestPrimitive m_update := {
operation := int3,
to_ := "NotInitialized",
from_ := "NotInitialized",
requestIdentifier := "m_update",
resourceType := omit,
primitiveContent:= omit,
- roleIDs := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -435,7 +435,7 @@ module OneM2M_Templates {
requestIdentifier := ?,
resourceType := ?,
primitiveContent:= ?,
- roleIDs := *,
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -447,7 +447,7 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
- discoveryResultType := *,
+ discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
@@ -485,7 +485,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_updateContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int3,
primitiveContent := {container := ?}
- };
+ };
/**
* @desc Base UPDATE request primitive for ContentInstance resource
@@ -497,7 +497,7 @@ module OneM2M_Templates {
/**
* @desc Base UPDATE request primitive for AccessControlPolicy resource
- */
+ */
template (value) RequestPrimitive m_updateAcpBase modifies m_update := {
requestIdentifier := "m_updateAcp",
primitiveContent:= {accessControlPolicy := m_contentUpdateAcp}
@@ -549,29 +549,29 @@ module OneM2M_Templates {
};
template (value) RequestPrimitive m_updateLocationPolicy(XSD.ID p_locResourceAddress, in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) modifies m_update := {
- to_ := p_locResourceAddress,
- requestIdentifier := "m_updateLocationPolicy",
- primitiveContent := {locationPolicy := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod)}
- };
+ to_ := p_locResourceAddress,
+ requestIdentifier := "m_updateLocationPolicy",
+ primitiveContent := {locationPolicy := m_contentUpdateLocationPolicy(p_accessControlPolicyIds, p_locationUpdatePeriod)}
+ };
- template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
+ template (value) RequestPrimitive m_updateNodeBase modifies m_update := {
requestIdentifier := "m_updateNode",
primitiveContent:= {node := m_contentUpdateNode}
- }
+ }
- template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
- requestIdentifier := "m_updateRemoteCSEBase",
- primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
- }
+ template (value) RequestPrimitive m_updateRemoteCSEBase modifies m_update := {
+ requestIdentifier := "m_updateRemoteCSEBase",
+ primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
+ }
template (value) RequestPrimitive m_updateAEAnncBase modifies m_update:= {
requestIdentifier := testcasename() & "-m_updateAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
};
- }//end group Update
+ }//end group Update
- group Create {
+ group Create {
template (value) RequestPrimitive m_create := {
operation := int1,
@@ -667,13 +667,13 @@ module OneM2M_Templates {
template RequestPrimitive mw_createAe(template XSD.ID p_from := *, template XSD.ID p_to := ?, template AE_optional p_ae := ?) modifies mw_create := {
resourceType := int2,
primitiveContent := {aE := p_ae}
- };
+ };
- template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
- from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
+ template (value) RequestPrimitive m_createAeAux(template (omit) AcpType p_accessControlPolicyIds := omit, in template (omit) PoaList p_poaList) modifies m_create := {
+ from_ := PX_AE1_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAe",
- resourceType := int2,
- primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
+ resourceType := int2,
+ primitiveContent := {aE := m_contentCreateAe(p_accessControlPolicyIds, c_aeAuxName, -, p_poaList)}
};
/**
@@ -685,12 +685,12 @@ module OneM2M_Templates {
primitiveContent := {accessControlPolicy := m_contentCreateAcp ()}
};
- template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
- to_ := p_parentResourceAddress,
+ template (value) RequestPrimitive m_createAcp(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63) modifies m_create := {
+ to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createAcp",
- resourceType := int1,
- primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
- };
+ resourceType := int1,
+ primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_name, p_acor, p_allowedOperations)}
+ };
/**
* @desc Reception template for CREATE AcpAnnc
@@ -706,17 +706,17 @@ module OneM2M_Templates {
/**
* @desc Base CREATE request primitive for AccessControlPolicy resource (AUX)
*/
- template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) modifies m_create := {
+ template (value) RequestPrimitive m_createAcpAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) modifies m_create := {
requestIdentifier := testcasename() & "-m_createAcpAux",
- resourceType := int1,
- primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
- };
+ resourceType := int1,
+ primitiveContent := {accessControlPolicy := m_contentCreateAcp (p_acpName, p_acor, p_allowedOperations)}
+ };
/*template (value) RequestPrimitive m_createCSEBase (in ServiceSubscribedAppRule p_serviceSubscribedAppRule) modifies m_create := {
- from_ := PX_SUPER_USER,
- requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
- resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
- primitiveContent := {cSEBase := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
+ from_ := PX_SUPER_USER,
+ requestIdentifier := testcasename() & "-m_createCSE" & f_rnd(1, 1000000),
+ resourceType := int1,//FIXME Is this the value for CSEBase? In any case, this template is not used at all
+ primitiveContent := {cSEBase := m_contentCreateCSEBase (p_serviceSubscribedAppRule)}
};*/
/**
@@ -753,7 +753,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int16,
primitiveContent := {remoteCSE := ?} //{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
- };
+ };
/**
* @desc CREATE request primitive for remoteCSE resource
@@ -770,12 +770,12 @@ module OneM2M_Templates {
primitiveContent := {container := m_contentCreateContainer(omit)}
};
- template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
- to_ := p_parentResourceAddress,
+ template (value) RequestPrimitive m_createContainer(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_resourceName := c_defaultContainerResourceName) modifies m_create := {
+ to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createContainer",
- resourceType := int3,
- primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
- };
+ resourceType := int3,
+ primitiveContent := {container := m_contentCreateContainer(p_resourceName)}
+ };
/**
* @desc Reception template for CREATE Container
@@ -783,7 +783,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int3,
primitiveContent := {container := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE ContainerAnnc
@@ -797,9 +797,9 @@ module OneM2M_Templates {
* @desc Reception template for CREATE FlexContainer
*/
template RequestPrimitive mw_createFlexContainer(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
- resourceType := int28,
+ resourceType := int28,
primitiveContent := {flexContainer := ?}
- };
+ };
/**
* @desc Reception template for CREATE GenericInterworkingOperationInstance
@@ -807,7 +807,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createGenericIwkOpInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int28, // FIXME: not found in TS004
primitiveContent := {genericInterworkingOperationInstance := ?}
- };
+ };
/**
* @desc Base CREATE request primitive for Content Instance resource
@@ -825,13 +825,13 @@ module OneM2M_Templates {
primitiveContent := {contentInstance := m_contentCreateContentInstance(omit)}
};
- template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
- to_ := p_parentResourceAddress,
- from_ := "admin:admin",
+ template (value) RequestPrimitive m_createContentInstance(XSD.ID p_parentResourceAddress, XSD.String p_primitiveContent) modifies m_create := {
+ to_ := p_parentResourceAddress,
+ from_ := "admin:admin",
requestIdentifier := testcasename() & "-m_createContentInstance",
- resourceType := int4,
- primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
- };
+ resourceType := int4,
+ primitiveContent := {contentInstance := m_contentCreateContentInstance(-, p_primitiveContent)}
+ };
/**
* @desc Reception template for CREATE ContentInstanceAnnc
@@ -839,7 +839,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createContentInstanceAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
primitiveContent := {contentInstanceAnnc := ?}
- };
+ };
/**
* @desc Reception template for CREATE ContentInstance
@@ -847,7 +847,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createContentInstance(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int4,
primitiveContent := {contentInstance := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE ContentInstanceAnnc
@@ -855,15 +855,15 @@ module OneM2M_Templates {
template RequestPrimitive mw_createContentInstanceAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
primitiveContent := {contentInstanceAnnc := mw_contentCreateContentInstanceAnncBase}
- };
+ };
/**
* @desc Base CREATE request primitive for Delivery resource
*/
/*template (value) RequestPrimitive m_createDeliveryBase modifies m_create := {
- requestIdentifier := testcasename() & "-m_createDelivery" & f_rnd(1, 1000000),
- resourceType := int6,
- primitiveContent := {delivery := m_contentCreateDelivery()}
+ requestIdentifier := testcasename() & "-m_createDelivery" & f_rnd(1, 1000000),
+ resourceType := int6,
+ primitiveContent := {delivery := m_contentCreateDelivery()}
};*/
@@ -876,17 +876,17 @@ module OneM2M_Templates {
primitiveContent := {group_ := m_contentCreateGroup (1, {"NotInitialized"}, omit, omit)} //TODO: p_resourceId
};
- template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
- in template (value) ListOfURIs p_memberIds := {"NotInitialized"},
- in template (omit) AcpType p_accessControlPolicyIds,
- in template (omit) MemberType p_memberType := omit,
- in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
- in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
- in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
+ template (value) RequestPrimitive m_createGroup(in template (value) XSD.NonNegativeInteger p_maxNrOfMembers,
+ in template (value) ListOfURIs p_memberIds := {"NotInitialized"},
+ in template (omit) AcpType p_accessControlPolicyIds,
+ in template (omit) MemberType p_memberType := omit,
+ in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
+ in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
+ in template (omit) XSD.String p_name := "MyGroup") modifies m_create := {
requestIdentifier := testcasename() & "-m_createGroup",
- resourceType := int9,
- primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId
- };
+ resourceType := int9,
+ primitiveContent := {group_ := m_contentCreateGroup (p_maxNrOfMembers, p_memberIds, p_accessControlPolicyIds, p_memberType, p_consistencyStrategy, p_membersAccessControlPolicyIDs, p_name)} //TODO: p_resourceId
+ };
/**
* @desc Reception template for CREATE GroupAnnc
@@ -894,7 +894,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10009,
primitiveContent := {groupAnnc := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE GroupAnnc
@@ -937,7 +937,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createMgmtObjAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10013,
primitiveContent := {announcedMgmtResource := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE MgmtObjAnnc
@@ -945,7 +945,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createMgmtObjAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10013,
primitiveContent := {announcedMgmtResource := mw_contentCreateMgmtObjAnncBase}
- };
+ };
/**
* @desc Base CREATE request primitive for Node resource
@@ -971,7 +971,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createNodeAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10014,
primitiveContent := {nodeAnnc := ?}
- };
+ };
/**
* @desc Base CREATE request primitive for PollingChannel resource
@@ -982,29 +982,29 @@ module OneM2M_Templates {
primitiveContent := {pollingChannel := m_contentCreatePollingChannel (-)}
};
- template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
- to_ := p_parentResourceAddress,
- from_ := p_originatorId,
+ template (value) RequestPrimitive m_createPollingChannel(XSD.ID p_parentResourceAddress, in template (value)XSD.ID p_originatorId) modifies m_create := {
+ to_ := p_parentResourceAddress,
+ from_ := p_originatorId,
requestIdentifier := testcasename() & "-m_createPollingChannel",
- resourceType := int15,
- primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
- };
+ resourceType := int15,
+ primitiveContent := {pollingChannel := m_contentCreatePollingChannel ()}
+ };
/**
* @desc Base CREATE request primitive for Schedule resource
*/
- template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
+ template (value) RequestPrimitive m_createScheduleBase modifies m_create := {
requestIdentifier := testcasename() & "-m_createSchedule",
- resourceType := int18,
- primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
- };
+ resourceType := int18,
+ primitiveContent := {schedule := m_contentCreateSchedule ({{"0 0 0,1,2 1 1 * *"}})}
+ };
- template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
- to_ := p_parentResourceAddress,
+ template (value) RequestPrimitive m_createSchedule(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ScheduleEntries p_scheduleElement ) modifies m_create := {
+ to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createSchedule",
- resourceType := int18,
- primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
- };
+ resourceType := int18,
+ primitiveContent := {schedule := m_contentCreateSchedule (p_scheduleElement, p_name)}
+ };
/**
* @desc Reception template for CREATE ScheduleAnnc
@@ -1012,7 +1012,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createScheduleAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10018,
primitiveContent := {scheduleAnnc := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE ScheduleAnnc
@@ -1020,7 +1020,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createScheduleAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10018,
primitiveContent := {scheduleAnnc := mw_contentCreateScheduleAnncBase}
- };
+ };
template (value) RequestPrimitive m_createServiceSubscribedAppRule (in ListOfM2MID p_applicableCredIDs, in ListOfM2MID p_allowedAppIDs, in ListOfM2MID p_allowedAEs) modifies m_create := {
requestIdentifier := testcasename() & "-m_createServiceSubscribedAppRule",
@@ -1046,14 +1046,14 @@ module OneM2M_Templates {
primitiveContent := {subscription := m_contentCreateSubscription ({"NotInitialized"})}
};
- template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
- to_ := p_parentResourceAddress,
+ template (value) RequestPrimitive m_createSubscription(XSD.ID p_parentResourceAddress, in template (omit) XSD.String p_name, in template (value) ListOfURIs p_notificationURI := {"NotInitialized"}) modifies m_create := {
+ to_ := p_parentResourceAddress,
requestIdentifier := testcasename() & "-m_createSubscription",
- resourceType := int23,
- primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
- };
+ resourceType := int23,
+ primitiveContent := {subscription := m_contentCreateSubscription (p_notificationURI, p_name)}
+ };
- /**
+ /**
* @desc Reception template for CREATE Subscription
*/
template RequestPrimitive mw_createSubscription(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
@@ -1061,20 +1061,20 @@ module OneM2M_Templates {
primitiveContent := {subscription := ?}
};
- template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
- in template (omit) XSD.String p_name := omit,
- in template (value) ListOfURIs p_notificationURI,
- 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,
- in template (omit) NotificationContentType p_notificationContentType := int1,
- in template (omit) PendingNotification p_pendingNotification) modifies m_createSubscription := {
+ template (value) RequestPrimitive m_createSubscriptionAdvanced( XSD.ID p_parentResourceAddress,
+ in template (omit) XSD.String p_name := omit,
+ in template (value) ListOfURIs p_notificationURI,
+ 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,
+ in template (omit) NotificationContentType p_notificationContentType := int1,
+ in template (omit) PendingNotification p_pendingNotification) modifies m_createSubscription := {
primitiveContent := {subscription := m_contentCreateSubscriptionAdvanced (p_notificationURI, p_name, p_eventNotificationCriteria, p_expirationCounter, p_batchNotify, p_latestNotify, p_subscriberURI, p_notificationContentType, p_pendingNotification)}
};
- /**
+ /**
* @desc Base CREATE request primitive for Location Policy resource
*/
template (value) RequestPrimitive m_createLocationPolicyBase modifies m_create := {
@@ -1086,10 +1086,10 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createLocationPolicy(in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) modifies m_create := {
requestIdentifier := testcasename() & "-m_createLocationPolicy", //the requestIdentifier is supposed to be set similar as "C190XX7T/001" by prepending the AE-ID-Stem and slash(‘/’) in front of it
- resourceType := int10,
- primitiveContent := {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
- resultContent := int1//default
- };
+ resourceType := int10,
+ primitiveContent := {locationPolicy := m_contentCreateLocationPolicy(p_locationSource, p_accessControlPolicyIds, p_locationUpdatePeriod, p_locationTargetID, p_locationServerAddress) },
+ resultContent := int1//default
+ };
/**
* @desc Reception template for CREATE LocationPolicyAnnc
@@ -1097,7 +1097,7 @@ module OneM2M_Templates {
template RequestPrimitive mw_createLocationPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10010,
primitiveContent := {locationPolicyAnnc := ?}
- };
+ };
/**
* @desc Base Reception template for CREATE LocationPolicyAnnc
@@ -1105,14 +1105,14 @@ module OneM2M_Templates {
template RequestPrimitive mw_createLocationPolicyAnncBase(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
resourceType := int10010,
primitiveContent := {locationPolicyAnnc := 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 := {
- requestIdentifier := testcasename() & "-m_createNotification",
- primitiveContent := {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
- resultContent := int1 //default
+ 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",
+ primitiveContent := {notification := m_contentCreateNotification(p_resourcePresentation, p_notifEventType, p_subscriptionReference, p_notifForwardingURI)},
+ resultContent := int1 //default
- };
+ };
/**
* @desc Reception template for SemanticDescriptor creation
@@ -1149,18 +1149,18 @@ module OneM2M_Templates {
primitiveContent := {m2mServiceSubscriptionProfile := m_contentCreatem2mServiceSubscriptionProfileBase}
};
- }//end group Create
+ }//end group Create
- group Delete {
+ group Delete {
template (value) RequestPrimitive m_delete(XSD.ID p_resourceAddress, in XSD.ID p_originator := PX_SUPER_AE_ID) := {
- operation := int4,
- to_ := p_resourceAddress,
- from_ := p_originator,
+ operation := int4,
+ to_ := p_resourceAddress,
+ from_ := p_originator,
requestIdentifier := testcasename() & "-m_delete" & f_rnd(1, 1000000),
- resourceType := omit,
- primitiveContent := omit,
- roleIDs := omit,
+ resourceType := omit,
+ primitiveContent := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -1175,7 +1175,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := omit,
+ localTokenIDs := omit,
tokenRequestIndicator := omit
};
@@ -1185,8 +1185,8 @@ module OneM2M_Templates {
from_ := ?,
requestIdentifier := ?,
resourceType := omit,
- primitiveContent := omit,
- roleIDs := *,
+ primitiveContent := omit,
+ roleIDs := *,
originatingTimestamp := *,
requestExpirationTimestamp := *,
resultExpirationTimestamp := *,
@@ -1198,16 +1198,16 @@ module OneM2M_Templates {
deliveryAggregation := *,
groupRequestIdentifier := *,
filterCriteria := *,
- discoveryResultType := *,
+ discoveryResultType := *,
tokens := *,
tokenIDs := *,
localTokenIDs := *,
tokenRequestIndicator := *
- };
+ };
- }//end group Delete
+ }//end group Delete
- group Notify {
+ group Notify {
/**
* @desc Base NOTIFY request primitive
@@ -1267,9 +1267,9 @@ module OneM2M_Templates {
tokenRequestIndicator := omit
};
- /**
- * @desc Base NOTIFY request primitive
- */
+ /**
+ * @desc Base NOTIFY request primitive
+ */
template RequestPrimitive mw_notify := {
operation := int5,
to_ := ?,
@@ -1314,7 +1314,7 @@ module OneM2M_Templates {
- }//end of group Notify
+ }//end of group Notify
}//end group RequestPrimitives
group ContentCreate {
@@ -1331,8 +1331,8 @@ module OneM2M_Templates {
contentInstance := p_contentInstance
}
- template PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
- cSEBase := p_cSEBase
+ template PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
+ cSEBase := p_cSEBase
}
template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
@@ -1340,6 +1340,20 @@ module OneM2M_Templates {
}
template PrimitiveContent mw_primitiveContent := ?;
+
+ /**
+ * @desc SecurityInfo content
+ * @param p_securityInfoType security type integer
+ */
+ template SecurityInfo m_contentSecurityInfo (in SecurityInfoType p_securityInfoType) := {
+ securityInfoType := p_securityInfoType,
+ dasRequest := omit,
+ dasResponse := omit,
+ esprimRandObject := omit,
+ esprimObject := omit,
+ escertkeMessage := omit
+ }
+
/**
* @desc Base primitiveContent for CREATE operation for AEAnnc resource
@@ -1349,7 +1363,7 @@ module OneM2M_Templates {
* @param p_nodeLink Node link
*/
template AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_APP_ID, in template (omit) XSD.AnyURI p_nodeLink := omit) := {
- resourceName := omit,//O TODO
+ resourceName := omit,//O TODO
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
@@ -1359,7 +1373,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := "20301231T012345",//O
link := omit,//M TODO Put the right value
- dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
+ dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
appName := omit,//O
app_ID := p_appId,//M
aE_ID := omit,//NP
@@ -1370,7 +1384,7 @@ module OneM2M_Templates {
contentSerialization := omit,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
choice := omit//NP
- };
+ };
/**
* @desc Base reception template of primitiveContent for CREATE operation for AEAnnc resource
@@ -1380,17 +1394,17 @@ module OneM2M_Templates {
* @param p_nodeLink Node link
*/
template AEAnnc_optional mw_contentCreateAEAnnc (in template Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
- 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 := p_labels,//MA
- accessControlPolicyIDs := p_accessControlPolicyIds,//MA
- expirationTime := ?,//MA M
+ 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 := p_labels,//MA
+ accessControlPolicyIDs := p_accessControlPolicyIds,//MA
+ expirationTime := ?,//MA M
link := p_link,//M
- dynamicAuthorizationConsultationIDs := omit, //OA
+ dynamicAuthorizationConsultationIDs := omit, //OA
appName := omit,//OA
app_ID := omit,//OA
aE_ID := omit,//OA
@@ -1401,14 +1415,14 @@ module OneM2M_Templates {
contentSerialization := omit,//OA
e2eSecInfo := ?, //MA
choice := omit//NA
- };
-
- /**
- * @desc Base primitiveContent for CREATE operation for AE resource
- * @param p_name Resource name
- * @param p_accessControlPolicyIds ACP IDs for the AE
- */
- template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAeResourceName, in template (omit) XSD.ID p_appId := PX_APP_ID, in template (omit) PoaList p_poaList) := {
+ };
+
+ /**
+ * @desc Base primitiveContent for CREATE operation for AE resource
+ * @param p_name Resource name
+ * @param p_accessControlPolicyIds ACP IDs for the AE
+ */
+ template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.String p_name := c_defaultAeResourceName, in template (omit) XSD.ID p_appId := PX_APP_ID, in template (omit) PoaList p_poaList) := {
resourceName := p_name,//O
resourceType := omit,//NP
@@ -1419,28 +1433,28 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
- announceTo := omit,//O
- announcedAttribute := omit,//O
- appName := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //O
+ announceTo := omit,//O
+ announcedAttribute := omit,//O
+ appName := omit,//O
app_ID := p_appId,//M
- aE_ID := omit,//NP
- pointOfAccess := p_poaList, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
- ontologyRef := omit,//O
- nodeLink := omit,//NP
- requestReachability := true,//M
- contentSerialization := omit,//O
+ aE_ID := omit,//NP
+ pointOfAccess := p_poaList, //O {"http://127.0.0.1:1400/monitor"},//{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
+ ontologyRef := omit,//O
+ nodeLink := omit,//NP
+ requestReachability := true,//M
+ contentSerialization := omit,//O
e2eSecInfo := omit, //O
- choice := omit//NP
- };
+ choice := omit//NP
+ };
- /**
- * @desc Base primitiveContent for CREATE operation for AccessControlPolicy resource
- * @param p_name Resource name
- * @param p_acor Allowed originators
- * @param p_allowedOperations Allowed operations
- */
- template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for AccessControlPolicy resource
+ * @param p_name Resource name
+ * @param p_acor Allowed originators
+ * @param p_allowedOperations Allowed operations
+ */
+ template (value) AccessControlPolicy_optional m_contentCreateAcp (in template (omit) XSD.String p_name := c_defaultAccessControlPolicyResourceName, in template (value) ListOfURIs p_acor := PX_ACOR, in template (value) AccessControlOperations p_allowedOperations := int63 ) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1477,36 +1491,36 @@ module OneM2M_Templates {
privileges := *,//MA
selfPrivileges := *,//MA
choice := omit//NA
- };
+ };
template (value) AccessControlRule m_createAcr (in template (value) ListOfURIs p_acor, in template (value) AccessControlOperations p_allowedOperations) := {
accessControlOriginators := p_acor,//{"*"},//{PX_AE_ID_STEM}, //{"admin:admin"},
accessControlOperations := p_allowedOperations,
accessControlContexts_list := {},
- accessControlAuthenticationFlag := omit,
+ accessControlAuthenticationFlag := omit,
accessControlObjectDetails_list := {}
}
/*template (value) CSEBase_optional m_contentCreateCSEBase (in template (value) ServiceSubscribedAppRule p_serviceSubscribedAppRule) := {
- resourceName := omit,
- resourceType := omit,
- resourceID := omit,
- parentID := omit,
- creationTime := omit,
- lastModifiedTime := omit,
- labels := omit,
- accessControlPolicyIDs := omit,
- cseType := omit,
- cSE_ID := omit,
- supportedResourceType := omit,
- pointOfAccess := omit,
- nodeLink := omit,
- e2eSecInfo := omit,
- choice := {
- choice_list := {{
- serviceSubscribedAppRule := p_serviceSubscribedAppRule
- }}
- }
+ resourceName := omit,
+ resourceType := omit,
+ resourceID := omit,
+ parentID := omit,
+ creationTime := omit,
+ lastModifiedTime := omit,
+ labels := omit,
+ accessControlPolicyIDs := omit,
+ cseType := omit,
+ cSE_ID := omit,
+ supportedResourceType := omit,
+ pointOfAccess := omit,
+ nodeLink := omit,
+ e2eSecInfo := omit,
+ choice := {
+ choice_list := {{
+ serviceSubscribedAppRule := p_serviceSubscribedAppRule
+ }}
+ }
}*/
/**
@@ -1528,7 +1542,7 @@ module OneM2M_Templates {
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
- e2eSecInfo := omit,
+ e2eSecInfo := omit,
choice := omit
};
@@ -1537,13 +1551,13 @@ module OneM2M_Templates {
* @param p_accessControlPolicyIds ACP IDs for the PollingChannel
* @param p_name Resource name
*/
- template (value) Delivery_optional m_contentCreateDelivery (in template (omit) XSD.String p_name := c_defaultDeliveryResourceName,
- in template (omit) AcpType p_accessControlPolicyIds,
- in template (value) XSD.ID p_source,
- in template (value) XSD.ID p_target,
- in template (value) Timestamp p_lifespan,
- in template (value) EventCat p_eventCat,
- in template (value) DeliveryMetaData p_deliveryMetaData) := {
+ template (value) Delivery_optional m_contentCreateDelivery (in template (omit) XSD.String p_name := c_defaultDeliveryResourceName,
+ in template (omit) AcpType p_accessControlPolicyIds,
+ in template (value) XSD.ID p_source,
+ in template (value) XSD.ID p_target,
+ in template (value) Timestamp p_lifespan,
+ in template (value) EventCat p_eventCat,
+ in template (value) DeliveryMetaData p_deliveryMetaData) := {
resourceName := p_name,//O
resourceType := omit,//NP
@@ -1564,22 +1578,22 @@ module OneM2M_Templates {
aggregatedRequest := omit,//O
choice := omit//NP
- };
+ };
- /**
- * @desc Base primitiveContent for CREATE operation for Group resource
- * @param p_maxNrOfMembers Max number of members
- * @param p_memberIds Member IDs
- * @param p_accessControlPolicyIds ACP IDs for the Group
- * @param p_name Resource name
- */
- template (value) Group_optional m_contentCreateGroup ( in template (value) XSD.PositiveInteger p_maxNrOfMembers,
- in template (value) ListOfURIs p_memberIds,
- in template (omit) AcpType p_accessControlPolicyIds,
- in template (omit) MemberType p_memberType := omit,
- in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
- in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
- in template (omit) XSD.String p_name := c_defaultGroupResourceName) := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for Group resource
+ * @param p_maxNrOfMembers Max number of members
+ * @param p_memberIds Member IDs
+ * @param p_accessControlPolicyIds ACP IDs for the Group
+ * @param p_name Resource name
+ */
+ template (value) Group_optional m_contentCreateGroup ( in template (value) XSD.PositiveInteger p_maxNrOfMembers,
+ in template (value) ListOfURIs p_memberIds,
+ in template (omit) AcpType p_accessControlPolicyIds,
+ in template (omit) MemberType p_memberType := omit,
+ in template (omit) ConsistencyStrategy p_consistencyStrategy := omit,
+ in template (omit) ListOfURIs p_membersAccessControlPolicyIDs := omit,
+ in template (omit) XSD.String p_name := c_defaultGroupResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1589,7 +1603,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//O
@@ -1603,34 +1617,34 @@ module OneM2M_Templates {
groupName := omit,//O
semanticSupportIndicator := omit,//O
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
- semanticSupportIndicator := *,//OA
- choice := omit //NA
- };
+ /**
+ * @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
+ semanticSupportIndicator := *,//OA
+ choice := omit //NA
+ };
/**
* @desc Base primitiveContent for CREATE operation for MgmtObj resource
@@ -1655,7 +1669,7 @@ module OneM2M_Templates {
objectIDs := omit,//O
objectPaths := omit,//O
description := omit//O
- };
+ };
/**
* @desc Base primitiveContent for CREATE operation for MgmtCmd resource
@@ -1726,32 +1740,32 @@ module OneM2M_Templates {
hostedCSELink := omit,//O
mgmtClientAddress := omit,//O
choice := omit//O
- };
+ };
- /**
- * @desc Base primitiveContent for CREATE operation for PollingChannel resource
- * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
- * @param p_name Resource name
- */
- template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) XSD.String p_name := c_defaultPollingChannelResourceName) := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for PollingChannel resource
+ * @param p_accessControlPolicyIds ACP IDs for the PollingChannel
+ * @param p_name Resource name
+ */
+ template (value) PollingChannel_optional m_contentCreatePollingChannel (in template (omit) XSD.String p_name := c_defaultPollingChannelResourceName) := {
resourceName := p_name,//O
- resourceType := omit,//NP
- resourceID := omit,//NP
- parentID := omit,//NP
- creationTime := omit,//NP
- lastModifiedTime := omit,//NP
- labels := omit,//O
- expirationTime := omit//O
- };
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := omit,//O
+ expirationTime := omit//O
+ };
- /**
- * @desc Base primitiveContent for CREATE operation for Schedule resource
- * @param p_scheduleElement Schedule
- * @param p_name Resource name
- */
- template (value) Schedule_optional m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement,
- in template (omit) XSD.String p_name := c_defaultScheduleResourceName) := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for Schedule resource
+ * @param p_scheduleElement Schedule
+ * @param p_name Resource name
+ */
+ template (value) Schedule_optional m_contentCreateSchedule (in template (value) ScheduleEntries p_scheduleElement,
+ in template (omit) XSD.String p_name := c_defaultScheduleResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1764,7 +1778,7 @@ module OneM2M_Templates {
announcedAttribute := omit,//O
scheduleElement := p_scheduleElement,//M
choice := omit//NP
- };
+ };
/**
* @desc Base reception template of primitiveContent for CREATE operation for ScheduleAnnc resource
@@ -1780,10 +1794,10 @@ module OneM2M_Templates {
expirationTime := ?,//MA M
link := ?,
scheduleElement := * //OA
- };
+ };
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
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
@@ -1792,7 +1806,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
applicableCredIDs := p_applicableCredIDs,//O
allowedApp_IDs := p_allowedAppIDs,//O
allowedAEs := p_allowedAEs,//O
@@ -1817,16 +1831,16 @@ module OneM2M_Templates {
dynamicAuthorizationConsultationIDs := omit,//O
creator := omit,//O
choice := omit//O
- };
+ };
- /**
- * @desc Base primitiveContent for CREATE operation for Subscription resource
- * @param p_notificationURI Notification URI
- * @param p_name Resource name
- */
- template (value) Subscription_optional m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI,
- in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName) := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for Subscription resource
+ * @param p_notificationURI Notification URI
+ * @param p_name Resource name
+ */
+ template (value) Subscription_optional m_contentCreateSubscription (in template (value) ListOfURIs p_notificationURI,
+ in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName) := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1836,7 +1850,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
@@ -1853,17 +1867,17 @@ module OneM2M_Templates {
notificationEventCat := omit,//O
subscriberURI := omit,//O
choice := omit//NP
- };
+ };
template (value) Subscription_optional m_contentCreateSubscriptionAdvanced (in template (value) ListOfURIs p_notificationURI,
- in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
- 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) NotificationContentType p_notificationContentType,
- in template (omit) PendingNotification p_pendingNotification) modifies m_contentCreateSubscription := {
+ in template (omit) XSD.String p_name := c_defaultSubscriptionResourceName,
+ 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) NotificationContentType p_notificationContentType,
+ in template (omit) PendingNotification p_pendingNotification) modifies m_contentCreateSubscription := {
eventNotificationCriteria := p_eventNotificationCriteria,//O
expirationCounter := p_expirationCounter,//O
batchNotify := p_batchNotify,//O
@@ -1871,7 +1885,7 @@ module OneM2M_Templates {
latestNotify := p_latestNotify,//O
notificationContentType := p_notificationContentType, //TODO Set to omit once xsd is fixed,//O
subscriberURI := p_subscriberURI//O
- };
+ };
template (value) EventNotificationCriteria m_eventNotificationCriteria ( in EventNotificationCriteria.notificationEventType_list p_notificationEventType_list := {}, template (omit) EventNotificationCriteria.attribute p_attribute_list := omit) := { //the parameter should be a list of NotificationEventTypeEventType
createdBefore := omit,
@@ -1885,25 +1899,25 @@ module OneM2M_Templates {
sizeAbove := omit,
sizeBelow := omit,
operationMonitor_list := {},
- attribute := p_attribute_list,
+ attribute := p_attribute_list,
notificationEventType_list := p_notificationEventType_list,// TODO this list should be able to be omited see 9.6.8 (TS0001)
missingData := omit
};
template (value) BatchNotify m_batchNotify (in XSD.NonNegativeInteger p_number, in XSD.Duration p_duration := "PT20S") := {
number := p_number,
- duration := p_duration //TODO duration has to be set to 1s and match to the Duration regex
+ duration := p_duration //TODO duration has to be set to 1s and match to the Duration regex
};
//normaly duration can be omited
- /**
- * @desc Base primitiveContent for CREATE operation for ContentInstance resource
- * @param p_primitiveContent Content for the ContentInstance
- */
- template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) XSD.String p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
+ /**
+ * @desc Base primitiveContent for CREATE operation for ContentInstance resource
+ * @param p_primitiveContent Content for the ContentInstance
+ */
+ template (value) ContentInstance_optional m_contentCreateContentInstance(in template (omit) XSD.String p_name := c_defaultContentInstanceResourceName, XSD.String p_primitiveContent := "AnyValue") := {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1946,11 +1960,11 @@ module OneM2M_Templates {
choice := omit //O
};
- /**
- * @desc Base primitiveContent for CREATE operation for Container resource
- * @param p_name Resource name
- */
- template (value) Container_optional m_contentCreateContainer (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
+ /**
+ * @desc Base primitiveContent for CREATE operation for Container resource
+ * @param p_name Resource name
+ */
+ template (value) Container_optional m_contentCreateContainer (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1960,7 +1974,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
@@ -1974,7 +1988,7 @@ module OneM2M_Templates {
ontologyRef := omit,//O
disableRetrieval := omit, //O
choice := omit//NP
- };
+ };
/**
* @desc Base primitiveContent for CREATE operation for Container resource
@@ -2007,8 +2021,8 @@ module OneM2M_Templates {
};
/**
- * @desc Base reception template of primitiveContent for CREATE operation for ContainerAnnc resource
- */
+ * @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
@@ -2034,116 +2048,116 @@ module OneM2M_Templates {
};
template (value) LocationPolicy_optional m_contentCreateLocationPolicy (in template (value) LocationSource p_locationSource, in template (omit) AcpType p_accessControlPolicyIds, in template (omit) XSD.Duration p_locationUpdatePeriod, in template (omit) LocationTargetID p_locationTargetID, in template (omit) XSD.AnyURI p_locationServerAddress) := {
- resourceName := c_defaultLocationPolicyResourceName, //O
- resourceType := omit, //NP
- resourceID := omit, //NP
- parentID := omit, //NP
- creationTime := omit, //NP
- lastModifiedTime := omit, //NP
- labels := PX_LABELS,//O
- accessControlPolicyIDs := p_accessControlPolicyIds, //O
- expirationTime := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
- announceTo := omit, //O
- announcedAttribute := omit, //O
- locationSource := p_locationSource, //M
- locationUpdatePeriod := {p_locationUpdatePeriod}, //O
- locationTargetID := p_locationTargetID, //O
- locationServer := p_locationServerAddress,//O
- locationContainerID := omit, //NP
- locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
- locationStatus := omit, //NP
- choice := omit //NP
+ resourceName := c_defaultLocationPolicyResourceName, //O
+ resourceType := omit, //NP
+ resourceID := omit, //NP
+ parentID := omit, //NP
+ creationTime := omit, //NP
+ lastModifiedTime := omit, //NP
+ labels := PX_LABELS,//O
+ accessControlPolicyIDs := p_accessControlPolicyIds, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
+ announceTo := omit, //O
+ announcedAttribute := omit, //O
+ locationSource := p_locationSource, //M
+ locationUpdatePeriod := {p_locationUpdatePeriod}, //O
+ locationTargetID := p_locationTargetID, //O
+ locationServer := p_locationServerAddress,//O
+ locationContainerID := omit, //NP
+ locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
+ locationStatus := omit, //NP
+ choice := omit //NP
- };
+ };
template (value) LocationPolicy_optional m_contentCreateLocationPolicyBase := {
- resourceName := c_defaultLocationPolicyResourceName, //O
- resourceType := omit, //NP
- resourceID := omit, //NP
- parentID := omit, //NP
- creationTime := omit, //NP
- lastModifiedTime := omit, //NP
- labels := PX_LABELS,//O
- accessControlPolicyIDs := omit, //O
- expirationTime := omit, //O
- dynamicAuthorizationConsultationIDs := omit, //O
- announceTo := omit, //O
- announcedAttribute := omit, //O
- locationSource := int1, //M
- locationUpdatePeriod := omit, //O
- locationTargetID := omit, //O
- locationServer := omit,//O
- locationContainerID := omit, //NP
- locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
- locationStatus := omit, //NP
- choice := omit //NP
- };
+ resourceName := c_defaultLocationPolicyResourceName, //O
+ resourceType := omit, //NP
+ resourceID := omit, //NP
+ parentID := omit, //NP
+ creationTime := omit, //NP
+ lastModifiedTime := omit, //NP
+ labels := PX_LABELS,//O
+ accessControlPolicyIDs := omit, //O
+ expirationTime := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
+ announceTo := omit, //O
+ announcedAttribute := omit, //O
+ locationSource := int1, //M
+ locationUpdatePeriod := omit, //O
+ locationTargetID := omit, //O
+ locationServer := omit,//O
+ locationContainerID := omit, //NP
+ locationContainerName := PX_LOCATION_CONTAINER_NAME,//O
+ locationStatus := omit, //NP
+ choice := omit //NP
+ };
- /**
- * @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
- };
+ /**
+ * @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
+ };
- template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
- in template (omit) NotificationEventType p_notifEventType,
- in template (omit) XSD.AnyURI p_subReference,
- in template (omit) XSD.AnyURI p_notifForwardingURI) := {
- notificationEvent := {
- representation := p_resourcePresentation,
- operationMonitor := {
- operation := omit,
- originator := omit
- },
- notificationEventType := p_notifEventType
- },
- verificationRequest := omit,
- subscriptionDeletion := omit,
- subscriptionReference := p_subReference,
- creator := omit,
- notificationForwardingURI := p_notifForwardingURI,
- iPEDiscoveryRequest := omit
- };
+ template (value) Notification m_contentCreateNotification (in template (value) Representation p_resourcePresentation,
+ in template (omit) NotificationEventType p_notifEventType,
+ in template (omit) XSD.AnyURI p_subReference,
+ in template (omit) XSD.AnyURI p_notifForwardingURI) := {
+ notificationEvent := {
+ representation := p_resourcePresentation,
+ operationMonitor := {
+ operation := omit,
+ originator := omit
+ },
+ notificationEventType := p_notifEventType
+ },
+ verificationRequest := omit,
+ subscriptionDeletion := omit,
+ subscriptionReference := p_subReference,
+ creator := omit,
+ notificationForwardingURI := p_notifForwardingURI,
+ iPEDiscoveryRequest := omit
+ };
template (value) Notification m_contentCreateNotification_allOmit := {
- notificationEvent := {
- representation := omit,
- operationMonitor := {
- operation := omit,
- originator := omit
+ notificationEvent := {
+ representation := omit,
+ operationMonitor := {
+ operation := omit,
+ originator := omit
+ },
+ notificationEventType := omit
},
- notificationEventType := omit
- },
- verificationRequest := omit,
- subscriptionDeletion := omit,
- subscriptionReference := omit,
- creator := omit,
- notificationForwardingURI := omit,
- iPEDiscoveryRequest := omit
+ verificationRequest := omit,
+ subscriptionDeletion := omit,
+ subscriptionReference := omit,
+ creator := omit,
+ notificationForwardingURI := omit,
+ iPEDiscoveryRequest := omit
};
/**
* @desc Base primitiveContent for CREATE operation for SemanticDescriptor resource
*/
- template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor := {
+ template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor := {
resourceName := *, //O
resourceType := omit, //NP
resourceID := omit, //NP
@@ -2163,7 +2177,7 @@ module OneM2M_Templates {
ontologyRef := *, //O
relatedSemantics := *, //O
choice := * //?
- }
+ }
/**
* @desc primitiveContent for CREATE operation for SemanticDescriptor resource, with specific OntologyRef
@@ -2171,12 +2185,12 @@ module OneM2M_Templates {
*/
template SemanticDescriptor_optional mw_contentCreateSemanticDescriptor_ontologyRef(template XSD.AnyURI p_ontologyRef) modifies mw_contentCreateSemanticDescriptor := {
ontologyRef := p_ontologyRef
- }
+ }
/**
- * @desc Base primitiveContent for CREATE operation for StatConfig resource
- * @param p_primitiveConten t Content for the StatConfig
- */
+ * @desc Base primitiveContent for CREATE operation for StatConfig resource
+ * @param p_primitiveConten t Content for the StatConfig
+ */
template StatsConfig_optional m_contentCreateStatsConfigBase := {
resourceName := c_defaultStatsConfigResourceName, //O
resourceType := omit, //NP
@@ -2193,9 +2207,9 @@ module OneM2M_Templates {
};
/**
- * @desc Base primitiveContent for CREATE operation for StatCollect resource
- * @param p_primitiveContent Content for the StatCollect
- */
+ * @desc Base primitiveContent for CREATE operation for StatCollect resource
+ * @param p_primitiveContent Content for the StatCollect
+ */
template StatsCollect_optional m_contentCreateStatCollectBase := {
resourceName := c_defaultStatsCollectResourceName, //O
resourceType := omit, //NP
@@ -2219,9 +2233,9 @@ module OneM2M_Templates {
};
/**
- * @desc Base primitiveContent for CREATE operation for M2mServiceSubscriptionProfile resource
- * @param p_primitiveContent Content for the M2mServiceSubscriptionProfile
- */
+ * @desc Base primitiveContent for CREATE operation for M2mServiceSubscriptionProfile resource
+ * @param p_primitiveContent Content for the M2mServiceSubscriptionProfile
+ */
template M2mServiceSubscriptionProfile_optional m_contentCreatem2mServiceSubscriptionProfileBase := {
resourceName := c_defaultm2mServiceSubscriptionProfileResourceName, //O
resourceType := omit, //NP
@@ -2237,8 +2251,8 @@ module OneM2M_Templates {
};
/**
- * @desc Base primitiveContent for CREATE operation for ServiceSubscribedAppRule_optional resource
- * @param p_primitiveContent Content for the ServiceSubscribedAppRule_optional
+ * @desc Base primitiveContent for CREATE operation for ServiceSubscribedAppRule_optional resource
+ * @param p_primitiveContent Content for the ServiceSubscribedAppRule_optional
*/
template ServiceSubscribedAppRule_optional m_contentCreateServiceSubscribedAppRuleBase := {
resourceName := c_defaultServiceSubscribedAppRuleResourceName, //O
@@ -2255,7 +2269,7 @@ module OneM2M_Templates {
allowedApp_IDs := omit,
allowedAEs := omit,
allowedRole_IDs := omit,
- choice := omit //NP
+ choice := omit //NP
};
template ServiceSubscribedNode_optional m_contentServiceSubscribedNode := {
@@ -2293,7 +2307,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
appName := omit,//O
@@ -2306,7 +2320,7 @@ module OneM2M_Templates {
contentSerialization := omit,//O
e2eSecInfo := omit, //O
choice := omit//NP
- };
+ };
/**
* @desc Base primitiveContent for UPDATE operation for AccessControlPolicy resource
@@ -2345,7 +2359,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
creator := omit,//NP
@@ -2380,7 +2394,7 @@ module OneM2M_Templates {
pointOfAccess := omit,
nodeLink := omit,
dynamicAuthorizationConsultationIDs := omit,
- e2eSecInfo := omit,
+ e2eSecInfo := omit,
choice := omit
};
@@ -2430,7 +2444,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//NP
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
@@ -2462,7 +2476,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
announcedAttribute := omit,//O
stateTag := omit,//NP
@@ -2474,7 +2488,7 @@ module OneM2M_Templates {
currentByteSize := omit,//NP
locationID := omit,//O
ontologyRef := omit,//O
- disableRetrieval := omit, //NP
+ disableRetrieval := omit, //NP
choice := omit//NP
};
@@ -2503,29 +2517,29 @@ module OneM2M_Templates {
};
template (value) LocationPolicy_optional m_contentUpdateLocationPolicy (in template (omit) AcpType p_accessControlPolicyIds, in template (value) XSD.Duration p_locationUpdatePeriod) := {
- resourceName := omit,//NP
- resourceType := omit,//NP
- resourceID := omit,//NP
- parentID := omit,//NP
- creationTime := omit,//NP
- lastModifiedTime := omit,//NP
- labels := PX_LABELS,//O
- accessControlPolicyIDs := p_accessControlPolicyIds,//O
- expirationTime := omit,//O
- dynamicAuthorizationConsultationIDs := omit, //O
- announceTo := omit,//O
- announcedAttribute := omit,//O
- locationSource := omit,//NP
+ resourceName := omit,//NP
+ resourceType := omit,//NP
+ resourceID := omit,//NP
+ parentID := omit,//NP
+ creationTime := omit,//NP
+ lastModifiedTime := omit,//NP
+ labels := PX_LABELS,//O
+ accessControlPolicyIDs := p_accessControlPolicyIds,//O
+ expirationTime := omit,//O
+ dynamicAuthorizationConsultationIDs := omit, //O
+ announceTo := omit,//O
+ announcedAttribute := omit,//O
+ locationSource := omit,//NP
locationUpdatePeriod := {p_locationUpdatePeriod}, //O
- locationTargetID := omit, //NP
- locationServer := omit, //NP
- locationContainerID := omit, //NP
- locationContainerName := PX_LOCATION_CONTAINER_NAME, //O
- locationStatus := omit, //NP
- choice := omit //NP
- };
+ locationTargetID := omit, //NP
+ locationServer := omit, //NP
+ locationContainerID := omit, //NP
+ locationContainerName := PX_LOCATION_CONTAINER_NAME, //O
+ locationStatus := omit, //NP
+ choice := omit //NP
+ };
- template (value) Node_optional m_contentUpdateNode := {
+ template (value) Node_optional m_contentUpdateNode := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
@@ -2542,9 +2556,9 @@ module OneM2M_Templates {
hostedCSELink := omit,
mgmtClientAddress := omit,
choice := omit
- }
+ }
- template (value) RemoteCSE_optional m_contentUpdateRemoteCSE := {
+ template (value) RemoteCSE_optional m_contentUpdateRemoteCSE := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
@@ -2568,7 +2582,7 @@ module OneM2M_Templates {
triggerReferenceNumber := omit,
e2eSecInfo := omit,
choice := omit
- }
+ }
template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
resourceName := omit,
@@ -2592,7 +2606,7 @@ module OneM2M_Templates {
contentSerialization := omit,
e2eSecInfo := omit,
choice := omit
- }
+ }
}//end group ContentUpdate
@@ -2615,7 +2629,7 @@ module OneM2M_Templates {
aE_ID := omit//NP
};
- template Container_optional mw_contentContainerUpdateRequest modifies mw_contentContainer_any := {
+ template Container_optional mw_contentContainerUpdateRequest modifies mw_contentContainer_any := {
resourceName := omit,//NP
resourceType := omit,//NP
resourceID := omit,//NP
@@ -2626,7 +2640,7 @@ module OneM2M_Templates {
}//End of group UpdateRequest
- }//end of group RequestContent
+ }//end of group RequestContent
group ResponseContent {
@@ -2640,7 +2654,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
appName := *,//O
@@ -2785,7 +2799,7 @@ module OneM2M_Templates {
template Resource mw_contentAcp_rc3 := {
choice := {accessControlPolicy := ?},
- uRI := ?
+ uRI := ?
}
template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
@@ -2830,7 +2844,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
creator := *,//O
@@ -2902,7 +2916,7 @@ module OneM2M_Templates {
choice := omit //O
}
- template XSD.AnyURI mw_contentGroup_rc2 := ?;
+ template XSD.AnyURI mw_contentGroup_rc2 := ?;
template Resource mw_contentGroup_rc3 := {
choice := {group_ := ?},
@@ -2917,7 +2931,7 @@ module OneM2M_Templates {
choice := {childResource_list := ?} //O
}
- template Group_optional mw_contentGroup_rc6 modifies mw_contentGroupBase := {
+ template Group_optional mw_contentGroup_rc6 modifies mw_contentGroupBase := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
@@ -3010,7 +3024,7 @@ module OneM2M_Templates {
template PollingChannel_optional mw_contentPollingChannel_rc1 modifies mw_contentPollingChannelBase := {
}
- template XSD.AnyURI mw_contentPollingChannel_rc2 := ?;
+ template XSD.AnyURI mw_contentPollingChannel_rc2 := ?;
template Resource mw_contentPollingChannel_rc3 := {
choice := {pollingChannel := ?},
@@ -3023,7 +3037,7 @@ module OneM2M_Templates {
template PollingChannel_optional mw_contentPollingChannel_rc5 modifies mw_contentPollingChannelBase := {
}
- template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannelBase := {
+ template PollingChannel_optional mw_contentPollingChannel_rc6 modifies mw_contentPollingChannelBase := {
resourceName := *,//M
resourceType := *,//M
resourceID := *,//M
@@ -3145,7 +3159,7 @@ module OneM2M_Templates {
choice := omit //O
}
- template XSD.AnyURI mw_contentSchedule_rc2 := ?;
+ template XSD.AnyURI mw_contentSchedule_rc2 := ?;
template Resource mw_contentSchedule_rc3 := {
choice := {schedule := ?},
@@ -3230,7 +3244,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
@@ -3258,7 +3272,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := *,//M
- dynamicAuthorizationConsultationIDs := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
creator := *,//O
eventNotificationCriteria := *,//O
expirationCounter := *,//O
@@ -3314,7 +3328,7 @@ module OneM2M_Templates {
choice := omit //O
}
- template XSD.AnyURI mw_contentSubscription_rc2 := ?;
+ template XSD.AnyURI mw_contentSubscription_rc2 := ?;
template Resource mw_contentSubscription_rc3 := {
choice := {subscription := ?},
@@ -3339,7 +3353,7 @@ module OneM2M_Templates {
labels := omit,//O
accessControlPolicyIDs := omit,//O
expirationTime := omit,//M
- dynamicAuthorizationConsultationIDs := omit, //O
+ dynamicAuthorizationConsultationIDs := omit, //O
creator := omit,//O
eventNotificationCriteria := omit,//O
expirationCounter := omit,//O
@@ -3423,7 +3437,7 @@ module OneM2M_Templates {
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
- dynamicAuthorizationConsultationIDs := *, //O
+ dynamicAuthorizationConsultationIDs := *, //O
announceTo := *,//O
announcedAttribute := *,//O
stateTag := ?,//M
@@ -3512,7 +3526,7 @@ module OneM2M_Templates {
aggregatedRequest := omit,//M
choice := omit//O
- };
+ };
template Container_optional mw_contentContainer_rc1 modifies mw_contentContainerBase := {
choice := omit //O
@@ -3535,28 +3549,28 @@ module OneM2M_Templates {
template Container_optional mw_contentContainer_rc6 modifies mw_contentContainerBase := {
resourceName := omit,//M
- resourceType := omit,//M
- resourceID := omit,//M
- parentID := omit,//M
- creationTime := omit,//M
- lastModifiedTime := omit,//M
- labels := omit,//O
- accessControlPolicyIDs := omit,//O
- expirationTime := omit,//M
+ resourceType := omit,//M
+ resourceID := omit,//M
+ parentID := omit,//M
+ creationTime := omit,//M
+ lastModifiedTime := omit,//M
+ labels := omit,//O
+ accessControlPolicyIDs := omit,//O
+ expirationTime := omit,//M
dynamicAuthorizationConsultationIDs := omit, //O
announceTo := omit,//O
- announcedAttribute := omit,//M
- stateTag := omit,//M
- creator := omit,//M
- maxNrOfInstances := omit,//O
- maxByteSize := omit,//O
- maxInstanceAge := omit,//O
- currentNrOfInstances := omit,//M
- currentByteSize := omit,//M
- locationID := omit,//O
- ontologyRef := omit,//O
- disableRetrieval := omit, //O
- choice := {childResource_list := ?}//O
+ announcedAttribute := omit,//M
+ stateTag := omit,//M
+ creator := omit,//M
+ maxNrOfInstances := omit,//O
+ maxByteSize := omit,//O
+ maxInstanceAge := omit,//O
+ currentNrOfInstances := omit,//M
+ currentByteSize := omit,//M
+ locationID := omit,//O
+ ontologyRef := omit,//O
+ disableRetrieval := omit, //O
+ choice := {childResource_list := ?}//O
}
template Container_optional mw_contentContainer_rc7 modifies mw_contentContainerBase := {
@@ -3629,7 +3643,7 @@ module OneM2M_Templates {
nodeID := omit,
hostedCSELink := omit,
mgmtClientAddress := omit,
- choice := omit
+ choice := omit
};
@@ -3648,7 +3662,7 @@ module OneM2M_Templates {
pointOfAccess := ?,//M
nodeLink := *,//O
dynamicAuthorizationConsultationIDs := omit,
- e2eSecInfo := *,//O
+ e2eSecInfo := *,//O
choice := *//O
};
@@ -3684,9 +3698,9 @@ module OneM2M_Templates {
contentSerialization := omit,//O
e2eSecInfo:= omit, //O
choice := omit//O
- };
+ };
- template AE_optional mw_contentCreateAe_invalid := {
+ template AE_optional mw_contentCreateAe_invalid := {
resourceName := *,//O
resourceType := *,//NP
resourceID := *,//NP
@@ -3709,7 +3723,7 @@ module OneM2M_Templates {
contentSerialization := *,//O
e2eSecInfo:= *, //O
choice := *//O
- };
+ };
template (value) AE_update_invalid m_contentUpdateAe_invalid := {
resourceName := omit,//M
@@ -3864,7 +3878,7 @@ module OneM2M_Templates {
ontologyRef := omit,//O
disableRetrieval := omit, //O
choice := omit//O
- };
+ };
}//end group SpecialContents
@@ -3896,7 +3910,7 @@ module OneM2M_Templates {
* @param p_requestId Request ID of the corresponding request
*/
template (value) ResponsePrimitive m_responsePrimitive_content(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
- primitiveContent := p_content
+ primitiveContent := p_content
}
template ResponsePrimitive mw_responsePrimitiveforInfoPort := ?;
@@ -3916,7 +3930,7 @@ module OneM2M_Templates {
contentOffset := *,
assignedTokenIdentifiers := *,
tokenRequestInformation := *
- };
+ };
template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := {
responseStatusCode := complement(p_statusCode),
@@ -3933,7 +3947,7 @@ module OneM2M_Templates {
tokenRequestInformation := *
};
- template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
+ template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := {
responseStatusCode := (int2000, int2001, int2002, int2004),
requestIdentifier := ?,
primitiveContent := p_content,
@@ -3946,10 +3960,10 @@ module OneM2M_Templates {
contentOffset := *,
assignedTokenIdentifiers := *,
tokenRequestInformation := *
- };
+ };
- template ResponsePrimitive mw_responsePrimitiveKO := {
- responseStatusCode := complement(int2000, int2001, int2002, int2004),
+ template ResponsePrimitive mw_responsePrimitiveKO := {
+ responseStatusCode := complement(int2000, int2001, int2002, int2004),
requestIdentifier := ?,
primitiveContent := *,
to_ := *,
@@ -3961,7 +3975,7 @@ module OneM2M_Templates {
contentOffset := *,
assignedTokenIdentifiers := *,
tokenRequestInformation := *
- };
+ };
template ResponsePrimitive mw_responseDiscovery (template URIList p_uriList := ?) := {
responseStatusCode := int2000,
@@ -3995,11 +4009,11 @@ module OneM2M_Templates {
group InfoPortTemplates {
- template MyResource mw_resource := ?;
+ template MyResource mw_resource := ?;
}//end group InfoPortTemplates
- }//end group ResponsePrimitives
+ }//end group ResponsePrimitives
group UpperTester {
template (value) UtTriggerPrimitive m_utCreate := {
@@ -4009,7 +4023,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -4024,7 +4038,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := omit,
+ localTokenIDs := omit,
tokenRequestIndicator := omit
};
@@ -4059,7 +4073,7 @@ module OneM2M_Templates {
requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -4074,7 +4088,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := omit,
+ localTokenIDs := omit,
tokenRequestIndicator := omit
};
@@ -4085,7 +4099,7 @@ module OneM2M_Templates {
requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
- roleIDs := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -4100,7 +4114,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := omit,
+ localTokenIDs := omit,
tokenRequestIndicator := omit
};
@@ -4116,8 +4130,8 @@ module OneM2M_Templates {
from_ := "NotInitialized",
requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
resourceType := omit,
- primitiveContent := omit,
- roleIDs := omit,
+ primitiveContent := omit,
+ roleIDs := omit,
originatingTimestamp := omit,
requestExpirationTimestamp := omit,
resultExpirationTimestamp := omit,
@@ -4132,7 +4146,7 @@ module OneM2M_Templates {
discoveryResultType := omit,
tokens := omit,
tokenIDs := omit,
- localTokenIDs := omit,
+ localTokenIDs := omit,
tokenRequestIndicator := omit
};
@@ -4151,7 +4165,7 @@ module OneM2M_Templates {
from_ := *,
originatingTimestamp := *,
resultExpirationTimestamp := *,
- eventCategory := *,
+ eventCategory := *,
contentStatus := *,
contentOffset := *,
assignedTokenIdentifiers := *,
@@ -4189,6 +4203,6 @@ module OneM2M_Templates {
tokenRequestInformation := *
}
- }
+ }
} // end of module
diff --git a/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn b/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
index 01c49e130607b07721642b7f2fd6b1a556dcefa7..4585f7628e14d79c458e38e214c3300191e65a8a 100644
--- a/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
@@ -96,7 +96,7 @@ module OneM2M_Testcases_CSE_Release_2_SEC_STF531 {
//TestBody
v_requestNotify.primitiveContent := {securityInfo := m_contentSecurityInfo(int6)};
- v_requestNotify.primitiveContent.securityInfo.escertkeMessage := ''O;
+ v_requestNotify.primitiveContent.securityInfo.escertkeMessage := "Q2xpZW50IEhlbGxv"; //'Q2xpZW50IEhlbGxv'O => "Client Hello" Bqse64 representation Was ''O
}
} // end of group ESPrim