Skip to content

S
slapos.core
Commit d39f159c authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

wip

parent b231f5ef
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
View file @ d39f159c
...@@ -49,6 +49,14 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -49,6 +49,14 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
self.portal.REQUEST['compute_node_key'] = None self.portal.REQUEST['compute_node_key'] = None
self.portal.REQUEST['compute_node_certificate'] = None self.portal.REQUEST['compute_node_certificate'] = None
def _getCommonNameList(self, ssl_certificate):
cn_list = [i.value for i in ssl_certificate.subject \
if i.oid == NameOID.COMMON_NAME and i.value != "erp5-user"]
self.assertEqual(len(cn_list), 1)
return cn_list[0]
def test_generateCertificate(self): def test_generateCertificate(self):
self.login(self.compute_node.getUserId()) self.login(self.compute_node.getUserId())
self.compute_node.generateCertificate() self.compute_node.generateCertificate()
...@@ -65,11 +73,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -65,11 +73,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
# TODO: Should we check for csr_id # TODO: Should we check for csr_id
#self.assertTrue(certificate_login.getCsrId() in compute_node_certificate) # self.assertTrue(certificate_login.getCsrId() in compute_node_certificate)
def test_generateCertificate_twice(self): def test_generateCertificate_twice(self):
self.login(self.compute_node.getUserId()) self.login(self.compute_node.getUserId())
...@@ -89,11 +97,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -89,11 +97,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
# TODO: Should we check for csr_id # TODO: Should we check for csr_id
#self.assertTrue(certificate_login.getCsrId() in compute_node_certificate) # self.assertTrue(certificate_login.getCsrId() in compute_node_certificate)
self.assertRaises(ValueError, self.compute_node.generateCertificate) self.assertRaises(ValueError, self.compute_node.generateCertificate)
self.assertEqual(None, self.portal.REQUEST.get('compute_node_key')) self.assertEqual(None, self.portal.REQUEST.get('compute_node_key'))
...@@ -289,11 +297,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -289,11 +297,11 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
# TODO: Should we check for csr_id # TODO: Should we check for csr_id
#self.assertTrue(certificate_login.getCsrId() in compute_node_certificate) # self.assertTrue(certificate_login.getCsrId() in compute_node_certificate)
self.assertNotEqual(certificate_login.getReference(), self.assertNotEqual(certificate_login.getReference(),
self.compute_node.getReference()) self.compute_node.getReference())
...@@ -331,7 +339,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -331,7 +339,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
# TODO: Should we check for csr_id # TODO: Should we check for csr_id
...@@ -371,7 +379,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -371,7 +379,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
# TODO: Should we check for csr_id # TODO: Should we check for csr_id
...@@ -408,7 +416,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -408,7 +416,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][-1]
self.assertEqual(new_certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(new_certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertNotEqual(certificate_login.getReference().decode("UTF-8"), cn)
...@@ -437,7 +445,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -437,7 +445,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(certificate_login.getReference(), self.assertNotEqual(certificate_login.getReference(),
self.compute_node.getReference()) self.compute_node.getReference())
...@@ -473,7 +481,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -473,7 +481,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(new_certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(new_certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(certificate_login.getReference().decode("UTF-8"), cn) self.assertNotEqual(certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(certificate_login.getReference(), self.assertNotEqual(certificate_login.getReference(),
...@@ -511,7 +519,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -511,7 +519,7 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate) ssl_certificate = x509.load_pem_x509_certificate(compute_node_certificate)
self.assertEqual(len(ssl_certificate.subject), 2) self.assertEqual(len(ssl_certificate.subject), 2)
cn = [i.value for i in ssl_certificate.subject if i.oid == NameOID.COMMON_NAME][0] cn = self._getCommonNameList(ssl_certificate)
self.assertEqual(third_certificate_login.getReference().decode("UTF-8"), cn) self.assertEqual(third_certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(new_certificate_login.getReference().decode("UTF-8"), cn) self.assertNotEqual(new_certificate_login.getReference().decode("UTF-8"), cn)
self.assertNotEqual(third_certificate_login.getReference(), self.assertNotEqual(third_certificate_login.getReference(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7