From 38fba9c0d76bf0f35db33406e8835459b73a146c Mon Sep 17 00:00:00 2001
From: Bogdan Stanca-Kaposta <bogdan.stanca-kaposta@spirent.com>
Date: Wed, 14 Mar 2018 18:59:47 +0100
Subject: [PATCH] fixed resource index from -1 to 0
---
LibOneM2M/OneM2M_Functions.ttcn | 2 +-
OneM2M_PermutationFunctions.ttcn | 20 ++++++++++----------
OneM2M_Testcases_AE_Release_1.ttcn | 4 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 7b4c417..872bb02 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3114,7 +3114,7 @@ module OneM2M_Functions {
* @return Resource address for the given resource
* @verdict
*/
- function f_getLocalResourceAddress(integer p_targetResourceIndex := -1, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
+ function f_getLocalResourceAddress(integer p_targetResourceIndex := 0, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID {
var XSD.ID v_resourceAddress;
if(p_primitiveScope == e_cseRelative) {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 550bb0e..45043e3 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -38,7 +38,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1;
var MsgIn v_request;
var PrimitiveContent v_modifiedResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(0, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -48,7 +48,7 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ v_utRequest.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest, v_action);
@@ -82,7 +82,7 @@ module OneM2M_PermutationFunctions {
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var UtTriggerAckPrimitive v_trigger_response;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
//Test Control
@@ -94,7 +94,7 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_utRequest.to_ := f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ v_utRequest.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -134,7 +134,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -181,7 +181,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -232,7 +232,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -279,7 +279,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -330,7 +330,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -376,7 +376,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 337e34e..37d5272 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -1659,7 +1659,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress(-1);
+ v_utRequest.to_ := f_getLocalResourceAddress();
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -1750,7 +1750,7 @@ module OneM2M_Testcases_AE_Release_1 {
//create Subscription
v_utRequest := m_utCreateSubscription;
- v_utRequest.to_ := f_getLocalResourceAddress(-1);
+ v_utRequest.to_ := f_getLocalResourceAddress();
v_action := "Please, send a valid CREATE request for Subscription";
f_sendUtPrimitive(v_utRequest,v_action);
--
GitLab