Update vif driver of Ryu plugin

Fixes bug 1059393

This patch allows Ryu plugin to be compatible with Nova Security Groups.

Change-Id: Ief1039f4b73af2e815fed429cd717e64888565c9

diff --git a/quantum/plugins/ryu/nova/vif.py b/quantum/plugins/ryu/nova/vif.py
index 0e8810dc22120c86cc58d29e419c2ab9364ed7c4..1b924631834c59d0ef2eb0ad68927facbc0d69b7 100644 (file)
--- 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(