From: Tomas Markovic <tomas.markovic@pantheon.tech>
Date: Mon, 30 Apr 2018 07:54:45 +0000 (+0200)
Subject: Fix bgp-cli test
X-Git-Tag: pre-potassium~815
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ea50b9378cf99c578c655716d9191241a99d9836;hp=bceb8e9f92b87ab16658de203cd87d76bff07f4e;p=integration%2Ftest.git

Fix bgp-cli test

ShellTable has now been migrated to
oxygen as well, so I unified test
with fluorine, since the only difference
was the divider and trailing
white spaces.

Change-Id: Ic9d4c2963cb80dce008cb773a64216acf0769f50
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 3f1bcfad95..3a53d4fb35 100644
--- a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
+++ b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
@@ -162,8 +162,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}
-    # cli output in karaf has changed in fluorine with different divider between results.
-    ${divider}    CompareStream.Set_Variable_If_At_Least_Fluorine    │    |
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    NOT_COUNT=${notification_count}    UPD_COUNT=${update_count}    DIVIDER=${divider}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    NOT_COUNT=${notification_count}    UPD_COUNT=${update_count}    DIVIDER=│
     ${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.oxygen/update.txt b/csit/variables/bgpfunctional/route_refresh/operational_cli.oxygen/update.txt
deleted file mode 100644
index a39bf4b92c..0000000000
--- a/csit/variables/bgpfunctional/route_refresh/operational_cli.oxygen/update.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Messages state         $DIVIDER                 \r
-====================== $DIVIDER                 \r
-Messages Received      $DIVIDER                 \r
-NOTIFICATION           $DIVIDER $NOT_COUNT               \r
-UPDATE                 $DIVIDER $UPD_COUNT               \r
-Messages Sent          $DIVIDER                 \r
-NOTIFICATION           $DIVIDER 0               \r
-UPDATE                 $DIVIDER 4