From f331f37c868cf39a1d3e524db31cfd25de011fe9 Mon Sep 17 00:00:00 2001
From: Naum Spaseski <naum.spaseski@gmail.com>
Date: Tue, 5 Sep 2017 17:17:05 +0200
Subject: [PATCH] STF531: corrected CSE/REG/CRE/008 and 009
Signed-off-by: Naum Spaseski <naum.spaseski@gmail.com>
---
LibOneM2M/OneM2M_Templates.ttcn | 6 +++---
OneM2M_Testcases.ttcn | 16 ++++++++++++----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 80a5820..bab2408 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -417,7 +417,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_updateAEAnnc(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.ID p_stemId := "") modifies m_update:= {
requestIdentifier := testcasename() & "-m_updateAEAnnc" & f_rnd(1, 1000000),
resourceType := int10002,
- primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
+ primitiveContent := {aEAnnc := m_contentUpdateAEAnnc(p_appId,p_stemId)}
};
}//end group Update
@@ -2140,7 +2140,7 @@ module OneM2M_Templates {
choice := omit
}
- template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
+ template (value) AEAnnc_optional m_contentUpdateAEAnnc (template XSD.ID p_appId := omit, template XSD.ID p_stemId := omit) := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
@@ -2152,7 +2152,7 @@ module OneM2M_Templates {
expirationTime := omit,
link := omit,
appName := omit,
- app_ID := omit,
+ app_ID := p_appId,
aE_ID := omit,
pointOfAccess := omit,
ontologyRef := omit,
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 02e36e2..311695b 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1048,12 +1048,16 @@ module OneM2M_Testcases {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Test Body
- vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM")));
+ vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
tc_ac.start;
alt {
- [] mccPort.receive(mw_request(mw_createAEAnnc("/S", "CSE_ID", -))) {
+ [] mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_spRelative) & "/S", "CSE_ID", -))) {
+ tc_ac.stop;
+ setverdict(pass, __SCOPE__ & ": AE creation redirected.");
+ }
+ [] mccPort.receive(mw_request(mw_createAEAnnc(f_getResourceAddress(-1,e_hierarchical, e_absolute) & "/S", "CSE_ID", -))) {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE creation redirected.");
}
@@ -1078,7 +1082,7 @@ module OneM2M_Testcases {
* @desc Check that the IUT accepts an AE re-registration (allowed M2M-SP-assigned AE-ID, S-AE-ID-STEM provided by AE), communication between MN-CSE and IN-CSE
*
*/
- testcase TC_CSE_REG_CRE_009() runs on CseSimu system CseSystem {
+ testcase TC_CSE_REG_CRE_009() runs on MnCseSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -1095,9 +1099,13 @@ module OneM2M_Testcases {
v_aeAnncIndex := f_cse_announceResource(int2, m_createAEAnnc(-, -, -, PX_APP_ID, -));
//Test Body
- v_request := valueof(m_updateAEAnnc(-, -, -, "APP-ID", -)); //TODO to double check all parameters
+ v_request := valueof(m_updateAEAnnc(-, -, -, PX_APP_ID, -)); //TODO to double check all parameters
v_request := f_getUpdateRequestPrimitive(f_getAnnouncedResourceType(int2),v_aeAnncIndex, v_request);//TODO
+ v_request.from_ := "/S";
+ v_request.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
+ //v_request.primitiveContent.aEAnnc.nodeLink :=
+ v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
mccPort.send(m_request(v_request));
tc_ac.start;
--
GitLab