From: Ashish Pant <ashish12pant@gmail.com>
Date: Tue, 9 Jul 2019 04:49:56 +0000 (+0530)
Subject: tests: Fix info messages print in std_error
X-Git-Tag: base_7.2~149^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F4446%2Fhead;p=mirror%2Ffrr.git

tests: Fix info messages print in std_error

Signed-off-by: Ashish Pant <ashish12pant@gmail.com>

frr-reolad.py invocation sends info message to stderror channel
Redirected stderror from frr-reload.py to stdout

Fixed verify_convergence when more than one link is present
---

diff --git a/tests/topotests/lib/bgp.py b/tests/topotests/lib/bgp.py
index 34b48eed12..13f8824976 100644
--- a/tests/topotests/lib/bgp.py
+++ b/tests/topotests/lib/bgp.py
@@ -904,8 +904,9 @@ def clear_bgp_and_verify(tgen, topo, router):
 
         # To find neighbor ip type
         bgp_addr_type = topo["routers"][router]["bgp"]["address_family"]
+        total_peer = 0
         for addr_type in bgp_addr_type.keys():
-            total_peer = 0
+
             if not check_address_types(addr_type):
                 continue
 
@@ -914,17 +915,16 @@ def clear_bgp_and_verify(tgen, topo, router):
             for bgp_neighbor in bgp_neighbors:
                 total_peer += len(bgp_neighbors[bgp_neighbor]["dest_link"])
 
+        no_of_peer = 0
         for addr_type in bgp_addr_type:
             bgp_neighbors = bgp_addr_type[addr_type]["unicast"]["neighbor"]
-            no_of_peer = 0
 
             for bgp_neighbor, peer_data in bgp_neighbors.iteritems():
                 for dest_link, peer_dict in peer_data["dest_link"].iteritems():
                     data = topo["routers"][bgp_neighbor]["links"]
 
                     if dest_link in data:
-                        neighbor_ip = data[dest_link][addr_type].split(
-                            "/")[0]
+                        neighbor_ip = data[dest_link][addr_type].split("/")[0]
                         if addr_type == "ipv4":
                             ipv4_data = show_bgp_json["ipv4Unicast"][
                                 "peers"]
@@ -984,9 +984,8 @@ def clear_bgp_and_verify(tgen, topo, router):
 
         # To find neighbor ip type
         bgp_addr_type = topo["routers"][router]["bgp"]["address_family"]
-
+        total_peer = 0
         for addr_type in bgp_addr_type.keys():
-            total_peer = 0
             if not check_address_types(addr_type):
                 continue
 
@@ -995,16 +994,16 @@ def clear_bgp_and_verify(tgen, topo, router):
             for bgp_neighbor in bgp_neighbors:
                 total_peer += len(bgp_neighbors[bgp_neighbor]["dest_link"])
 
+        no_of_peer = 0
         for addr_type in bgp_addr_type:
             bgp_neighbors = bgp_addr_type[addr_type]["unicast"]["neighbor"]
-            no_of_peer = 0
 
             for bgp_neighbor, peer_data in bgp_neighbors.iteritems():
                 for dest_link, peer_dict in peer_data["dest_link"].iteritems():
                     data = topo["routers"][bgp_neighbor]["links"]
 
                     if dest_link in data:
-                        neighbor_ip = data[dest_link][addr_type]. \
+                        neighbor_ip = data[dest_link][addr_type].\
                             split("/")[0]
                         if addr_type == "ipv4":
                             ipv4_data = show_bgp_json["ipv4Unicast"][
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index 0598a154dd..d2c1d82430 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -21,6 +21,8 @@
 from collections import OrderedDict
 from datetime import datetime
 from time import sleep
+from subprocess import call
+from subprocess import STDOUT as SUB_STDOUT
 import StringIO
 import os
 import ConfigParser
@@ -233,7 +235,7 @@ def reset_config_on_routers(tgen, routerName=None):
         command = "/usr/lib/frr/frr-reload.py  --input {}/{}/frr.sav" \
                   " --test {}/{}/frr_json_initial.conf > {}". \
             format(TMPDIR, rname, TMPDIR, rname, dname)
-        result = os.system(command)
+        result = call(command, shell=True, stderr=SUB_STDOUT)
 
         # Assert if command fail
         if result > 0:
@@ -359,7 +361,6 @@ def start_topology(tgen):
                 os.chdir('{}/{}'.format(TMPDIR, rname))
                 os.system('touch zebra.conf bgpd.conf')
 
-
         except IOError as (errno, strerror):
             logger.error("I/O error({0}): {1}".format(errno, strerror))