summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2012-01-18 21:51:30 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2012-01-18 21:56:14 -0800
commit1eba47cff9cce4e040203b2af8ad70776bf79d12 (patch)
tree5cfce7ba0dc1197de33e3ce8ce04041e3fe0d3ed /nova/tests
parenta444e8ff39e11fb615127318b3f16d6275af9273 (diff)
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
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_auth.py6
1 files changed, 1 insertions, 5 deletions
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: