Adding upstream version 16.2.11+ds.upstream/16.2.11+dsupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 28 insertions, 0 deletions

diff --git a/src/pybind/mgr/dashboard/tests/test_ssl.py b/src/pybind/mgr/dashboard/tests/test_ssl.py
new file mode 100644
index 000000000..840f2b8c9
--- /dev/null
+++ b/src/pybind/mgr/dashboard/tests/test_ssl.py
@@ -0,0 +1,28 @@
+import errno
+import unittest
+
+from ..tests import CLICommandTestMixin, CmdException
+
+
+class SslTest(unittest.TestCase, CLICommandTestMixin):
+
+    def test_ssl_certificate_and_key(self):
+        with self.assertRaises(CmdException) as ctx:
+            self.exec_cmd('set-ssl-certificate', inbuf='', mgr_id='x')
+        self.assertEqual(ctx.exception.retcode, -errno.EINVAL)
+        self.assertEqual(str(ctx.exception), 'Please specify the certificate with "-i" option')
+
+        result = self.exec_cmd('set-ssl-certificate', inbuf='content', mgr_id='x')
+        self.assertEqual(result, 'SSL certificate updated')
+
+        with self.assertRaises(CmdException) as ctx:
+            self.exec_cmd('set-ssl-certificate-key', inbuf='', mgr_id='x')
+        self.assertEqual(ctx.exception.retcode, -errno.EINVAL)
+        self.assertEqual(str(ctx.exception), 'Please specify the certificate key with "-i" option')
+
+        result = self.exec_cmd('set-ssl-certificate-key', inbuf='content', mgr_id='x')
+        self.assertEqual(result, 'SSL certificate key updated')
+
+    def test_set_mgr_created_self_signed_cert(self):
+        result = self.exec_cmd('create-self-signed-cert')
+        self.assertEqual(result, 'Self-signed certificate created')