Merge pull request #8946 from gpnaveen/bgp_lib_changes

tests: Adding lib changes for bgp peer type verification.

1 files changed, 51 insertions, 32 deletions

diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index 72f2b5b5c2..6a02e50127 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -609,6 +609,7 @@ def load_config_to_router(tgen, routerName, save_bkup=False):
     return True
 
 
+
 def get_frr_ipv6_linklocal(tgen, router, intf=None, vrf=None):
     """
     API to get the link local ipv6 address of a particular interface using
@@ -641,38 +642,48 @@ def get_frr_ipv6_linklocal(tgen, router, intf=None, vrf=None):
         else:
             cmd = "show interface"
 
-        ifaces = router_list[router].run('vtysh -c "{}"'.format(cmd))
-
-        # Fix newlines (make them all the same)
-        ifaces = ("\n".join(ifaces.splitlines()) + "\n").splitlines()
-
-        interface = None
-        ll_per_if_count = 0
-        for line in ifaces:
-            # Interface name
-            m = re_search("Interface ([a-zA-Z0-9-]+) is", line)
-            if m:
-                interface = m.group(1).split(" ")[0]
-                ll_per_if_count = 0
-
-            # Interface ip
-            m1 = re_search("inet6 (fe80[:a-fA-F0-9]+[/0-9]+)", line)
-            if m1:
-                local = m1.group(1)
-                ll_per_if_count += 1
-                if ll_per_if_count > 1:
-                    linklocal += [["%s-%s" % (interface, ll_per_if_count), local]]
-                else:
-                    linklocal += [[interface, local]]
-
-    if linklocal:
-        if intf:
-            return [_linklocal[1] for _linklocal in linklocal if _linklocal[0] == intf][
-                0
-            ].split("/")[0]
-        return linklocal
-    else:
-        errormsg = "Link local ip missing on router {}"
+        linklocal = []
+        if vrf:
+            cmd = "show interface vrf {}".format(vrf)
+        else:
+            cmd = "show interface"
+        for chk_ll in range(0, 60):
+            sleep(1/4)
+            ifaces = router_list[router].run('vtysh -c "{}"'.format(cmd))
+            # Fix newlines (make them all the same)
+            ifaces = ('\n'.join(ifaces.splitlines()) + '\n').splitlines()
+
+            interface = None
+            ll_per_if_count = 0
+            for line in ifaces:
+                # Interface name
+                m = re_search('Interface ([a-zA-Z0-9-]+) is', line)
+                if m:
+                    interface = m.group(1).split(" ")[0]
+                    ll_per_if_count = 0
+
+                # Interface ip
+                m1 = re_search('inet6 (fe80[:a-fA-F0-9]+[\/0-9]+)',
+                              line)
+                if m1:
+                    local = m1.group(1)
+                    ll_per_if_count += 1
+                    if ll_per_if_count > 1:
+                        linklocal += [["%s-%s" %
+                                       (interface, ll_per_if_count), local]]
+                    else:
+                        linklocal += [[interface, local]]
+
+            try:
+                if linklocal:
+                    if intf:
+                        return [_linklocal[1] for _linklocal in linklocal if _linklocal[0]==intf][0].\
+                            split("/")[0]
+                    return linklocal
+            except IndexError:
+                continue
+
+        errormsg = "Link local ip missing on router {}".format(router)
         return errormsg
 
 
@@ -1818,6 +1829,14 @@ def create_interfaces_cfg(tgen, topo, build=False):
                     else:
                         interface_data.append("ipv6 address {}".format(intf_addr))
 
+                # Wait for vrf interfaces to get link local address once they are up
+                if not destRouterLink == 'lo' and 'vrf' in topo[c_router][
+                    'links'][destRouterLink]:
+                    vrf = topo[c_router]['links'][destRouterLink]['vrf']
+                    intf = topo[c_router]['links'][destRouterLink]['interface']
+                    ll = get_frr_ipv6_linklocal(tgen, c_router, intf=intf,
+                                vrf = vrf)
+
                 if "ipv6-link-local" in data:
                     intf_addr = c_data["links"][destRouterLink]["ipv6-link-local"]