Use Variables.robot instead of Variables.py

Also change resources to alphabet order in affected
test suites.

Change-Id: Ief74db7df00e8b0e8011721e912801d229c99959
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/libraries/BGPcliKeywords.robot b/csit/libraries/BGPcliKeywords.robot
index a9568b3f5989cf2eef2661c1717243ddc90d94f7..d8e797f037fd3be61144ac01dd54a85ffe990130 100644 (file)
--- a/csit/libraries/BGPcliKeywords.robot
+++ b/csit/libraries/BGPcliKeywords.robot
@@ -13,9 +13,9 @@ Documentation     Robot keyword library (Resource) for handling the BGP speaker
 ...               TODO: RemoteBash.robot contains logic which could be reused here.
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../variables/Variables.py
-Resource          ${CURDIR}/RemoteBash.robot
-Resource          ${CURDIR}/NexusKeywords.robot
+Resource          ../variables/Variables.robot
+Resource          RemoteBash.robot
+Resource          NexusKeywords.robot
 
 *** Keywords ***
 Start_Console_Tool

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
index 8c63cca5f9a671b8797ca4f0b2324d242ab37b84..bd6309d4bf9d3000a8ed52034da5e3ffcac6391e 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route.robot
@@ -20,17 +20,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
+Resource          PrefixcountKeywords.robot
 
 *** Variables ***
 ${COUNT}          1

diff --git a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
index e7d51d14e18f80d507f00b9a79616aaf72cc1d90..c9961577e277ca2c149142640e6b215333e077dc 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/010_singlepeer_prefixcount_1route_nonreplicated_rib.robot
@@ -18,17 +18,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
+Resource          PrefixcountKeywords.robot
 
 *** Variables ***
 ${COUNT}          1

diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
index cbf7116fe92b8ca6428c037ce09be66c3eee84c4..efeb22b183e5da3e9056cd376b065b53f74990b9 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes.robot
@@ -20,17 +20,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Resource          ${CURDIR}/../../../variables/Variables.robot
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
+Resource          PrefixcountKeywords.robot
 
 *** Variables ***
 ${COUNT}          100000

diff --git a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
index a5ddb039f39f48aed44b183041b5ca3d1e73c85f..e0cfd0efe3847746ae8089fd903e8eaeb03b8f03 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/020_singlepeer_prefixcount_100kroutes_nonreplicated_rib.robot
@@ -18,17 +18,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
+Resource          PrefixcountKeywords.robot
 
 *** Variables ***
 ${COUNT}          100000

diff --git a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
index 512b505e865b5a9fc03100bc2ef4908e4c995dd2..dfb88680d6c3c15f9023beece617c9bf2b83ac40 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
+++ b/csit/suites/bgpcep/bgpclustering/030_singlepeer_prefixcount_1Mroutes_nonreplicated_rib.robot
@@ -18,17 +18,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
+Resource          PrefixcountKeywords.robot
 
 *** Variables ***
 ${COUNT}          1000000

diff --git a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
index 98ecfdf5a6b5347042e11c6d843646937490a18a..02179cdb367416122a76bf8f6109cd56e1de94d7 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/040_bgp_ha_karaf_restart.robot
@@ -19,13 +19,13 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
 Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../libraries/BGPcliKeywords.robot
-Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${BGP_VAR_FOLDER}    ${CURDIR}/../../../variables/bgpclustering

diff --git a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
index 1e6cfbcb5660212eb82946472607131888659b1f..baed02faf47ac844ea2b2f5585d9fbc492b2e969 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/050_bgp_ha_karaf_stop.robot
@@ -19,13 +19,13 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
 Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../libraries/BGPcliKeywords.robot
-Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${BGP_VAR_FOLDER}    ${CURDIR}/../../../variables/bgpclustering

diff --git a/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
index 8f0b6a53c8c326ec8f39e0ead668a05b814d3fc6..099b0e70f7a58d1b26138a000a7fd01602c8a015 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/060_bmp_ha_karaf_restart.robot
@@ -20,12 +20,12 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           Collections
 Library           OperatingSystem
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
-Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/NexusKeywords.robot
 Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/BgpOperations.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/NexusKeywords.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180

diff --git a/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
index d3db8f1d6b949dd1a0a87b91fcc6c3a103488f6f..157959281da36e80ec50664943e43928314ab8b3 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/070_bmp_ha_karaf_stop.robot
@@ -20,12 +20,12 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           Collections
 Library           OperatingSystem
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
-Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/NexusKeywords.robot
 Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/BgpOperations.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/NexusKeywords.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180

diff --git a/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot b/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
index ddc8e3e42049ac8f05781e92f2423bbfb6ca5689..298bb2ff22636b188358bacb88294a682fde7707 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
+++ b/csit/suites/bgpcep/bgpclustering/080_pcep_ha_karaf_restart.robot
@@ -20,13 +20,13 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           Collections
 Library           OperatingSystem
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/TemplatedRequests.robot
 Resource          ../../../libraries/NexusKeywords.robot
-Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/PcepOperations.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180

diff --git a/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot b/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
index 25c45880607453b0394a9b1589da15efa2d8f29e..7faaa4de1d349e4f31e51eeb427d87441abf6ea7 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
+++ b/csit/suites/bgpcep/bgpclustering/090_pcep_ha_karaf_stop.robot
@@ -20,13 +20,13 @@ Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           Collections
 Library           OperatingSystem
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
-Resource          ../../../libraries/TemplatedRequests.robot
 Resource          ../../../libraries/NexusKeywords.robot
-Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/PcepOperations.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180

diff --git a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
index f03cf0267b97c27b1b338512b17a24b00c3768b5..5ae8349c1530209393e8e184ca8d9fcaed8ed740 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
+++ b/csit/suites/bgpcep/bgpclustering/PrefixcountKeywords.robot
@@ -11,18 +11,18 @@ Documentation     BGP performance of ingesting from 1 iBGP peer, data change cou
 ...               It should point to http://<ip-addr>:${RESTCONFPORT}.
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/ShardStability.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/ClusterAdmin.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterAdmin.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/ShardStability.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${BGP_TOOL_LOG_LEVEL}    info

diff --git a/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot b/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
index db460c857ba0eb925978c4d904b210de49fa454c..ef237deb385481aa91642d23c965eaa613321298 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
+++ b/csit/suites/bgpcep/bgpclustering/bgp_ha_karaf_isolation.robot
@@ -18,13 +18,13 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Resource          ../../../variables/Variables.robot
-Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
 Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../libraries/BGPcliKeywords.robot
-Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${BGP_VAR_FOLDER}    ${CURDIR}/../../../variables/bgpclustering

diff --git a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
index 621da7d6240cdda36c5f018011a2e0f5994be09a..ffcdddf4db938d9dc1a1b3b7878cb8b822603967 100644 (file)
--- a/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
+++ b/csit/suites/bgpcep/bgpclustering/singlepeer_prefixcount_300kroutes.robot
@@ -20,17 +20,17 @@ Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
 Test Teardown     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/PrefixCounting.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/ClusterManagement.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/PrefixcountKeywords.robot
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/ClusterManagement.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/PrefixCounting.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          PrefixcountKeywords.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${COUNT}          300000

diff --git a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
index 73b267b21f6a9114a6a28d8e3860279c685ff187..6e9317810877e59ed1b62abef035849129a80893 100644 (file)
--- a/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
+++ b/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
@@ -10,12 +10,12 @@ Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library           RequestsLibrary
 Library           SSHLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
-Variables         ${CURDIR}/../../../variables/bgpuser/variables.py    ${TOOLS_SYSTEM_IP}    ${ODL_STREAM}
-Resource          ${CURDIR}/../../../libraries/ExaBgpLib.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
+Variables         ../../../variables/bgpuser/variables.py    ${TOOLS_SYSTEM_IP}    ${ODL_STREAM}
+Resource          ../../../libraries/ExaBgpLib.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${HOLDTIME}       180

diff --git a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
index dfbd6a32c0303f38122567ce0955498f523c57c3..a691a51c79530e009d46b49518fc489e541888a6 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
+++ b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
@@ -54,18 +54,18 @@ Test Teardown     FailFast.Start_Failing_Fast_If_This_Failed
 Library           OperatingSystem
 Library           SSHLibrary    timeout=10s
 Library           RequestsLibrary
-Library           ${CURDIR}/../../../libraries/norm_json.py
-Variables         ${CURDIR}/../../../variables/Variables.py
-Variables         ${CURDIR}/../../../variables/bgpuser/variables.py    ${TOOLS_SYSTEM_IP}    ${ODL_STREAM}
-Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
-Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/FailFast.robot
-Resource          ${CURDIR}/../../../libraries/KillPythonTool.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/WaitForFailure.robot
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
+Library           ../../../libraries/norm_json.py
+Variables         ../../../variables/bgpuser/variables.py    ${TOOLS_SYSTEM_IP}    ${ODL_STREAM}
+Resource          ../../../libraries/BGPcliKeywords.robot
+Resource          ../../../libraries/BGPSpeaker.robot
+Resource          ../../../libraries/CompareStream.robot
+Resource          ../../../libraries/FailFast.robot
+Resource          ../../../libraries/KillPythonTool.robot
+Resource          ../../../libraries/TemplatedRequests.robot
+Resource          ../../../libraries/SetupUtils.robot
+Resource          ../../../libraries/SSHKeywords.robot
+Resource          ../../../libraries/WaitForFailure.robot
+Resource          ../../../variables/Variables.robot
 
 *** Variables ***
 ${ACTUAL_RESPONSES_FOLDER}    ${TEMPDIR}/actual