From: Tomas Markovic <tomas.markovic@pantheon.tech>
Date: Mon, 19 Nov 2018 13:16:03 +0000 (+0100)
Subject: Fix bgp_route_refresh line ending
X-Git-Tag: pre-potassium~460
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=b69738644cea3efe7f4a70a7574bac54601a7245

Fix bgp_route_refresh line ending

Karaf cli line ending is now updated even on oxygen.
Change test to reflect these changes.

Change-Id: Id80209750572e1f49649b53bd8b0b77d3b6ffee1
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>
---

diff --git a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
index b878f86a5a..4b1766800d 100644
--- a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
+++ b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
@@ -163,8 +163,6 @@ Verify_Cli_Output_Count
     ...    odl-bgpcep-bgp-cli is only avaiable on versions oxygen and above.
     ${output}    KarafKeywords.Safe_Issue_Command_On_Karaf_Console    bgp:operational-state -rib example-bgp-rib -neighbor ${TOOLS_SYSTEM_IP}
     BuiltIn.Log    ${output}
-    ${line_ending} =    CompareStream.Set_Variable_If_At_Least_Fluorine    ${EMPTY}    \r
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    NOT_COUNT=${notification_count}    UPD_COUNT=${update_count}    DIVIDER=│    LNE=${line_ending}
-    ...    RCV_COUNT=${receive_count}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    NOT_COUNT=${notification_count}    UPD_COUNT=${update_count}    DIVIDER=│    RCV_COUNT=${receive_count}
     ${expstate}    TemplatedRequests.Resolve_Text_From_Template_File    folder=${BGP_RR_VAR_FOLDER}/operational_cli    file_name=update.txt    mapping=${mapping}
     BuiltIn.Should_Contain    ${output}    ${expstate}
diff --git a/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt b/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
index 52802fe17a..c4153b81f1 100644
--- a/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
+++ b/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
@@ -1,8 +1,8 @@
-Messages state         $DIVIDER$LNE
-====================== $DIVIDER$LNE
-Messages Received      $DIVIDER$LNE
-NOTIFICATION           $DIVIDER $NOT_COUNT$LNE
-UPDATE                 $DIVIDER $UPD_COUNT$LNE
-Messages Sent          $DIVIDER$LNE
-NOTIFICATION           $DIVIDER 0$LNE
+Messages state         $DIVIDER
+====================== $DIVIDER
+Messages Received      $DIVIDER
+NOTIFICATION           $DIVIDER $NOT_COUNT
+UPDATE                 $DIVIDER $UPD_COUNT
+Messages Sent          $DIVIDER
+NOTIFICATION           $DIVIDER 0
 UPDATE                 $DIVIDER $RCV_COUNT