From 93787314b2e3bc1d838e9c53cfe817cf178e91b1 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 29 Oct 2021 16:47:20 +0200
Subject: [PATCH] Removing unnecessary f_rnd for requestIdentifier
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 48 ++++++++++----------------------
1 file changed, 15 insertions(+), 33 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 1527dab..4572a6a 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7060,7 +7060,6 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
@@ -7136,8 +7135,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
// Test Body
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7202,8 +7200,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
// Test Body
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7278,8 +7275,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
// Test Body
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7353,8 +7349,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
// Test Body
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7456,8 +7451,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_defaultContainerResourceName;
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
- p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
-
+
// Test Body
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
@@ -7708,8 +7702,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -7778,8 +7771,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -7834,7 +7826,6 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "testDomain";
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
@@ -7914,8 +7905,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getResourceId(vc_resourcesList[v_aeIndex2].resource);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -7972,8 +7962,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8042,8 +8031,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8105,8 +8093,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8163,8 +8150,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8219,8 +8205,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8280,8 +8265,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8336,8 +8320,7 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
-
+
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
alt {
@@ -8399,7 +8382,6 @@ module OneM2M_PermutationFunctions {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
tc_ac.start;
--
GitLab