From 1eba47cff9cce4e040203b2af8ad70776bf79d12 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 18 Jan 2012 21:51:30 -0800 Subject: Clean up crypto.py * Remove chained certs since we don't use them * Make get_vpn use the existing generate call instead of shell script * (Bonus: we can revoke vpn certs now) Change-Id: I8e118c5bd3dee6ba7c6a2a1390874b69008c436b --- nova/tests/test_auth.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_auth.py b/nova/tests/test_auth.py index 1b3166af7..b1feb0856 100644 --- a/nova/tests/test_auth.py +++ b/nova/tests/test_auth.py @@ -255,15 +255,11 @@ class _AuthManagerBaseTestCase(test.TestCase): _key, cert_str = crypto.generate_x509_cert(user.id, project.id) LOG.debug(cert_str) - full_chain = crypto.fetch_ca(project_id=project.id, chain=True) - int_cert = crypto.fetch_ca(project_id=project.id, chain=False) + int_cert = crypto.fetch_ca(project_id=project.id) cloud_cert = crypto.fetch_ca() - LOG.debug("CA chain:\n\n =====\n%s\n\n=====", full_chain) signed_cert = X509.load_cert_string(cert_str) - chain_cert = X509.load_cert_string(full_chain) int_cert = X509.load_cert_string(int_cert) cloud_cert = X509.load_cert_string(cloud_cert) - self.assertTrue(signed_cert.verify(chain_cert.get_pubkey())) self.assertTrue(signed_cert.verify(int_cert.get_pubkey())) if not FLAGS.use_project_ca: -- cgit