From 6aacf723559529c0e178b3adb8b9411bbf9669c3 Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Wed, 7 Feb 2018 10:26:35 +0100
Subject: [PATCH] Fix #15
Signed-off-by: acverdugo <acverdugo@at4wireless.com>
---
LibOneM2M/OneM2M_Functions.ttcn | 1 +
OneM2M_PermutationFunctions.ttcn | 13 +++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a073d78..ac8c147 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -35,6 +35,7 @@ module OneM2M_Functions {
// Map
map(self:mcaPort, system:mcaPort);
+ map(self:mcaPortIn, system:mcaPortIn);
map(self:acPort, system:acPort);
activate(a_default());
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 4ba2164..b07d121 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -4772,7 +4772,7 @@ module OneM2M_PermutationFunctions {
// Preamble
if(p_resourceType != int2) {
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ v_aeIndex := f_cse_preamble_registerAe(-, {f_getAnnouncementTargetPoA("HTTP", PX_AE1_ADDRESS, "")});//c_CRUDNDi);
}
if(p_resourceType != int1) {
@@ -4797,7 +4797,16 @@ module OneM2M_PermutationFunctions {
//Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
- mcaPort.send(m_request(v_request)); //CSEBase
+ if(p_resourceType == int23) { //Subscription
+ v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};
+ }
+
+ mcaPort.send(m_request(v_request));
+
+ if(p_resourceType == int23) { //Subscription
+ f_cse_notifyProcedure_subscriptionVerificationHandler();
+ }
+
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
--
GitLab