bgp_functional_route_ref fix

Addressing variety in order in cli output.
Devided template into multiple sections.

Change-Id: I9e2cde0dd82fe87d6f2ce6fa1ff349ce1644e90c
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 ffc70f7dbae1f4dce2182d09e0814df808b57cdd..b4c5014d82e15034bcd7ff3a4ce9a7145ef9711a 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
+++ b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
@@ -10,7 +10,7 @@ Documentation     Functional test for bgp - route refresh
 ...               This suite tests sending and receiveing route refresh message.
 ...               It uses odl and exabgp as bgp peers.
 ...               Sending route refresh message from odl is initiated via restconf.
-...               If route refresh received by odl also correct advertising of routes
+...               If route refresh is received by odl, correct advertising of routes
 ...               is verified. Receiving of route refresh by odl is verified by
 ...               checking appropriate message counter via odl-bgpcep-bgp-cli and
 ...               restconf using BGP neighbor operational state
@@ -155,7 +155,9 @@ Verify_Odl_Received_Updates_Cli
     ${output}=    KarafKeywords.Safe_Issue_Command_On_Karaf_Console    bgp:operational-state -rib example-bgp-rib -neighbor ${TOOLS_SYSTEM_IP}
     &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    COUNT=${expcount}
     ${expstate}    TemplatedRequests.Resolve_Text_From_Template_File    folder=${BGP_RR_VAR_FOLDER}/operational_cli/    file_name=update.txt    mapping=${mapping}
+    ${expstate_ipv4}    TemplatedRequests.Resolve_Text_From_Template_File    folder=${BGP_RR_VAR_FOLDER}/operational_cli/    file_name=update_ipv4.txt    mapping=${mapping}
     BuiltIn.Should_Contain    ${output}    ${expstate}
+    BuiltIn.Should_Contain    ${output}    ${expstate_ipv4}
 
 Verify_ExaBgp_Received_Route_Refresh
     [Arguments]    ${expcount}

diff --git a/csit/variables/bgpfunctional/route_refresh/operational_cli/route_refresh.txt b/csit/variables/bgpfunctional/route_refresh/operational_cli/route_refresh.txt
index 227feb87598f17ed237f58af8b07347b48e66231..9d2a1487d05effa673616f572e78436a7a173c8b 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/operational_cli/route_refresh.txt
+++ b/csit/variables/bgpfunctional/route_refresh/operational_cli/route_refresh.txt
@@ -5,27 +5,4 @@ NOTIFICATION           | $COUNT               \r
 UPDATE                 | 4               \r
 Messages Sent          |                 \r
 NOTIFICATION           | 0               \r
-UPDATE                 | 4               \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | IPV4UNICAST     \r
-Active                 | true            \r
-Prefixes               |                 \r
-Installed              | 0               \r
-Sent                   | 0               \r
-Received               | 0               \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | L2VPNEVPN       \r
-Active                 | false           \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | L3VPNIPV4UNICAST\r
-Active                 | true            \r
-Prefixes               |                 \r
-Installed              | 0               \r
-Sent                   | 0               \r
-Received               | 0
+UPDATE                 | 4

diff --git a/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt b/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
index 5e2d71db5e99f2a4c8e1bc7659e292b2a7370391..90ce5cfe12e99e25c923819943a1c2ed142a8389 100644 (file)
--- a/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
+++ b/csit/variables/bgpfunctional/route_refresh/operational_cli/update.txt
@@ -5,27 +5,4 @@ NOTIFICATION           | 0               \r
 UPDATE                 | $COUNT               \r
 Messages Sent          |                 \r
 NOTIFICATION           | 0               \r
-UPDATE                 | 4               \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | IPV4UNICAST     \r
-Active                 | true            \r
-Prefixes               |                 \r
-Installed              | 0               \r
-Sent                   | $COUNT               \r
-Received               | 0               \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | L2VPNEVPN       \r
-Active                 | false           \r
-                       |                 \r
-AFI state              |                 \r
-====================== |                 \r
-Family                 | L3VPNIPV4UNICAST\r
-Active                 | true            \r
-Prefixes               |                 \r
-Installed              | 0               \r
-Sent                   | 0               \r
-Received               | 0
+UPDATE                 | 4

diff --git a/csit/variables/bgpfunctional/route_refresh/operational_cli/update_ipv4.txt b/csit/variables/bgpfunctional/route_refresh/operational_cli/update_ipv4.txt
new file mode 100644 (file)
index 0000000..d62bd5b
--- /dev/null
+++ b/csit/variables/bgpfunctional/route_refresh/operational_cli/update_ipv4.txt
@@ -0,0 +1,8 @@
+AFI state              |                 \r
+====================== |                 \r
+Family                 | IPV4UNICAST     \r
+Active                 | true            \r
+Prefixes               |                 \r
+Installed              | 0               \r
+Sent                   | $COUNT               \r
+Received               | 0