Support only Nitrogen+ distributions

Carbon is not supported anymore and these keywords are not referenced,
remove them. Also remove If_At_Least_Nitrogen keywords, as these are
considered always-true now.

JIRA: INTTEST-133
Change-Id: I453fdd301ba85aebe0138131bedf71ece9e47f58
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/csit/libraries/CompareStream.robot b/csit/libraries/CompareStream.robot
index 737ccb1c09eca6c047bfb60a9c7a72c30368f8b4..deccc6ee6a138654f38c8bd20546ac9a2b3bdeef 100644 (file)
--- a/csit/libraries/CompareStream.robot
+++ b/csit/libraries/CompareStream.robot
@@ -11,7 +11,6 @@ Library             String
 
 *** Variables ***
 &{Stream_dict}
-...                 carbon=${6}
 ...                 nitrogen=${7}
 ...                 oxygen=${8}
 ...                 fluorine=${9}
@@ -48,18 +47,6 @@ Set_Variable_If_At_Most
     ...    ${value_if_true}
     ...    ${value_if_false}
 
-Set_Variable_If_At_Least_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least carbon,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    carbon    ${value_if_true}    ${value_if_false}
-
-Set_Variable_If_At_Least_Nitrogen
-    [Documentation]    Compare nitrogen to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least nitrogen,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    nitrogen    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Least_Oxygen
     [Documentation]    Compare oxygen to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least oxygen,
     ...    return ${value_if_false} otherwise.
@@ -114,12 +101,6 @@ Set_Variable_If_At_Least_Chlorine
     [Arguments]    ${value_if_true}    ${value_if_false}
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    chlorine    ${value_if_true}    ${value_if_false}
 
-Set_Variable_If_At_Most_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most carbon,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    carbon    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Most_Nitrogen
     [Documentation]    Compare nitrogen to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most nitrogen,
     ...    return ${value_if_false} otherwise.
@@ -321,18 +302,6 @@ Run_Keyword_If_Less_Than
     ...    @{varargs}
     ...    &{kwargs}
 
-Run_Keyword_If_At_Least_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is at least carbon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    carbon    ${kw_name}    @{varargs}    &{kwargs}
-
-Run_Keyword_If_At_Least_Nitrogen
-    [Documentation]    Compare nitrogen to ${ODL_STREAM} and in case ${ODL_STREAM} is at least nitrogen,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    nitrogen    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Least_Oxygen
     [Documentation]    Compare oxygen to ${ODL_STREAM} and in case ${ODL_STREAM} is at least oxygen,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -393,12 +362,6 @@ Run_Keyword_If_At_Least_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_At_Most_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is at most carbon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    carbon    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Most_Nitrogen
     [Documentation]    Compare nitrogen to ${ODL_STREAM} and in case ${ODL_STREAM} is at most nitrogen,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -465,12 +428,6 @@ Run_Keyword_If_At_Most_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_More_Than_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is more than carbon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_More_Than_Nitrogen
     [Documentation]    Compare nitrogen to ${ODL_STREAM} and in case ${ODL_STREAM} is more than nitrogen,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -537,12 +494,6 @@ Run_Keyword_If_More_Than_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_Less_Than_Carbon
-    [Documentation]    Compare carbon to ${ODL_STREAM} and in case ${ODL_STREAM} is less than carbon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    carbon    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_Less_Than_Nitrogen
     [Documentation]    Compare nitrogen to ${ODL_STREAM} and in case ${ODL_STREAM} is less than nitrogen,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.

diff --git a/csit/libraries/NexusKeywords.robot b/csit/libraries/NexusKeywords.robot
index f30c3fcf608f2a5fd08cf99e8c39d8ac64569893..87ccc7adbd3876e147bafcf0c022672fd54eb46e 100644 (file)
--- a/csit/libraries/NexusKeywords.robot
+++ b/csit/libraries/NexusKeywords.robot
@@ -380,9 +380,7 @@ Get_ODL_Versions_From_Nexus
     @{elements} =    XML.Get_Elements    ${root}    .//version
     ${versions} =    BuiltIn.Create_List
     FOR    ${element}    IN    @{elements}
-        IF    'Carbon' not in $element.text
-            Collections.Append_To_List    ${versions}    ${element.text}
-        END
+        Collections.Append_To_List    ${versions}    ${element.text}
     END
     Collections.Sort_List    ${versions}
     BuiltIn.Log_Many    @{versions}

diff --git a/csit/libraries/SxpLib.robot b/csit/libraries/SxpLib.robot
index e2f7c61a1c5d9428e61da15ed8069a970ec98ae8..9be72f4c57449bdaaf64a80b981cb9f6d4a646a4 100644 (file)
--- a/csit/libraries/SxpLib.robot
+++ b/csit/libraries/SxpLib.robot
@@ -203,20 +203,12 @@ Update Filter
 Prepare Add/Update Filter Data
     [Documentation]    Prepare XML payload for add-filter and update-filter RPCs. Payloads for both RPCs are the same.
     [Arguments]    ${name}    ${type}    ${entries}    ${node}=127.0.0.1    ${policy}=auto-update
-    ${data} =    CompareStream.Run_Keyword_If_At_Least_Else
-    ...    carbon
-    ...    Add Filter Xml
+    ${data} =    Add Filter Xml
     ...    ${name}
     ...    ${type}
     ...    ${entries}
     ...    ${node}
     ...    ${policy}
