Adds create_csr and add_https_certificate clean step

This commit adds new clean steps create_csr and add_https_certificate
to allow users to create certificate signing request and adds
https certificate to the iLO.

Story: 2009118
Task: 43016
Change-Id: I1e2da0e0da5e397b6e519e817e0bf60a02bbf007

2 files changed, 150 insertions, 0 deletions

diff --git a/ironic/tests/unit/drivers/modules/ilo/test_common.py b/ironic/tests/unit/drivers/modules/ilo/test_common.py
index 352eb0837..c5f89d512 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_common.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_common.py
@@ -30,6 +30,7 @@ from oslo_utils import uuidutils
 
 from ironic.common import boot_devices
 from ironic.common import exception
+from ironic.common import image_service
 from ironic.common import images
 from ironic.common import swift
 from ironic.conductor import task_manager
@@ -1504,3 +1505,37 @@ class IloCommonMethodsTestCase(BaseIloTest):
             self.assertRaises(exception.IloOperationError,
                               ilo_common.setup_uefi_https,
                               task, iso, True)
+
+    @mock.patch.object(image_service, 'FileImageService', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(image_service, 'HttpImageService', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(builtins, 'open', autospec=True)
+    def test_download_file_url(self, open_mock, http_mock, file_mock):
+        url = "file:///test1/iLO.crt"
+        target_file = "/a/b/c"
+        fd_mock = mock.MagicMock(spec=io.BytesIO)
+        open_mock.return_value = fd_mock
+        fd_mock.__enter__.return_value = fd_mock
+        ilo_common.download(target_file, url)
+        open_mock.assert_called_once_with(target_file, 'wb')
+        http_mock.assert_not_called()
+        file_mock.return_value.download.assert_called_once_with(
+            "/test1/iLO.crt", fd_mock)
+
+    @mock.patch.object(image_service, 'FileImageService', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(image_service, 'HttpImageService', spec_set=True,
+                       autospec=True)
+    @mock.patch.object(builtins, 'open', autospec=True)
+    def test_download_http_url(self, open_mock, http_mock, file_mock):
+        url = "http://1.1.1.1/iLO.crt"
+        target_file = "/a/b/c"
+        fd_mock = mock.MagicMock(spec=io.BytesIO)
+        open_mock.return_value = fd_mock
+        fd_mock.__enter__.return_value = fd_mock
+        ilo_common.download(target_file, url)
+        http_mock.return_value.download.assert_called_once_with(
+            "http://1.1.1.1/iLO.crt", fd_mock)
+        file_mock.assert_not_called()
+        open_mock.assert_called_once_with(target_file, 'wb')
diff --git a/ironic/tests/unit/drivers/modules/ilo/test_management.py b/ironic/tests/unit/drivers/modules/ilo/test_management.py
index e4d891c3d..f087c4d58 100644
--- a/ironic/tests/unit/drivers/modules/ilo/test_management.py
+++ b/ironic/tests/unit/drivers/modules/ilo/test_management.py
@@ -14,9 +14,12 @@
 
 """Test class for Management Interface used by iLO modules."""
 
+import os
+import shutil
 from unittest import mock
 
 import ddt
+from oslo_config import cfg
 from oslo_utils import importutils
 from oslo_utils import uuidutils
 
@@ -42,6 +45,8 @@ ilo_error = importutils.try_import('proliantutils.exception')
 
 INFO_DICT = db_utils.get_test_ilo_info()
 
+CONF = cfg.CONF
+
 
 @ddt.ddt
 class IloManagementTestCase(test_common.BaseIloTest):
@@ -424,6 +429,116 @@ class IloManagementTestCase(test_common.BaseIloTest):
             step_mock.assert_called_once_with(
                 task.node, 'update_authentication_failure_logging', '1', False)
 
+    @mock.patch.object(ilo_management, '_execute_ilo_step',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(os, 'makedirs', spec_set=True, autospec=True)
+    def test_create_csr(self, os_mock, step_mock):
+        csr_params_args = {
+            "City": "Bangalore",
+            "CommonName": "1.1.1.1",
+            "Country": "ABC",
+            "OrgName": "DEF",
+            "State": "IJK"
+        }
+        csr_args = {
+            "csr_params": csr_params_args}
+        CONF.ilo.cert_path = "/var/lib/ironic/ilo"
+
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            task.driver.management.create_csr(task, **csr_args)
+            cert_path = os.path.join(CONF.ilo.cert_path, self.node.uuid)
+            step_mock.assert_called_once_with(task.node, 'create_csr',
+                                              cert_path, csr_params_args)
+            os_mock.assert_called_once_with(cert_path, 0o755)
+
+    @mock.patch.object(ilo_management, '_execute_ilo_step',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(os, 'makedirs', spec_set=True, autospec=True)
+    @mock.patch.object(shutil, 'copy', spec_set=True, autospec=True)
+    def test_add_https_certificate(self, shutil_mock, os_mock,
+                                   step_mock):
+        CONF.ilo.cert_path = "/var/lib/ironic/ilo"
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            cert_file_args = {'cert_file': '/test1/cert'}
+            task.driver.management.add_https_certificate(
+                task, **cert_file_args)
+            cert_path = os.path.join(CONF.ilo.cert_path, self.node.uuid)
+            cert_path_name = os.path.join(cert_path, self.node.uuid)
+            filename = cert_path_name + ".crt"
+            step_mock.assert_called_once_with(
+                task.node, 'add_https_certificate', filename)
+            os_mock.assert_called_once_with(cert_path, 0o755)
+            shutil_mock.assert_called_once_with('/test1/cert', filename)
+
+    @mock.patch.object(ilo_management, '_execute_ilo_step',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(os, 'makedirs', spec_set=True, autospec=True)
+    @mock.patch.object(shutil, 'copy', spec_set=True, autospec=True)
+    @mock.patch.object(ilo_common, 'download', spec_set=True, autospec=True)
+    def test_add_https_certificate_fileurl(self, download_mock, shutil_mock,
+                                           os_mock, step_mock):
+        CONF.ilo.cert_path = "/var/lib/ironic/ilo"
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            cert_file_args = {'cert_file': 'file:///test1/cert'}
+            task.driver.management.add_https_certificate(
+                task, **cert_file_args)
+            cert_path = os.path.join(CONF.ilo.cert_path, self.node.uuid)
+            cert_path_name = os.path.join(cert_path, self.node.uuid)
+            fname = cert_path_name + ".crt"
+            step_mock.assert_called_once_with(
+                task.node, 'add_https_certificate', fname)
+            os_mock.assert_called_once_with(cert_path, 0o755)
+            shutil_mock.assert_not_called()
+            download_mock.assert_called_once_with(fname, 'file:///test1/cert')
+
+    @mock.patch.object(ilo_management, '_execute_ilo_step',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(os, 'makedirs', spec_set=True, autospec=True)
+    @mock.patch.object(shutil, 'copy', spec_set=True, autospec=True)
+    @mock.patch.object(ilo_common, 'download', spec_set=True, autospec=True)
+    def test_add_https_certificate_httpurl(self, download_mock, shutil_mock,
+                                           os_mock, step_mock):
+        CONF.ilo.cert_path = "/var/lib/ironic/ilo"
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            cert_file_args = {'cert_file': 'http://1.1.1.1/cert'}
+            task.driver.management.add_https_certificate(
+                task, **cert_file_args)
+            cert_path = os.path.join(CONF.ilo.cert_path, self.node.uuid)
+            cert_path_name = os.path.join(cert_path, self.node.uuid)
+            fname = cert_path_name + ".crt"
+            step_mock.assert_called_once_with(
+                task.node, 'add_https_certificate', fname)
+            os_mock.assert_called_once_with(cert_path, 0o755)
+            shutil_mock.assert_not_called()
+            download_mock.assert_called_once_with(fname, 'http://1.1.1.1/cert')
+
+    @mock.patch.object(ilo_management, '_execute_ilo_step',
+                       spec_set=True, autospec=True)
+    @mock.patch.object(os, 'makedirs', spec_set=True, autospec=True)
+    @mock.patch.object(shutil, 'copy', spec_set=True, autospec=True)
+    @mock.patch.object(ilo_common, 'download', spec_set=True, autospec=True)
+    def test_add_https_certificate_url_exception(self, download_mock,
+                                                 shutil_mock, os_mock,
+                                                 step_mock):
+        CONF.ilo.cert_path = "/var/lib/ironic/ilo"
+        with task_manager.acquire(self.context, self.node.uuid,
+                                  shared=False) as task:
+            cert_file_args = {'cert_file': 'swift://1.1.1.1/cert'}
+            self.assertRaises(exception.IloOperationNotSupported,
+                              task.driver.management.add_https_certificate,
+                              task,
+                              **cert_file_args)
+
+            cert_path = os.path.join(CONF.ilo.cert_path, self.node.uuid)
+            step_mock.assert_not_called()
+            os_mock.assert_called_once_with(cert_path, 0o755)
+            shutil_mock.assert_not_called()
+            download_mock.assert_not_called()
+
     @mock.patch.object(deploy_utils, 'build_agent_options',
                        spec_set=True, autospec=True)
     @mock.patch.object(ilo_boot.IloVirtualMediaBoot, 'clean_up_ramdisk',