From 074369c3f7f1ad61317a85fe45f68a3017e0a6d4 Mon Sep 17 00:00:00 2001 From: Yoshihiro Kaneko Date: Mon, 1 Oct 2012 15:56:50 +0900 Subject: [PATCH] Update vif driver of Ryu plugin Fixes bug 1059393 This patch allows Ryu plugin to be compatible with Nova Security Groups. Change-Id: Ief1039f4b73af2e815fed429cd717e64888565c9 --- quantum/plugins/ryu/nova/vif.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quantum/plugins/ryu/nova/vif.py b/quantum/plugins/ryu/nova/vif.py index 0e8810dc2..1b9246318 100644 --- a/quantum/plugins/ryu/nova/vif.py +++ b/quantum/plugins/ryu/nova/vif.py @@ -48,7 +48,7 @@ def _get_port_no(dev): return int(out.strip()) -class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtOpenVswitchDriver): +class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtHybridOVSBridgeDriver): def __init__(self, **kwargs): super(LibvirtOpenVswitchOFPRyuDriver, self).__init__() LOG.debug('ryu rest host %s', FLAGS.libvirt_ovs_bridge) @@ -57,8 +57,8 @@ class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtOpenVswitchDriver): def _get_port_no(self, mapping): iface_id = mapping['vif_uuid'] - dev = self.get_dev_name(iface_id) - return _get_port_no(dev) + _v1_name, v2_name = self.get_veth_pair_names(iface_id) + return _get_port_no(v2_name) def plug(self, instance, vif): result = super(LibvirtOpenVswitchOFPRyuDriver, self).plug( -- 2.45.2