-    ...    ELSE
-    ...    Add Filter Xml
-    ...    ${name}
-    ...    ${type}
-    ...    ${entries}
-    ...    ${node}
     RETURN    ${data}
 
 Add Domain Filter

diff --git a/csit/libraries/distribution/StreamDistro.robot b/csit/libraries/distribution/StreamDistro.robot
index b815e08d6183f4462f5d0edbb758bcbe783d99f7..d1528ec13e6fce743b6b120469d741f704d663d7 100644 (file)
--- a/csit/libraries/distribution/StreamDistro.robot
+++ b/csit/libraries/distribution/StreamDistro.robot
@@ -12,17 +12,13 @@ Documentation       Distribution testing: generate stream-dependent values.
 ...                 This Resource contains keywords for optaining the correct value for currently testes stream.
 
 Library             Collections
-Resource            ${CURDIR}/../CompareStream.robot
 
 
 *** Keywords ***
 Compose_Zip_Filename_Prefix
-    [Documentation]    Return "karaf" if at least Nitrogen, else return "distribution-karaf".
-    BuiltIn.Run_Keyword_And_Return    CompareStream.Set_Variable_If_At_Least_Nitrogen    karaf    distribution-karaf
+    [Documentation]    Return "karaf"
+    RETURN    karaf
 
 Compose_Test_Feature_Repo_Name
-    [Documentation]    Return "features-test" if at least Nitrogen, else return "features-integration-test".
-    BuiltIn.Run_Keyword_And_Return
-    ...    CompareStream.Set_Variable_If_At_Least_Nitrogen
-    ...    features-test
-    ...    features-integration-test
+    [Documentation]    Return "features-test"
+    RETURN    features-test

diff --git a/csit/suites/controller/akka_upgrade/1node.robot b/csit/suites/controller/akka_upgrade/1node.robot
index 1a21fcd6e20f6c3451d65ed86b9995952aa9ef8d..9749606c370f49de8bf663f6c5130a7553f5a2a1 100644 (file)
--- a/csit/suites/controller/akka_upgrade/1node.robot
+++ b/csit/suites/controller/akka_upgrade/1node.robot
@@ -41,7 +41,6 @@ Documentation       Suite for testing upgrading persisted data from earlier rele
 
 Library             String
 Library             SSHLibrary
-Resource            ${CURDIR}/../../../libraries/CompareStream.robot
 Resource            ${CURDIR}/../../../libraries/ClusterManagement.robot
 Resource            ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource            ${CURDIR}/../../../libraries/SSHKeywords.robot
@@ -108,9 +107,7 @@ Install_Older_Odl
     ...    grep 'featuresBoot' "${cfg_newer}" | grep -v 'featuresBootAsynchronous'
     ${karaf4_features} =    Extract_Karaf4_Boot_Features    ${csit_line}
     # TODO: this works only if old odl is karaf3. Once old and new odl both are e.g. karaf4 this will create invalid line.
-    ${new_csit_line} =    CompareStream.Set_Variable_If_At_Least_Nitrogen
-    ...    ${vanilla_line},${karaf4_features}
-    ...    ${csit_line}
+    ${new_csit_line} =    ${vanilla_line},${karaf4_features}
     # Replace the vanilla line.
     SSHKeywords.Execute_Command_Should_Pass    sed -i 's/${vanilla_line}/${new_csit_line}/g' "${cfg_older}"
     # Verify the replaced line.

diff --git a/csit/suites/netconf/clustering/outages.robot b/csit/suites/netconf/clustering/outages.robot
index 5353ee307e0d522a2c7562789bef7ccf2e2037bc..8f4778b01181a91d47e5349d95e0b036f3d0c5b9 100644 (file)
--- a/csit/suites/netconf/clustering/outages.robot
+++ b/csit/suites/netconf/clustering/outages.robot
@@ -92,7 +92,6 @@ Create_Device_Data_With_node1_Down
     [Documentation]    Check that the create requests work when node 1 is down.
     ...    As ODL may be in the process of connecting possible new master to the device,
     ...    the action is retried few times.
-    ...    TODO: Check exact status before retry. Carbon reports 404 instead of the correct 503.
     [Tags]    critical
     ${template_as_string}=    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}
     BuiltIn.Wait_Until_Keyword_Succeeds
@@ -143,7 +142,6 @@ Modify_Device_Data_With_node2_Down
     [Documentation]    Check that the modification requests work when node 2 is down.
     ...    As ODL may be in the process of connecting possible new master to the device,
     ...    the action is retried few times.
-    ...    TODO: Check exact status before retry. Carbon reports 404 instead of the correct 503.
     [Tags]    critical
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${MASTER_CONNECT_TIMEOUT}
@@ -195,7 +193,6 @@ Delete_Device_Data_With_node3_Down
     [Documentation]    Check that the data removal requests work when node 3 is down.
     ...    As ODL may be in the process of connecting possible new master to the device,
     ...    the action is retried few times.
-    ...    TODO: Check exact status before retry. Carbon reports 404 instead of the correct 503.
     [Tags]    critical
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${MASTER_CONNECT_TIMEOUT}