Merge "Added missing [qos] section into neutron.conf" into feature/qos

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

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:

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")
 

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