Convert suites from ODL_VERSION to CompareStream

Change-Id: I4ec6174a8890caab96de22598c1f9a6388ffc50b
Signed-off-by: lbuckuli <lbuckuli@cisco.com>

diff --git a/csit/libraries/PacketcableVersion.robot b/csit/libraries/PacketcableVersion.robot
index 358a2ebe31b63c14a5a01b448d246f3ddad87add..7aff6dfd6c584e7f33f22269290c91f29d2809c1 100644 (file)
--- 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 d5cabe115136c5b578c9f162a15e525357d6f214..64bc2226875ec5175a1dfadcd12a2ad85e2a29b0 100644 (file)
--- 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 12e1383f4cfc1b360b483f1ee8413fef6764c0ee..8b226da7197a74741c9efd076d656230942b1c36 100644 (file)
--- 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 f84f7fc3753b119649a9e0819dd1ae9c4716ec32..12708ac0791d71c38278e1fac40d1dcdd4fc5fab 100644 (file)
--- 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 49f78700b14f35f9618dbd9a09b37fd4e7289e90..24477e7a8dc2f67d7d5b89348c7094072782fbf1 100644 (file)
--- 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 55f24537d1b5df35908ca15a4adabde65eabafdb..39f6e2ae918a051cc56080518e4a4618d84bc7df 100755 (executable)
--- 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 bf5edf932275b33ffc4014836339a16b990a55e0..30b03b61b84007cca8cced3d07948da5721e843e 100644 (file)
--- 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 8781d0f5c52340b5f8bfaee2b1a38106e7d8e9eb..446687fa502c514d802d1c9918a41bcf77f29c20 100644 (file)
--- 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 f68d5f77805502d7e3234fb9e8283039edbe3966..99ac01901f57aa8f4a13c9408f86d9c4e34f65db 100644 (file)
--- 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 30ed2aaf6ff9bd4d01539378bff7dd3c91fc3bb7..7d2aad3342038bede37c199978f49d7ec260a411 100644 (file)
--- 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 b962505903156845ad2f82fae07270dcc5280bba..83880899df398fa4cb9e76f176e6bc5854e8105e 100644 (file)
--- 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 98a5a83724422b4735527ac0830f700a37077a09..b071ed6a0e6f5facc7d2839fbf088f8045bcf6af 100644 (file)
--- 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 6a69cbba7c33dd9cd66e5536d71e973ab1793469..dc272b7f034d7966ab3dbcf1ce6491d79a407661 100644 (file)
--- 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