From db6fa3e85170d3d5d16e15c7cfe8e41c2026cc0f Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 23 Jun 2023 10:39:41 +0200
Subject: [PATCH] Fix for announceTo attribute to contain a CSE-ID and
correction for matching the expected result
---
OneM2M_Testcases_CSE_Release_3.ttcn | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 55b9dbd..4b559d7 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -1502,7 +1502,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
- v_createRequest.primitiveContent.timeSeries.announceTo := {f_getLocalPoA()};
+ v_createRequest.primitiveContent.timeSeries.announceTo := {PX_TS_CSE1.cseId};
v_ae1.start(f_CSE_DMR_CRE_022(int29, v_createRequest, mw_createTimeSeriesAnnc));//TimeSeries
v_ae1.done;
@@ -1514,7 +1514,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
- v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {f_getLocalPoA()};
+ v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_TS_CSE1.cseId};
v_ae1.start(f_CSE_DMR_CRE_022(int30, v_createRequest, mw_createTimeSeriesInstanceAnnc));//TimeSeriesInstance
v_ae1.done;
@@ -3768,7 +3768,7 @@ module OneM2M_Testcases_CSE_Release_3 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
- v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {f_getLocalPoA()};//Attribute 2
+ v_updateRequest.primitiveContent.accessControlPolicy.announceTo := {PX_TS_CSE1.cseId};//Attribute 2
v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;//Attribute 3
v_nullFields := {{"labels", omit}};
@@ -3786,8 +3786,8 @@ module OneM2M_Testcases_CSE_Release_3 {
setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
}
//Check attribute 2
- if(not match(v_responsePrimitive.primitiveContent.accessControlPolicy.announceTo, valueof(v_updateRequest.primitiveContent.accessControlPolicy.announceTo))){
- setverdict(fail, __SCOPE__ & ": Error: Announce_to attribute not updated correctly")
+ if(not match(valueof(v_responsePrimitive.primitiveContent.accessControlPolicy.announceTo[0]), pattern "{PX_TS_CSE1.cseId}/*")){
+ setverdict(fail, __SCOPE__ & ": Error: AnnounceTo attribute not updated correctly")
}
//Check attribute 3
if(ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy.labels)){
@@ -3805,8 +3805,8 @@ module OneM2M_Testcases_CSE_Release_3 {
setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
}
//Check attribute 2
- if(not match (v_primitiveContentRetrieveResource.accessControlPolicy.announceTo, valueof(v_updateRequest.primitiveContent.accessControlPolicy.announceTo))){
- setverdict(fail, __SCOPE__ & ": Error: Announce_to attribute not updated correctly")
+ if(not match (valueof(v_primitiveContentRetrieveResource.accessControlPolicy.announceTo[0]), pattern "{PX_TS_CSE1.cseId}/*")){
+ setverdict(fail, __SCOPE__ & ": Error: AnnounceTo attribute not updated correctly")
}
//Check attribute 3
if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.labels)){
--
GitLab