mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-24 18:11:24 +01:00
Code Issues Projects Releases Wiki Activity

ovs/bridge: Make local_ip to optional field for tunnel

Browse Source 
To create GRE tunnel, the local_ip field is not mandatory field.
This patch makes the local_ip field to optional for the convenience.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2016-09-26 09:28:38 +09:00 committed by FUJITA Tomonori
parent 3d815d3455
commit 8627c28070
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ryu/lib/ovs/bridge.py
View File

@ -173,11 +173,13 @@ class OVSBridge(object):
self.run_command([command])
return command.result
def add_tunnel_port(self, name, tunnel_type, local_ip, remote_ip,
key=None):
options = 'local_ip=%(local_ip)s,remote_ip=%(remote_ip)s' % locals()
def add_tunnel_port(self, name, tunnel_type, remote_ip,
local_ip=None, key=None):
options = 'remote_ip=%(remote_ip)s' % locals()
if key:
options += ',key=%(key)s' % locals()
if local_ip:
options += ',local_ip=%(local_ip)s' % locals()
command_add = ovs_vsctl.VSCtlCommand('add-port', (self.br_name, name))
command_set = ovs_vsctl.VSCtlCommand(
@ -185,8 +187,9 @@ class OVSBridge(object):
'type=%s' % tunnel_type, 'options=%s' % options))
self.run_command([command_add, command_set])
def add_gre_port(self, name, local_ip, remote_ip, key=None):
self.add_tunnel_port(name, 'gre', local_ip, remote_ip, key=key)
def add_gre_port(self, name, remote_ip, local_ip=None, key=None):
self.add_tunnel_port(name, 'gre', remote_ip,
local_ip=local_ip, key=key)
def del_port(self, port_name):
command = ovs_vsctl.VSCtlCommand('del-port', (self.br_name, port_name))