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

diff --git a/etc/neutron.conf b/etc/neutron.conf
index d2b838f251f332de8a4a54a0066c71e79a670219..29a4095f813dfdbfb03b294937a277addf32a59e 100755 (executable)
--- a/etc/neutron.conf
+++ b/etc/neutron.conf
@@ -1017,3 +1017,7 @@ lock_path = $state_path/lock
 # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake (boolean value)
 # Deprecated group/name - [DEFAULT]/fake_rabbit
 # fake_rabbit = false
+
+[qos]
+# Drivers list to use to send the update notification
+# notification_drivers = message_queue

diff --git a/neutron/services/qos/notification_drivers/manager.py b/neutron/services/qos/notification_drivers/manager.py
index f9b884f9d6ebe6c281bb023b3d7694d684df8685..2dd5e11977ba363b73177a5dac50278a7cb426b0 100644 (file)
--- a/neutron/services/qos/notification_drivers/manager.py
+++ b/neutron/services/qos/notification_drivers/manager.py
@@ -15,9 +15,9 @@ from oslo_log import log as logging
 from neutron.i18n import _LI
 from neutron import manager
 
-QOS_DRIVER_NAMESPACE = 'neutron.qos.service_notification_drivers'
+QOS_DRIVER_NAMESPACE = 'neutron.qos.notification_drivers'
 QOS_PLUGIN_OPTS = [
-    cfg.ListOpt('service_notification_drivers',
+    cfg.ListOpt('notification_drivers',
                 default='message_queue',
                 help=_('Drivers list to use to send the update notification')),
 ]
@@ -31,7 +31,7 @@ class QosServiceNotificationDriverManager(object):
 
     def __init__(self):
         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):
         for driver in self.notification_drivers:

diff --git a/neutron/tests/unit/services/qos/notification_drivers/test_manager.py b/neutron/tests/unit/services/qos/notification_drivers/test_manager.py
index 68c26ff5d303bb4b864627bd7e35cbb5db68b51f..6f67fa605b97607c27cd38d425f10fb2db70757a 100644 (file)
--- a/neutron/tests/unit/services/qos/notification_drivers/test_manager.py
+++ b/neutron/tests/unit/services/qos/notification_drivers/test_manager.py
@@ -27,7 +27,7 @@ DUMMY_DRIVER = ("neutron.tests.unit.services.qos.notification_drivers."
 
 def _load_multiple_drivers():
     cfg.CONF.set_override(
-        "service_notification_drivers",
+        "notification_drivers",
         ["message_queue", DUMMY_DRIVER],
         "qos")
 

diff --git a/setup.cfg b/setup.cfg
index 5c62423af29aa634f43e5c422ad56f504436c055..b3a3608a44ffb78644fd5121bc4a87c42a0e7fb1 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -155,7 +155,7 @@ neutron.service_providers =
     # 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.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
 neutron.ml2.type_drivers =
     flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver