From be58b5b95b6047c9009f99d45ac1a85d0376adcb Mon Sep 17 00:00:00 2001
From: Guang Yee <guang.yee@suse.com>
Date: Thu, 14 Feb 2019 14:36:58 -0800
Subject: [PATCH] properly convey Keystone v3 params

To properly support Keystone V3, we must also properly convey the
domain information to the underlaying Keystone client.

Change-Id: I725e107e418d15b65aabf24f8c05403f952f94d5
story: 2005018
Task: 29497
---
 monasca_setup/detection/plugins/libvirt.py |  4 ++
 tests/detection/test_libvirt.py            | 66 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 tests/detection/test_libvirt.py

diff --git a/monasca_setup/detection/plugins/libvirt.py b/monasca_setup/detection/plugins/libvirt.py
index 0d9b510d..df6e36d4 100644
--- a/monasca_setup/detection/plugins/libvirt.py
+++ b/monasca_setup/detection/plugins/libvirt.py
@@ -63,8 +63,10 @@ INT_ARGS = ['disk_collection_period', 'vnic_collection_period',
 
 _REQUIRED_OPTS = [
     {'opt': cfg.StrOpt('username'), 'group': 'keystone_authtoken'},
+    {'opt': cfg.StrOpt('user_domain_name'), 'group': 'keystone_authtoken'},
     {'opt': cfg.StrOpt('password'), 'group': 'keystone_authtoken'},
     {'opt': cfg.StrOpt('project_name'), 'group': 'keystone_authtoken'},
+    {'opt': cfg.StrOpt('project_domain_name'), 'group': 'keystone_authtoken'},
     {'opt': cfg.StrOpt('auth_url'), 'group': 'keystone_authtoken'}
 ]
 """Nova configuration opts required by this plugin"""
@@ -218,8 +220,10 @@ class Libvirt(plugin.Plugin):
             'vm_extended_disks_check_enable': False,
             'ping_check': False,
             'username': keystone_auth_section['username'],
+            'user_domain_name': keystone_auth_section['user_domain_name'],
             'password': keystone_auth_section['password'],
             'project_name': keystone_auth_section['project_name'],
+            'project_domain_name': keystone_auth_section['project_domain_name'],
             'auth_url': keystone_auth_section['auth_url']
         }
         return init_config
diff --git a/tests/detection/test_libvirt.py b/tests/detection/test_libvirt.py
new file mode 100644
index 00000000..b7970474
--- /dev/null
+++ b/tests/detection/test_libvirt.py
@@ -0,0 +1,66 @@
+# (C) Copyright 2019 SUSE LLC
+
+# 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 collections import namedtuple
+import mock
+import unittest
+
+from oslo_config import cfg
+
+from monasca_setup.detection.plugins.libvirt import Libvirt
+from monasca_setup.detection import utils
+
+
+class TestLibvirt(unittest.TestCase):
+
+    def setUp(self):
+        unittest.TestCase.setUp(self)
+
+    @mock.patch('monasca_setup.detection.utils.load_oslo_configuration')
+    def test_load_oslo_configuration_params(self, patched_load_oslo_config):
+        """Test oslo config options.
+
+        Making sure libvirt detection plugin pass the correct
+        params to utils.load_oslo_configuration().
+        """
+        plugin = Libvirt(mock.MagicMock())
+        nova_conf = plugin._find_nova_conf(mock.MagicMock())
+        self.assertTrue(patched_load_oslo_config.called)
+        args, kwargs = patched_load_oslo_config.call_args_list[0]
+        self.assertEqual('nova', kwargs['in_project'])
+        expected_options = [
+            'username',
+            'user_domain_name',
+            'password',
+            'project_name',
+            'project_domain_name',
+            'auth_url']
+        for opt in expected_options:
+            self.assertTrue(
+                any(d['opt'] == cfg.StrOpt(opt) for d in kwargs['for_opts']))
+
+    def test_init_config(self):
+        plugin = Libvirt(mock.MagicMock())
+        keystone_authtoken_args = {
+            'username': 'foo',
+            'user_domain_name': 'Default',
+            'password': 'secrete',
+            'project_name': 'bar',
+            'project_domain_name': 'Default',
+            'auth_url': 'https://127.0.0.1:5000/v3'
+        }
+        plugin.nova_conf = {'keystone_authtoken': keystone_authtoken_args}
+        init_config = plugin._get_init_config()
+        for arg in keystone_authtoken_args:
+            self.assertEqual(keystone_authtoken_args[arg], init_config[arg])