Fix retrieving ca_cert
Bay doesn't have ca_cert_uuid, so this patch fix to use ca_cert_ref. Change-Id: I76596216e70f8b01a9c94238f0e3df7c20b66042 Closes-Bug: #1493180
This commit is contained in:
parent
375b8fd606
commit
e3b2c0e037
|
@ -86,12 +86,12 @@ def generate_certificates_to_bay(bay):
|
|||
|
||||
|
||||
def get_bay_ca_certificate(bay):
|
||||
ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_uuid)
|
||||
ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_ref)
|
||||
return ca_cert.get_certificate()
|
||||
|
||||
|
||||
def sign_node_certificate(bay, csr):
|
||||
ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_uuid)
|
||||
ca_cert = cert_manager.get_backend().CertManager.get_cert(bay.ca_cert_ref)
|
||||
node_cert = x509.sign(csr, bay.name, ca_cert.get_private_key(),
|
||||
ca_cert.get_private_key_passphrase())
|
||||
return node_cert
|
||||
|
|
|
@ -138,7 +138,7 @@ class CertManagerTestCase(base.BaseTestCase):
|
|||
bay_ca_cert = cert_manager.sign_node_certificate(mock_bay, mock_csr)
|
||||
|
||||
self.CertManager.get_cert.assert_called_once_with(
|
||||
mock_bay.ca_cert_uuid)
|
||||
mock_bay.ca_cert_ref)
|
||||
mock_x509_sign.assert_called_once_with(mock_csr, mock_bay.name,
|
||||
mock.sentinel.priv_key,
|
||||
passphrase)
|
||||
|
@ -153,5 +153,5 @@ class CertManagerTestCase(base.BaseTestCase):
|
|||
bay_ca_cert = cert_manager.get_bay_ca_certificate(mock_bay)
|
||||
|
||||
self.CertManager.get_cert.assert_called_once_with(
|
||||
mock_bay.ca_cert_uuid)
|
||||
mock_bay.ca_cert_ref)
|
||||
self.assertEqual(bay_ca_cert, mock.sentinel.certificate)
|
||||
|
|
Loading…
Reference in New Issue