openstack
/
neutron
Code Issues Proposed changes

Added missing [qos] section into neutron.conf 

Also renamed service_notification_drivers into notification_drivers
since it's clear where it belongs anyway (it's in neutron.conf meaning
it's a server side configuration value).

Change-Id: I64610e4b60112daec982a8cacded9b9b936c10bd
Partially-Implements: blueprint quantum-qos-api
This commit is contained in:
Ihar Hrachyshka 2015-07-29 13:39:20 +02:00
parent ec1e812e34
commit f80aa722a6
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron.conf
View File

@ -1017,3 +1017,7 @@ lock_path = $state_path/lock
# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value) # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value)
# Deprecated group/name - [DEFAULT]/fake_rabbit # Deprecated group/name - [DEFAULT]/fake_rabbit
# fake_rabbit = false # fake_rabbit = false
[qos]
# Drivers list to use to send the update notification
# notification_drivers = message_queue

6
neutron/services/qos/notification_drivers/manager.py
View File

@ -15,9 +15,9 @@ from oslo_log import log as logging
from neutron.i18n import _LI from neutron.i18n import _LI
from neutron import manager from neutron import manager
QOS_DRIVER_NAMESPACE = 'neutron.qos.service_notification_drivers' QOS_DRIVER_NAMESPACE = 'neutron.qos.notification_drivers'
QOS_PLUGIN_OPTS = [ QOS_PLUGIN_OPTS = [
cfg.ListOpt('service_notification_drivers', cfg.ListOpt('notification_drivers',
default='message_queue', default='message_queue',
help=_('Drivers list to use to send the update notification')), help=_('Drivers list to use to send the update notification')),
] ]
@ -31,7 +31,7 @@ class QosServiceNotificationDriverManager(object):
def __init__(self): def __init__(self):
self.notification_drivers = [] self.notification_drivers = []
self._load_drivers(cfg.CONF.qos.service_notification_drivers) self._load_drivers(cfg.CONF.qos.notification_drivers)
def update_policy(self, qos_policy): def update_policy(self, qos_policy):
for driver in self.notification_drivers: for driver in self.notification_drivers:

2
neutron/tests/unit/services/qos/notification_drivers/test_manager.py
View File

@ -27,7 +27,7 @@ DUMMY_DRIVER = ("neutron.tests.unit.services.qos.notification_drivers."
def _load_multiple_drivers(): def _load_multiple_drivers():
cfg.CONF.set_override( cfg.CONF.set_override(
"service_notification_drivers", "notification_drivers",
["message_queue", DUMMY_DRIVER], ["message_queue", DUMMY_DRIVER],
"qos") "qos")

2
setup.cfg
View File

@ -155,7 +155,7 @@ neutron.service_providers =
# These are for backwards compat with Juno vpnaas service provider configuration values # These are for backwards compat with Juno vpnaas service provider configuration values
neutron.services.vpn.service_drivers.cisco_ipsec.CiscoCsrIPsecVPNDriver = neutron_vpnaas.services.vpn.service_drivers.cisco_ipsec:CiscoCsrIPsecVPNDriver neutron.services.vpn.service_drivers.cisco_ipsec.CiscoCsrIPsecVPNDriver = neutron_vpnaas.services.vpn.service_drivers.cisco_ipsec:CiscoCsrIPsecVPNDriver
neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver = neutron_vpnaas.services.vpn.service_drivers.ipsec:IPsecVPNDriver neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver = neutron_vpnaas.services.vpn.service_drivers.ipsec:IPsecVPNDriver
neutron.qos.service_notification_drivers = neutron.qos.notification_drivers =
message_queue = neutron.services.qos.notification_drivers.message_queue:RpcQosServiceNotificationDriver message_queue = neutron.services.qos.notification_drivers.message_queue:RpcQosServiceNotificationDriver
neutron.ml2.type_drivers = neutron.ml2.type_drivers =
flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver