From b54d05b9587baf6a57979d8a6ba8def8a1b6017e Mon Sep 17 00:00:00 2001 From: Masahito Muroi Date: Wed, 8 Aug 2018 11:59:21 +0900 Subject: [PATCH] Set username when initializing PhysicalHostMonitorPlugin PhysicalHostMonitorPlugin fails to set the username parameter during its initialization, which results in authorization errors when the plugin calls the Nova API. Change-Id: I64b9f7c3a97e70acca996c52ff739c6c4397dd8f Partial-Bug: #1785945 --- blazar/plugins/oshosts/host_plugin.py | 1 + blazar/tests/plugins/oshosts/test_physical_host_plugin.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/blazar/plugins/oshosts/host_plugin.py b/blazar/plugins/oshosts/host_plugin.py index fa5d1294..cde1dae9 100644 --- a/blazar/plugins/oshosts/host_plugin.py +++ b/blazar/plugins/oshosts/host_plugin.py @@ -669,6 +669,7 @@ class PhysicalHostMonitorPlugin(base.BaseMonitorPlugin, cls._instance = super(PhysicalHostMonitorPlugin, cls).__new__(cls) cls._instance.healing_handlers = [] super(PhysicalHostMonitorPlugin, cls._instance).__init__( + username=CONF.os_admin_username, password=CONF.os_admin_password, user_domain_name=CONF.os_admin_user_domain_name, project_name=CONF.os_admin_project_name, diff --git a/blazar/tests/plugins/oshosts/test_physical_host_plugin.py b/blazar/tests/plugins/oshosts/test_physical_host_plugin.py index 10b30ce5..69d3a7f7 100644 --- a/blazar/tests/plugins/oshosts/test_physical_host_plugin.py +++ b/blazar/tests/plugins/oshosts/test_physical_host_plugin.py @@ -1886,11 +1886,13 @@ class PhysicalHostMonitorPluginTestCase(tests.TestCase): # reset the singleton at first host_plugin.PhysicalHostMonitorPlugin._instance = None self.cfg = self.useFixture(conf_fixture.Config(CONF)) + self.cfg.config(os_admin_username='fake-user') self.cfg.config(os_admin_password='fake-passwd') self.cfg.config(os_admin_user_domain_name='fake-user-domain') self.cfg.config(os_admin_project_name='fake-pj-name') self.cfg.config(os_admin_project_domain_name='fake-pj-domain') self.host_monitor_plugin = host_plugin.PhysicalHostMonitorPlugin() + self.assertEqual('fake-user', self.host_monitor_plugin.username) self.assertEqual("fake-passwd", self.host_monitor_plugin.password) self.assertEqual("fake-user-domain", self.host_monitor_plugin.user_domain_name)