diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index f5da45951f158b96f920e0a61014706be076eec6..234f637950b776fea17c66f5dd140a92470c6260 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -785,12 +785,12 @@ 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.ID p_stemId := "") 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, 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",
resourceType := int10002,
- primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, valueof(p_to) & "/" & p_stemId)}
+ primitiveContent := {aEAnnc := m_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds, p_appId, p_link)}
};
/**
@@ -1632,7 +1632,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @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) := {
+ 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_link := omit) := {
resourceName := omit,//O TODO
resourceType := omit,//NP
resourceID := omit,//NP
@@ -1642,14 +1642,14 @@ module OneM2M_Templates {
labels := p_labels,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := "20301231T012345",//O
- link := omit,//M TODO Put the right value
+ 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
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 := p_nodeLink,//NP
+ nodeLink := omit,//NP
requestReachability := false,//M
contentSerialization := omit,//O
e2eSecInfo := omit, //O TODO Check whether it is optional or mandatory for create operation
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 863cc04b99ef9546fb9c0383d2ea653a189723ae..21f509d1e8f1442156c0a4e228a4db13f1476786 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -3160,7 +3160,7 @@ module OneM2M_PermutationFunctions {
// Preamble
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSEBase);
- v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_CSE1_ID), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
+ v_aEAnncIndex := f_cse_createResource_cseSimu(int10002, m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID), vc_remoteCseIndex); //AEAnnnc under RemoteCSE
// Test Body
@@ -8545,7 +8545,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var template RequestPrimitive v_createAE := m_createAe(PX_APP_ID, omit, omit);
- var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
+ var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID);
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int61);
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
@@ -8608,7 +8608,7 @@ module OneM2M_PermutationFunctions {
var integer v_aeIndex := -1;
var integer v_resourceIndex;
var template RequestPrimitive v_createAE := m_createAe(PX_APP_ID, omit, omit);
- var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID);
+ var template RequestPrimitive v_createAEAnnc := m_createAEAnnc(omit, omit, omit, PX_CSE1_ID, PX_CSE1_ID);
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyAcp", -, int61);
var integer v_aeAnncIndex;
var integer v_resourceAnncIndex;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index bc5191127abc6e52ba94cfcd1873de5a30e02db5..c1338ed2d11c1efdebc99608a5b621f0ddaf7b75 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -690,7 +690,8 @@ module OneM2M_Testcases_CSE_Release_1 {
var MsgIn v_request;
var template RequestPrimitive v_requestPrimitive;
- template XSD.AnyURI v_link := pattern "/?*";
+ const charstring v_cseId := PX_CSE_ID;
+ template XSD.AnyURI v_link := pattern "{v_cseId}/S";
//Test control
@@ -703,7 +704,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Test Body
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, -, "S")));
- v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, PX_CSE_ID & v_link);
+ v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, v_link);
v_requestPrimitive.primitiveContent.aEAnnc.app_ID := PX_APP_ID;
tc_ac.start;
@@ -718,11 +719,6 @@ module OneM2M_Testcases_CSE_Release_1 {
setverdict(fail, __SCOPE__ & ": AE creation redirected but wrong parameters");
f_cse_sendResponse_cseSimu(v_request);
}
- [] mccPortIn.receive(mw_request(?))-> value v_request {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Unexpected message received");
- f_cse_sendResponse_cseSimu(v_request);
- }
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating AE");
}