Commit 7d6358bc authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

TC_CSE_REG_CRE_029 - Fix on AEAnnc reception template


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 681a36fd
......@@ -798,7 +798,7 @@ module OneM2M_Templates {
* @param p_appId
* @param p_stemId
*/
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.AnyURI p_link) modifies m_create:= {
template (value) RequestPrimitive m_createAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_appId, XSD.AnyURI p_link) modifies m_create:= {
to_ := p_to,
from_ := p_from,//PX_AE_ID_STEM,//TODO We should use omit, "s", or "c"
requestIdentifier := testcasename() & "-m_createAEAnnc",
......@@ -1667,28 +1667,28 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) XSD.AnyURI p_link := omit) := {
resourceName := omit,//O TODO
resourceType := omit,//NP
resourceID := omit,//NP
parentID := omit,//NP
creationTime := omit,//NP
lastModifiedTime := omit,//NP
labels := p_labels,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := "20301231T012345",//O
template (value) AEAnnc_optional m_contentCreateAEAnnc (in template (omit) Labels p_labels, in template (omit) AcpType p_accessControlPolicyIds, template (omit) XSD.ID p_appId := PX_TS_AE1.appId, in template (omit) XSD.AnyURI p_link := omit) := {
resourceName := omit,//NA
resourceType := omit,//NA
resourceID := omit,//NA
parentID := omit,//NA
creationTime := omit,//NA
lastModifiedTime := omit,//NA
labels := p_labels,//MA
accessControlPolicyIDs := p_accessControlPolicyIds,//MA Special case, mandatory for announced resources
expirationTime := "20301231T012345",//MA
link := p_link,//M
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
appName := omit,//OA
app_ID := p_appId,//OA
aE_ID := omit,//OA
pointOfAccess := omit, //{"http://127.0.0.1:1400/monitor"},//O //{"http://192.168.1.92:18080/notifications/AE"}, // TODO: Check this => AE PoA
ontologyRef := omit,//O
nodeLink := omit,//NP
requestReachability := false,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
supportedReleaseVersions := {"2a"}, //M
ontologyRef := omit,//OA
nodeLink := omit,//OA
requestReachability := omit,//OA
contentSerialization := omit,//OA
e2eSecInfo := omit, //MA TODO Check whether it is optional or mandatory for create operation
supportedReleaseVersions := omit, //MA
choice := omit//NP
};
......@@ -1710,7 +1710,7 @@ module OneM2M_Templates {
accessControlPolicyIDs := p_accessControlPolicyIds,//MA
expirationTime := ?,//MA M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
dynamicAuthorizationConsultationIDs := *, //OA
appName := *,//OA
app_ID := *,//OA
aE_ID := *,//OA
......@@ -3936,27 +3936,27 @@ module OneM2M_Templates {
};
template AEAnnc_optional mw_contentAeAnnc_base := {
resourceName := ?,//M
resourceType := ?,//M
resourceID := ?,//M
parentID := ?,//M
creationTime := ?,//M
lastModifiedTime := ?,//M
labels := *,//O
accessControlPolicyIDs := *,//O
expirationTime := ?,//M
resourceName := ?,//M NA
resourceType := ?,//M NA
resourceID := ?,//M NA
parentID := ?,//M NA
creationTime := ?,//M NA
lastModifiedTime := ?,//M NA
labels := *,//O MA
accessControlPolicyIDs := *,//O MA Special case: acpi mandatory for announced resources
expirationTime := ?,//M MA
link := ?,//M,
dynamicAuthorizationConsultationIDs := *, //O
appName := *,//O
app_ID := ?,//M
aE_ID := ?,//M
pointOfAccess := *,//O
ontologyRef := *,//O
nodeLink := *,//O
requestReachability := ?,//M
contentSerialization := *,//O
e2eSecInfo:= *, //O
supportedReleaseVersions := ?,//M
dynamicAuthorizationConsultationIDs := *, //O OA
appName := *,//O OA
app_ID := *,//M OA
aE_ID := *,//M OA
pointOfAccess := *,//O OA
ontologyRef := *,//O OA
nodeLink := *,//O OA
requestReachability := *,//M OA
contentSerialization := *,//O OA
e2eSecInfo:= *, //O MA
supportedReleaseVersions := *,//O MA
choice := *//O
};
......
......@@ -2036,7 +2036,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
//Test Body
v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0], PX_TS_AE1.appId, PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]));
v_request := valueof(m_createAEAnnc(-, f_getResourceAddress(vc_remoteCseIndex), PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0], omit, PX_TS_CSE1.cseId & "/" & PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
......
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