Merge pull request #6657 from donaldsharp/pbr_disable_on_4.9

tests: pbr is not working properly on arm 4.9 kernels
This commit is contained in:
Mark Stapp 2020-07-01 07:45:17 -04:00 committed by GitHub
commit 8f36f59ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,7 @@ import re
import sys import sys
import pytest import pytest
import json import json
import platform
from functools import partial from functools import partial
# Save the Current Working Directory to find configuration files. # Save the Current Working Directory to find configuration files.
@ -85,6 +86,11 @@ def setup_module(module):
tgen = Topogen(NetworkTopo, module.__name__) tgen = Topogen(NetworkTopo, module.__name__)
tgen.start_topology() tgen.start_topology()
krel = platform.release()
if topotest.version_cmp(krel, "4.10") < 0:
tgen.errors = "Newer kernel than 4.9 needed for pbr tests"
pytest.skip(tgen.errors)
router_list = tgen.routers() router_list = tgen.routers()
for rname, router in router_list.iteritems(): for rname, router in router_list.iteritems():
# Install vrf into the kernel and slave eth3 # Install vrf into the kernel and slave eth3