summaryrefslogtreecommitdiff
path: root/tests/topotests/lib/topogen.py
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2018-06-30 15:18:33 -0400
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-11-27 20:22:14 -0500
commitfb80b81b2673a0826640450c0eef2be65b652f1d (patch)
treeecc48b156882d0f7d4666d5d7e6afc5015ccfc7c /tests/topotests/lib/topogen.py
parent95460a6b7ecd82dc5210774a0cefea665da86921 (diff)
lib: add and use Router.checkRouterVersion (based on bdpd version)
Signed-off-by: Lou Berger <lberger@labn.net>
Diffstat (limited to 'tests/topotests/lib/topogen.py')
-rw-r--r--tests/topotests/lib/topogen.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index 63d3a5afdd..9e4132e8fb 100644
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -776,23 +776,7 @@ class TopoRouter(TopoGear):
Usage example: router.has_version('>', '1.0')
"""
- rversion = self.version_info()['version']
- if rversion is None:
- return False
-
- result = topotest.version_cmp(rversion, version)
- if cmpop == '>=':
- return result >= 0
- if cmpop == '>':
- return result > 0
- if cmpop == '=':
- return result == 0
- if cmpop == '<':
- return result < 0
- if cmpop == '<':
- return result < 0
- if cmpop == '<=':
- return result <= 0
+ return self.tgen.net[self.name].checkRouterVersion(cmpop, version)
def has_type(self, rtype):
"""