Commit fc58c089 authored by Julien Muchembled's avatar Julien Muchembled

stress: add support for old nftables

parent f21cdd86
Pipeline #9686 failed with stages
...@@ -47,7 +47,8 @@ NFT_TEMPLATE = """\ ...@@ -47,7 +47,8 @@ NFT_TEMPLATE = """\
policy accept policy accept
meta l4proto tcp %s dscp 1 mark 1 counter reject with tcp reset meta l4proto tcp %s dscp 1 mark 1 counter reject with tcp reset
} }
}""" }
"""
SocketConnector.KEEPALIVE = 5, 1, 1 SocketConnector.KEEPALIVE = 5, 1, 1
...@@ -400,7 +401,7 @@ class Application(StressApplication): ...@@ -400,7 +401,7 @@ class Application(StressApplication):
p.start() p.start()
ruleset = NFT_TEMPLATE % (nft_family, self._nft_table, ruleset = NFT_TEMPLATE % (nft_family, self._nft_table,
nft_family, '\n '.join(queue), nft_family) nft_family, '\n '.join(queue), nft_family)
p = subprocess.Popen(('nft', '-f', '-'), stdin=subprocess.PIPE, p = subprocess.Popen(('nft', '-f', '/dev/stdin'), stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
err = p.communicate(ruleset)[0].rstrip() err = p.communicate(ruleset)[0].rstrip()
if p.poll(): if p.poll():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment