c552626664
* This is a massive patch that aims to clean up the codebase and bring it into compliance with HACKING.rst and PEP8 in one fell swoop. * Cleaned up use of gettext. * Updated log usage for consistency. * The tests run successfully against all plugins except cisco and nicira (due to dependency issues with these plugins). * Addresses bug 981208 Change-Id: I4d8c7ab138d8f7bb906d18dc34f88f8bd0581c19
81 lines
3.0 KiB
Python
81 lines
3.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
# Copyright 2012 Isaku Yamahata <yamahata at private email ne jp>
|
|
# <yamahata at valinux co jp>
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import httplib
|
|
|
|
from ryu.app.client import OFPClient
|
|
|
|
from nova import flags
|
|
from nova import log as logging
|
|
from nova.openstack.common import cfg
|
|
from nova import utils
|
|
from nova.virt.libvirt import vif as libvirt_vif
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
ryu_libvirt_ovs_driver_opt = cfg.StrOpt('libvirt_ovs_ryu_api_host',
|
|
default='127.0.0.1:8080',
|
|
help='Openflow Ryu REST API host:port')
|
|
|
|
FLAGS = flags.FLAGS
|
|
FLAGS.register_opt(ryu_libvirt_ovs_driver_opt)
|
|
|
|
|
|
def _get_datapath_id(bridge_name):
|
|
out, _err = utils.execute('ovs-vsctl', 'get', 'Bridge',
|
|
bridge_name, 'datapath_id', run_as_root=True)
|
|
return out.strip().strip('"')
|
|
|
|
|
|
def _get_port_no(dev):
|
|
out, _err = utils.execute('ovs-vsctl', 'get', 'Interface', dev,
|
|
'ofport', run_as_root=True)
|
|
return int(out.strip())
|
|
|
|
|
|
class LibvirtOpenVswitchOFPRyuDriver(libvirt_vif.LibvirtOpenVswitchDriver):
|
|
def __init__(self, **kwargs):
|
|
super(LibvirtOpenVswitchOFPRyuDriver, self).__init__()
|
|
LOG.debug('ryu rest host %s', FLAGS.libvirt_ovs_bridge)
|
|
self.ryu_client = OFPClient(FLAGS.libvirt_ovs_ryu_api_host)
|
|
self.datapath_id = _get_datapath_id(FLAGS.libvirt_ovs_bridge)
|
|
|
|
def _get_port_no(self, mapping):
|
|
iface_id = mapping['vif_uuid']
|
|
dev = self.get_dev_name(iface_id)
|
|
return _get_port_no(dev)
|
|
|
|
def plug(self, instance, network, mapping):
|
|
result = super(LibvirtOpenVswitchOFPRyuDriver, self).plug(
|
|
instance, network, mapping)
|
|
port_no = self._get_port_no(mapping)
|
|
self.ryu_client.create_port(network['id'], self.datapath_id, port_no)
|
|
return result
|
|
|
|
def unplug(self, instance, network, mapping):
|
|
port_no = self._get_port_no(mapping)
|
|
try:
|
|
self.ryu_client.delete_port(network['id'],
|
|
self.datapath_id, port_no)
|
|
except httplib.HTTPException as e:
|
|
res = e.args[0]
|
|
if res.status != httplib.NOT_FOUND:
|
|
raise
|
|
super(LibvirtOpenVswitchOFPRyuDriver, self).unplug(instance, network,
|
|
mapping)
|