From: Lou Berger <lberger@labn.net>
Date: Thu, 1 Feb 2018 01:20:26 +0000 (-0500)
Subject: bgp_l3vpn_to_bgp_vrf: skip tests when mpls not available
X-Git-Tag: frr-7.1-dev~151^2~140
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2015a49715e7242b8aba05307edb2236a05b5fe4;p=matthieu%2Ffrr.git

bgp_l3vpn_to_bgp_vrf: skip tests when mpls not available

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
index ed5646307f..8cc093623f 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/customize.py
@@ -148,6 +148,9 @@ def ltemplatePreRouterStartHook():
             'ip ru add iif cust1 table 10',
             'ip link set dev cust1 up']
     for rtr in rtrs:
+        if router.has_mpls() == False:
+            logger.info('MPLS not supported, test will be skipped')
+            return
         for cmd in cmds:
             doCmd(tgen, rtr, cmd)
         doCmd(tgen, rtr, 'ip link set dev {}-eth4 master cust1'.format(rtr))
@@ -179,6 +182,11 @@ def versionCheck(vstr, rname='r1', compstr='<',cli=False):
     tgen = get_topogen()
 
     router = tgen.gears[rname]
+
+    if router.has_mpls() == False:
+        ret = 'MPLS not supported'
+        return ret
+
     ret = True
     try:
         if router.has_version(compstr, vstr):