mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-21 16:41:36 +01:00
Code Issues Projects Releases Wiki Activity

packet_data_generator3: Support ovs-2.8

Browse Source 
From ovs 2.8, ovs-ofctl tries to collect port descriptions, which
isn't handled by the fake server in gen.py.  Pass the --no-names
option to work around this.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWAMOTO Toshihiro 2017-12-01 17:49:04 +09:00 committed by FUJITA Tomonori
parent 9fa0b58199
commit 381216075f
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ryu/tests/packet_data_generator3/gen.py
View File

@ -4,6 +4,7 @@ from __future__ import print_function
import getopt
import os
import re
import six
from six.moves import socketserver
import subprocess
@ -283,6 +284,18 @@ if __name__ == '__main__':
if not os.access(ofctl_cmd, os.X_OK):
raise Exception("%s is not executable" % ofctl_cmd)
ovs_version = subprocess.Popen([ofctl_cmd, '--version'],
stdout=subprocess.PIPE)
has_names = False
try:
ver_tuple = re.search('\s(\d+)\.(\d+)(\.\d*|\s*$)',
ovs_version.stdout.readline().decode()).groups()
if int(ver_tuple[0]) > 2 or \
int(ver_tuple[0]) == 2 and int(ver_tuple[1]) >= 8:
has_names = True
except AttributeError:
pass
outpath = '../packet_data'
socketdir = tempfile.mkdtemp()
socketname = os.path.join(socketdir, 'ovs')
@ -297,6 +310,8 @@ if __name__ == '__main__':
cmdargs = [ofctl_cmd, '-O', 'OpenFlow%2d' % (v + 9)]
if verbose:
cmdargs.append('-v')
if has_names:
cmdargs.append('--no-names')
cmdargs.append(msg['cmd'])
cmdargs.append('unix:%s' % socketname)
cmdargs.append('\n'.join(msg['args']))