From 09ab0a4c3ba2c74ff08650c13c4eae0ab09b985d Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 18 Mar 2022 16:41:37 +0100
Subject: [PATCH] Fix setting up of requestIdentifier pattern
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 6 ++++--
OneM2M_Testcases_CSE_Release_3.ttcn | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index d5c4a52..77ec0c3 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2857,7 +2857,8 @@ module OneM2M_Functions {
var integer v_announcedResourceIndex;
var RequestPrimitive v_request;
var ResponsePrimitive v_response;
- template XSD.AnyURI v_announcedResourceAddress := pattern "{vc_cseSimuDesc.cseId}*";
+ var XSD.ID v_cseIdPattern := vc_cseSimuDesc.cseId;
+ template XSD.AnyURI v_announcedResourceAddress := pattern "{v_cseIdPattern}*";
//Activate defaults when running on a PTC
@@ -4488,7 +4489,8 @@ module OneM2M_Functions {
var MsgIn v_request;
var ResponsePrimitive v_response;
var RequestPrimitive v_requestPrimitive;
- var template XSD.AnyURI v_retargetingToCse2 := pattern "{PX_TS_CSE2.cseId}*";
+ var XSD.ID v_cseIdPattern := PX_TS_CSE2.cseId;
+ var template XSD.AnyURI v_retargetingToCse2 := pattern "{v_cseIdPattern}*";
//Retargeting
[vc_auxiliaryCse2Up] mccPortIn.receive(mw_request(mw_requestPrimitive(-, v_retargetingToCse2))) -> value v_request {
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 899fa72..04eb3c5 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -12105,7 +12105,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequestAnnc := mw_createAccessControlPolicyAnnc;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var template PrimitiveContent v_updateResponse := { accessControlPolicy := mw_contentAcpBase};
- const charstring v_cse1Id := PX_TS_CSE1.cseId;
+ const XSD.ID v_cse1Id := PX_TS_CSE1.cseId;
template XSD.AnyURI v_announcedResourceAddress := pattern "{v_cse1Id}/*";
v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_TS_CSE1.cseId};
@@ -12125,7 +12125,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnnc;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var template PrimitiveContent v_updateResponse := { container := mw_contentContainerBase};
- const charstring v_cse1Id := PX_TS_CSE1.cseId;
+ const XSD.ID v_cse1Id := PX_TS_CSE1.cseId;
template XSD.AnyURI v_announcedResourceAddress := pattern "{v_cse1Id}/*";
v_updateRequest.primitiveContent.container.announceTo := {PX_TS_CSE1.cseId};
@@ -12145,7 +12145,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnnc;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var template PrimitiveContent v_updateResponse := { group_ := mw_contentGroupBase};
- const charstring v_cse1Id := PX_TS_CSE1.cseId;
+ const XSD.ID v_cse1Id := PX_TS_CSE1.cseId;
template XSD.AnyURI v_announcedResourceAddress := pattern "{v_cse1Id}/*";
v_updateRequest.primitiveContent.group_.announceTo := {PX_TS_CSE1.cseId};
@@ -12164,7 +12164,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnnc;
var template RequestPrimitive v_updateRequest := m_updateTimeSeriesBase;
var template PrimitiveContent v_updateResponse := { timeSeries := mw_contentTimeSeriesBase};
- const charstring v_cse1Id := PX_TS_CSE1.cseId;
+ const XSD.ID v_cse1Id := PX_TS_CSE1.cseId;
template XSD.AnyURI v_announcedResourceAddress := pattern "{v_cse1Id}/*";
v_updateRequest.primitiveContent.timeSeries.announceTo := {PX_TS_CSE1.cseId};
--
GitLab