From: lbuckuli Date: Tue, 11 Oct 2016 14:55:06 +0000 (+0000) Subject: Convert suites from ODL_VERSION to CompareStream X-Git-Tag: release/beryllium-sr4~22 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9d7859024cdd79b7029726abfee5a332d74c22e0;hp=dd8f2cc400082ac6b70a8644de0243d1f83dc21d;p=integration%2Ftest.git Convert suites from ODL_VERSION to CompareStream Change-Id: I4ec6174a8890caab96de22598c1f9a6388ffc50b Signed-off-by: lbuckuli --- diff --git a/csit/libraries/PacketcableVersion.robot b/csit/libraries/PacketcableVersion.robot index 358a2ebe31..7aff6dfd6c 100644 --- a/csit/libraries/PacketcableVersion.robot +++ b/csit/libraries/PacketcableVersion.robot @@ -1,22 +1,20 @@ *** Settings *** -Documentation This setup variable for Packetcable based on ODL version - -*** Variables *** -${ODL_VERSION} master # defaults to latest version in the master branch -${ODLREST_CCAPS} /restconf/config/packetcable:ccaps -${CCAP_TOKEN} ccap -${PACKETCABLE_RESOURCE_DIR} ${CURDIR}/../variables/packetcable/${ODL_VERSION} +Documentation This setup variable for Packetcable based on ODL version using resource CompareStream. +Resource ${CURDIR}/CompareStream.robot *** Keywords *** Init Variables - Run Keyword If "${ODL_VERSION}" == "lithium" Init Variables Lithium - log ${ODL_VERSION} + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + BuiltIn.Set Suite Variable ${PACKETCABLE_RESOURCE_DIR} ${CURDIR}/../variables/packetcable/beryllium + BuiltIn.Set Suite Variable ${ODLREST_CCAPS} /restconf/config/packetcable:ccaps + BuiltIn.Set Suite Variable ${CCAP_TOKEN} ccap log ${ODLREST_CCAPS} log ${CCAP_TOKEN} Init Variables Lithium - Set Suite Variable ${ODLREST_CCAPS} /restconf/config/packetcable:ccap - Set Suite Variable ${CCAP_TOKEN} ccaps + BuiltIn.Set Suite Variable ${PACKETCABLE_RESOURCE_DIR} ${CURDIR}/../variables/packetcable/lithium + BuildIn.Set Suite Variable ${ODLREST_CCAPS} /restconf/config/packetcable:ccap + BuildIn.Set Suite Variable ${CCAP_TOKEN} ccaps Create Session And Init Variables Init Variables diff --git a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot index d5cabe1151..64bc222687 100644 --- a/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot +++ b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot @@ -6,14 +6,14 @@ Library SSHLibrary Library Collections Library OperatingSystem Variables ../../../variables/Variables.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/Utils.robot *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Add Tenant to one node [Documentation] Add one Tenant from JSON file diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot index 12e1383f4c..8b226da719 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/Variables.robot @@ -1,6 +1,7 @@ *** Settings *** Documentation Global variables for GBPSFC 3-node topology Variables ../../../../variables/Variables.py +Resource ../../../libraries/CompareStream.robot *** Variables *** ${VM_HOME_FOLDER} ${WORKSPACE} @@ -35,10 +36,9 @@ Set Test Variables Set Global Variable ${DIFF_WEBSERVER_MAC} ${diff_webserver_mac} Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Init Variables Master [Documentation] Sets variables specific to latest(master) version diff --git a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot index f84f7fc375..12708ac079 100644 --- a/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot +++ b/csit/suites/groupbasedpolicy/GBPSFC/6-node/Variables.robot @@ -3,6 +3,7 @@ Documentation Global variables for GBPSFC 6node topology. Some variables are ... ODL_VERSION variable which contains release name and is defined in Jenkins job. Keywords for setting release specific ... data are located in this file. Variables ../../../../variables/Variables.py +Resource ../../../libraries/CompareStream.robot *** Variables *** ${VM_HOME_FOLDER} ${WORKSPACE} @@ -49,10 +50,10 @@ Set Test Variables Set Global Variable ${VXLAN_GPE_PORT} ${vxlan_gpe_port} Set ODL Variables - [Documentation] Initialize ODL version specific variables + [Documentation] Initialize ODL version specific variables using resource CompareStream. log ${ODL_VERSION} - Run Keyword If "${ODL_VERSION}" == "stable-lithium" or "${ODL_VERSION}" == "stable/lithium" Set ODL Variables Lithium - ... ELSE Set ODL Variables Master + CompareStream.Run_Keyword_If_Less_Than_Beryllium Set ODL Variables Lithium + Set ODL Variables Master Set ODL Variables Master [Documentation] Sets variables specific to latest(master) version diff --git a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot index 49f78700b1..24477e7a8d 100644 --- a/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot +++ b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot @@ -7,14 +7,14 @@ Library Collections Library OperatingSystem Library RequestsLibrary Variables ../../../variables/Variables.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/Utils.robot *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Add Tenants [Documentation] Add Tenants from JSON file diff --git a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot index 55f24537d1..39f6e2ae91 100755 --- a/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot +++ b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot @@ -8,6 +8,7 @@ Library Collections Library String Library RequestsLibrary Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -19,10 +20,9 @@ Variables ../../../variables/Variables.py *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR HBase Feature Installation [Documentation] Install and Verify the TSDR HBase Features diff --git a/csit/suites/tsdr/HBase/020_FlowMetrics.robot b/csit/suites/tsdr/HBase/020_FlowMetrics.robot index bf5edf9322..30b03b61b8 100644 --- a/csit/suites/tsdr/HBase/020_FlowMetrics.robot +++ b/csit/suites/tsdr/HBase/020_FlowMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -15,10 +16,9 @@ Variables ../../../variables/Variables.py *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR FlowMetrics [Documentation] Verify the TSDR FlowStats diff --git a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot index 8781d0f5c5..446687fa50 100644 --- a/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot +++ b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -15,10 +16,9 @@ ${TSDR_FLOWTABLE_STATS} tsdr:list FLOWTABLESTATS *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR FlowTableMetrics [Documentation] Verify the TSDR FlowTableMetrics diff --git a/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot index f68d5f7780..99ac01901f 100644 --- a/csit/suites/tsdr/HBase/040_QueueMetrics.robot +++ b/csit/suites/tsdr/HBase/040_QueueMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -15,10 +16,9 @@ Variables ../../../variables/Variables.py *** Test Cases *** Init Variables - [Documentation] Initialize ODL version specific variables - log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + [Documentation] Initialize ODL version specific variables using resource CompareStream. + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verify the Queue Metrics attributes exist thru Karaf console [Documentation] Verify the QueueMetrics attributes exist on Karaf Console diff --git a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot index 30ed2aaf6f..7d2aad3342 100644 --- a/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot +++ b/csit/suites/tsdr/HSQLDB/010_InterfaceMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -18,8 +19,8 @@ Variables ../../../variables/Variables.py Init Variables [Documentation] Initialize ODL version specific variables log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR HSQLDB Feature Installation [Documentation] Install and Verify the TSDR HSQLDB Datastore and JDBC diff --git a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot index b962505903..83880899df 100644 --- a/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot +++ b/csit/suites/tsdr/HSQLDB/020_FlowMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -17,8 +18,8 @@ Variables ../../../variables/Variables.py Init Variables [Documentation] Initialize ODL version specific variables log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR FlowMetrics [Documentation] Verify the TSDR FLOWSTATS diff --git a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot index 98a5a83724..b071ed6a0e 100644 --- a/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot +++ b/csit/suites/tsdr/HSQLDB/030_FlowTableMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -17,8 +18,8 @@ Variables ../../../variables/Variables.py Init Variables [Documentation] Initialize ODL version specific variables log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verification of TSDR FLOWTABLESTATS [Documentation] Verify the TSDR FlowiTableStats diff --git a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot index 6a69cbba7c..dc272b7f03 100644 --- a/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot +++ b/csit/suites/tsdr/HSQLDB/040_QueueMetrics.robot @@ -6,6 +6,7 @@ Library SSHLibrary Library Collections Library String Library ../../../libraries/Common.py +Resource ../../../libraries/CompareStream.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/TsdrUtils.robot Variables ../../../variables/Variables.py @@ -17,8 +18,8 @@ Variables ../../../variables/Variables.py Init Variables [Documentation] Initialize ODL version specific variables log ${ODL_VERSION} - Run Keyword If '${ODL_VERSION}' == 'stable-lithium' Init Variables Lithium - ... ELSE Init Variables Master + CompareStream.Run_Keyword_If_Less_Than_Beryllium Init Variables Lithium + Init Variables Master Verify the QueueStats attributes exist thru Karaf console [Documentation] Verify the QueueMetrics attributes exist on Karaf Console diff --git a/csit/variables/packetcable/master/add_ccap.json b/csit/variables/packetcable/beryllium/add_ccap.json similarity index 100% rename from csit/variables/packetcable/master/add_ccap.json rename to csit/variables/packetcable/beryllium/add_ccap.json diff --git a/csit/variables/packetcable/master/add_multi_ccaps.json b/csit/variables/packetcable/beryllium/add_multi_ccaps.json similarity index 100% rename from csit/variables/packetcable/master/add_multi_ccaps.json rename to csit/variables/packetcable/beryllium/add_multi_ccaps.json