Clean up PcepOperations

[integration/test.git] / csit / libraries / distribution / StreamDistro.robot

diff --git a/csit/libraries/distribution/StreamDistro.robot b/csit/libraries/distribution/StreamDistro.robot
index 656e0f8feadc97eee6f1edda13baae17519124c9..d1528ec13e6fce743b6b120469d741f704d663d7 100644 (file)
--- a/csit/libraries/distribution/StreamDistro.robot
+++ b/csit/libraries/distribution/StreamDistro.robot
@@ -1,23 +1,24 @@
 *** Settings ***
-Documentation     Distribution testing: generate stream-dependent values.
-...           
-...               Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
-...           
-...               This program and the accompanying materials are made available under the
-...               terms of the Eclipse Public License v1.0 which accompanies this distribution,
-...               and is available at http://www.eclipse.org/legal/epl-v10.html
-...           
-...           
-...               As newer ODL versions are released, some values evolve from previously hardcoded constants.
-...               This Resource contains keywords for optaining the correct value for currently testes stream.
-Library           Collections
-Resource          ${CURDIR}/../CompareStream.robot
+Documentation       Distribution testing: generate stream-dependent values.
+...
+...                 Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
+...
+...                 This program and the accompanying materials are made available under the
+...                 terms of the Eclipse Public License v1.0 which accompanies this distribution,
+...                 and is available at http://www.eclipse.org/legal/epl-v10.html
+...
+...
+...                 As newer ODL versions are released, some values evolve from previously hardcoded constants.
+...                 This Resource contains keywords for optaining the correct value for currently testes stream.
+
+Library             Collections
+
 
 *** 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