X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FTopoprocessingKeywords.robot;h=ede3e594e15b284d3c2628a2dd3da5621be7c031;hb=29be6990677cd2ff0c8eb9f7edfb1c7624524eb3;hp=2e17b5811445791b1304fa49694e2a14bbe3e753;hpb=c05fc47d67bf08c2891a46691c6ff809f9a78030;p=integration%2Ftest.git

diff --git a/csit/libraries/TopoprocessingKeywords.robot b/csit/libraries/TopoprocessingKeywords.robot
index 2e17b58114..ede3e594e1 100644
--- a/csit/libraries/TopoprocessingKeywords.robot
+++ b/csit/libraries/TopoprocessingKeywords.robot
@@ -5,6 +5,7 @@ Variables         ../variables/topoprocessing/TopologyRequests.py
 Library           RequestsLibrary
 Library           SSHLibrary
 Library           XML
+Resource          CompareStream.robot
 Resource          KarafKeywords.robot
 Resource          SetupUtils.robot
 Resource          Utils.robot
@@ -67,21 +68,17 @@ Setup Environment
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     Open Connection    ${ODL_SYSTEM_IP}
     Flexible Controller Login
-    Run Keyword If    '${ODL_STREAM}' == 'carbon'    Put File    ${CONFIGURATION_CFG}    ${REMOTE_CFG_FILE}
-    Run Keyword Unless    '${ODL_STREAM}' == 'carbon'    Put File    ${CONFIGURATION_XML}    ${REMOTE_XML_FILE}
+    Put File    ${CONFIGURATION_CFG}    ${REMOTE_CFG_FILE}
     Close Connection
     Wait Until Keyword Succeeds    2x    2s    Issue Command On Karaf Console    log:set DEBUG org.opendaylight.topoprocessing
-    Install a Feature    odl-restconf-noauth    timeout=30
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${SEND_ACCEPT_XML_HEADERS}
-    Install Features    odl-openflowplugin-nsf-model odl-topoprocessing-framework odl-topoprocessing-network-topology odl-topoprocessing-inventory odl-mdsal-models odl-ovsdb-southbound-impl
     Prepare New Feature Installation
     Insert Underlay topologies
 
 Install Features
     [Arguments]    ${features}    ${timeout}=180
     [Documentation]    Install features according to tested distribution
-    Run Keyword If    '${ODL_STREAM}' == 'beryllium'    Install Features for Beryllium Distribution    ${features}    ${timeout}
-    ...    ELSE    Install Features for Other Distributions    ${features}    ${timeout}
+    Install Features for Other Distributions    ${features}    ${timeout}
 
 Install Features for Beryllium Distribution
     [Arguments]    ${features}    ${timeout}
@@ -105,8 +102,7 @@ Clean Environment
     Log    ---- Clean Environment ----
     Open Connection    ${ODL_SYSTEM_IP}
     Flexible Controller Login
-    Run Keyword If    '${ODL_STREAM}' == 'carbon'    Put File    ${OPERATIONAL_CFG}    ${REMOTE_CFG_FILE}
-    Run Keyword Unless    '${ODL_STREAM}' == 'carbon'    Put File    ${OPERATIONAL_XML}    ${REMOTE_XML_FILE}
+    Put File    ${OPERATIONAL_CFG}    ${REMOTE_CFG_FILE}
     Close Connection
     Delete All Sessions