Fix import path in neutron-sanity-check for ml2_sriov opts

neutron-sanity-check fails while importing ml2_sriov
configuration. This patch fixes the import path and
also includes a unit test to avoid such issues.

Closes-Bug: #1489374
Change-Id: I4265ee78be9e7f83e35c94187d4577b32005bef9

diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py
index 2188f3771a7dd54765dfa1a57190a7e8a98215a8..6d3b3dfe7ae47eb433880ac0abf97913f6c23b15 100644 (file)
--- a/neutron/cmd/sanity_check.py
+++ b/neutron/cmd/sanity_check.py
@@ -26,17 +26,21 @@ from neutron.i18n import _LE, _LW
 
 
 LOG = logging.getLogger(__name__)
-cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
-                      'agent.common.config')
-cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.'
-                      'agent.common.config')
-cfg.CONF.import_group('VXLAN', 'neutron.plugins.ml2.drivers.linuxbridge.'
-                      'agent.common.config')
-cfg.CONF.import_group('ml2', 'neutron.plugins.ml2.config')
-cfg.CONF.import_group('ml2_sriov',
-                      'neutron.plugins.ml2.drivers.mech_sriov.mech_driver')
-dhcp_agent.register_options()
-cfg.CONF.register_opts(l3_hamode_db.L3_HA_OPTS)
+
+
+def setup_conf():
+    cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
+                          'agent.common.config')
+    cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.'
+                          'agent.common.config')
+    cfg.CONF.import_group('VXLAN', 'neutron.plugins.ml2.drivers.linuxbridge.'
+                          'agent.common.config')
+    cfg.CONF.import_group('ml2', 'neutron.plugins.ml2.config')
+    cfg.CONF.import_group('ml2_sriov',
+                          'neutron.plugins.ml2.drivers.mech_sriov.mech_driver.'
+                          'mech_driver')
+    dhcp_agent.register_options()
+    cfg.CONF.register_opts(l3_hamode_db.L3_HA_OPTS)
 
 
 class BoolOptCallback(cfg.BoolOpt):
@@ -260,6 +264,7 @@ def all_tests_passed():
 
 
 def main():
+    setup_conf()
     cfg.CONF.register_cli_opts(OPTS)
     cfg.CONF.set_override('use_stderr', True)
     config.setup_logging()

diff --git a/neutron/tests/unit/cmd/test_sanity_check.py b/neutron/tests/unit/cmd/test_sanity_check.py
new file mode 100644 (file)
index 0000000..c30c2d5
--- /dev/null
+++ b/neutron/tests/unit/cmd/test_sanity_check.py
@@ -0,0 +1,24 @@
+# Copyright 2015 Red Hat, Inc.
+# 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.
+
+from neutron.cmd import sanity_check
+from neutron.tests import base
+
+
+class TestSanityCheck(base.BaseTestCase):
+
+    def test_setup_conf(self):
+        # verify that configuration can be successfully imported
+        sanity_check.setup_conf()