- Updated f_cse_updateResource function in order to admit forced fields concept

- New templates related to update Annc resources
- Corrections in f_CSE_ANNC_UPD_002, f_CSE_ANNC_UPD_003 and f_CSE_ANNC_UPD_005
- New functions: f_CSE_ANNC_UPD_009, f_CSE_ANNC_UPD_010, f_CSE_ANNC_UPD_011, f_CSE_ANNC_UPD_012 and f_CSE_ANNC_UPD_013
- Small correction in TC_CSE_ANNC_RET_001_ACP
- Corrections in TC_CSE_ANNC_UPD_002_ACP, TC_CSE_ANNC_UPD_002_CNT, TC_CSE_ANNC_UPD_002_GRP, TC_CSE_ANNC_UPD_003_ACP, TC_CSE_ANNC_UPD_003_CNT, TC_CSE_ANNC_UPD_003_GRP and TC_CSE_ANNC_UPD_005
- New Test Cases: TC_CSE_ANNC_UPD_009_CNT_MBS, TC_CSE_ANNC_UPD_009_GRP_MT, TC_CSE_ANNC_UPD_010_ACP, TC_CSE_ANNC_UPD_010_CNT, TC_CSE_ANNC_UPD_010_GRP, TC_CSE_ANNC_UPD_011_CNT_MBS, TC_CSE_ANNC_UPD_011_GRP_MT, TC_CSE_ANNC_UPD_012_CNT_MBS, TC_CSE_ANNC_UPD_012_GRP_MT, TC_CSE_ANNC_UPD_013_CNT_MBS and TC_CSE_ANNC_UPD_013_GRP_MT
Signed-off-by: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent ab049b6b
......@@ -1038,7 +1038,7 @@ module OneM2M_Functions {
* @param p_resourceIndex Internal resource index which indicates the resource to be updated
* @verdict
*/
function f_cse_updateResource(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on AeSimu {
function f_cse_updateResource(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request, template (omit) AttributeAux_list p_nullFields := omit) runs on AeSimu {
var RequestPrimitive v_request;
......@@ -1047,7 +1047,7 @@ module OneM2M_Functions {
v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
mcaPort.send(m_request(v_request));
mcaPort.send(m_request(v_request, p_nullFields));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
......
......@@ -572,11 +572,31 @@ module OneM2M_Templates {
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
};
template (value) RequestPrimitive mw_updateContainerAnncBase modifies m_update:= {
requestIdentifier := testcasename() & "-m_updateContainerAnnc",
/**
* @desc Base Reception template for update ContainerAnnc
*/
template RequestPrimitive mw_updateContainerAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int10003,
primitiveContent := {containerAnnc := m_contentUpdateContainerAnnc}
};
primitiveContent := {containerAnnc := ?}
};
/**
* @desc Base Reception template for update GroupAnnc
*/
template RequestPrimitive mw_updateGroupAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int10009,
primitiveContent := {groupAnnc := ?}
};
/**
* @desc Base Reception template for update AccessControlPolicyAnnc
*/
template RequestPrimitive mw_updateAccessControlPolicyAnnc(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_update := {
resourceType := int10001,
primitiveContent := {accessControlPolicyAnnc := ?}
};
}//end group Update
group Create {
......@@ -2689,6 +2709,31 @@ module OneM2M_Templates {
disableRetrieval := omit,
choice := omit
};
template (value) GroupAnnc_optional m_contentUpdateGroupAnnc := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
parentID := omit,
creationTime := omit,
lastModifiedTime := omit,
labels := omit,
accessControlPolicyIDs := omit,
expirationTime := omit,
link := omit,
dynamicAuthorizationConsultationIDs := omit,
memberType := omit,
currentNrOfMembers := omit,
maxNrOfMembers := omit,
memberIDs := omit,
membersAccessControlPolicyIDs := omit,
memberTypeValidated := omit,
consistencyStrategy := omit,
groupName := omit,
semanticSupportIndicator := omit,
choice := omit
};
}//end group ContentUpdate
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment