From 2e86344ab85e642735f4af35f32fe23d598c6d23 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 3 Apr 2020 07:41:39 +0200
Subject: [PATCH] Removal of f_getPortAddress, not needed
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 14 +-------------
OneM2M_PermutationFunctions.ttcn | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 4a53af2..df4133e 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -4600,19 +4600,7 @@ module OneM2M_Functions {
return v_poa;
}
-
- function f_getPortAddress(in PortDesc p_portDesc := PX_TS_CSE1.mcaPortIn) return charstring {
- if (ischosen(p_portDesc.binding.httpBindingDesc)) {
- return p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
- } else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
- return p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
- } else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
- return p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress;
- } else {
- return p_portDesc.binding.wsBindingDesc.bindingDesc.tsAddress;
- }
- }
-
+
/**
* @desc Resolution of the local resource index for a given resource address (URI)
* @param p_address Resource URI (can be structured/unstructured cseRelative/spRelative/absolute)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2e7dcb2..fc08381 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2277,7 +2277,7 @@ module OneM2M_PermutationFunctions {
var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getPortAddress(PX_TS_CSE1.mccPortIn) & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request containing To set to " & f_getLocalResourceAddress() & " and Content containing remoteCSE resource containing a valid attribute " & p_attribute[0]; // Test control
if(not(PICS_MN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
stop;
--
GitLab