From 999743afc44f44a1a0dce38dd1ddc15a7655ab7d Mon Sep 17 00:00:00 2001
From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Tue, 2 Apr 2019 10:34:35 +0200
Subject: [PATCH] Extract common variable to keyword

Change-Id: I34dc5690eb416e11aba7620c5df6a7784ecb693e
Issue-ID: DCAEGEN2-1359
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---
 tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot  | 8 +-------
 .../testcases/resources/common-keywords.robot                     | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
index 2fab3295..985c3793 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
@@ -31,8 +31,7 @@ Test Teardown     VES-HV Collector Test Shutdown
 *** Keywords ***
 Message Routing Suite Setup
     Log   Started Suite: VES-HV Message Routing
-    ${XNF_PORTS_LIST}=    Create List    7000
-    Configure xNF Simulators Using Valid Certificates On Ports    ${XNF_PORTS_LIST}
+    Configure Single xNF Simulator
     Log   Suite setup finished
 
 *** Test Cases ***
@@ -40,7 +39,6 @@ Correct Messages Routing
     [Documentation]   VES-HV Collector should route all valid messages to topics specified in configuration
     ...               and do not change message payload generated in XNF simulator
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_FIXED_PAYLOAD_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -51,7 +49,6 @@ Correct Messages Routing
 Too big payload message handling
     [Documentation]   VES-HV Collector should interrupt the stream when encountered message with too big payload
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_TOO_BIG_PAYLOAD_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -62,7 +59,6 @@ Too big payload message handling
 Invalid wire frame message handling
     [Documentation]  VES-HV Collector should skip messages with invalid wire frame
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_INVALID_WIRE_FRAME_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -73,7 +69,6 @@ Invalid wire frame message handling
 Invalid GPB data message handling
     [Documentation]   VES-HV Collector should skip messages with invalid GPB data
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_INVALID_GPB_DATA_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -84,7 +79,6 @@ Invalid GPB data message handling
 Unsupported domain message handling
     [Documentation]   VES-HV Collector should skip messages with unsupported domain
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_UNSUPPORTED_DOMAIN_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot b/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
index 3a37c9b0..1c925408 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018 NOKIA
+# Copyright (C) 2018-2019 NOKIA
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,6 +22,12 @@ Library       VesHvContainersUtilsLibrary
 Library       Collections
 
 *** Keywords ***
+Configure Single xNF Simulator
+    ${XNF_PORTS_LIST}=    Create List    7000
+    ${XNF_SIMULATORS_ADDRESSES}=   Configure xNF Simulators   ${XNF_PORTS_LIST}
+    ${XNF_SIMULATOR}=   Get Slice From List   ${XNF_SIMULATORS_ADDRESSES}   0   1
+    Set Suite Variable   ${XNF_SIMULATOR}
+
 Configure xNF Simulators Using Valid Certificates On Ports
     [Arguments]    ${XNF_PORTS_LIST}
     ${VALID_XNF_SIMULATORS_ADDRESSES}=   Configure xNF Simulators   ${XNF_PORTS_LIST}
-- 
2.16.6