From 4fb1e8d34feafafe423e012c7031835024d85dcd Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 19 Jan 2012 14:58:27 -0800 Subject: Adds extension for retrieving certificates * Makes euca-upload/euca-register work again * Provides means for novarc to be generated * Fixes bug 903345 * Implements blueprint x509-cert-crud Change-Id: I0b2a42fe5436243da6925ba199936b49458d6f8c --- .../openstack/compute/contrib/test_certificates.py | 77 ++++++++++++++++++++++ .../tests/api/openstack/compute/test_extensions.py | 1 + nova/tests/policy.json | 1 + 3 files changed, 79 insertions(+) create mode 100644 nova/tests/api/openstack/compute/contrib/test_certificates.py (limited to 'nova/tests') diff --git a/nova/tests/api/openstack/compute/contrib/test_certificates.py b/nova/tests/api/openstack/compute/contrib/test_certificates.py new file mode 100644 index 000000000..803cf5601 --- /dev/null +++ b/nova/tests/api/openstack/compute/contrib/test_certificates.py @@ -0,0 +1,77 @@ +# Copyright (c) 2012 OpenStack, LLC +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from lxml import etree + +from nova.api.openstack.compute.contrib import certificates +from nova import context +from nova import rpc +from nova import test +from nova.tests.api.openstack import fakes + + +def fake_get_root_cert(context, *args, **kwargs): + return 'fakeroot' + + +def fake_create_cert(context, *args, **kwargs): + return 'fakepk', 'fakecert' + + +class CertificatesTest(test.TestCase): + def setUp(self): + super(CertificatesTest, self).setUp() + self.context = context.RequestContext('fake', 'fake') + self.controller = certificates.CertificatesController() + + def test_translate_certificate_view(self): + pk, cert = fake_create_cert(self.context) + view = certificates._translate_certificate_view(cert, pk) + self.assertEqual(view['data'], cert) + self.assertEqual(view['private_key'], pk) + + def test_certificates_show_root(self): + self.stubs.Set(rpc, 'call', fake_get_root_cert) + req = fakes.HTTPRequest.blank('/v2/fake/os-certificates/root') + res_dict = self.controller.show(req, 'root') + + cert = fake_get_root_cert(self.context) + response = {'certificate': {'data': cert, 'private_key': None}} + self.assertEqual(res_dict, response) + + def test_certificates_create_certificate(self): + self.stubs.Set(rpc, 'call', fake_create_cert) + req = fakes.HTTPRequest.blank('/v2/fake/os-certificates/') + res_dict = self.controller.create(req) + + pk, cert = fake_create_cert(self.context) + response = {'certificate': {'data': cert, 'private_key': pk}} + self.assertEqual(res_dict, response) + + +class CertificatesSerializerTest(test.TestCase): + def test_index_serializer(self): + serializer = certificates.CertificateTemplate() + text = serializer.serialize(dict( + certificate=dict( + data='fakecert', + private_key='fakepk'), + )) + + tree = etree.fromstring(text) + + self.assertEqual('certificate', tree.tag) + self.assertEqual('fakepk', tree.get('private_key')) + self.assertEqual('fakecert', tree.get('data')) diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py index 4a03cacf6..8b20a615a 100644 --- a/nova/tests/api/openstack/compute/test_extensions.py +++ b/nova/tests/api/openstack/compute/test_extensions.py @@ -153,6 +153,7 @@ class ExtensionControllerTest(ExtensionTestCase): self.ext_list = [ "Accounts", "AdminActions", + "Certificates", "Cloudpipe", "Console_output", "Consoles", diff --git a/nova/tests/policy.json b/nova/tests/policy.json index ff30cd43d..737e98f68 100644 --- a/nova/tests/policy.json +++ b/nova/tests/policy.json @@ -71,6 +71,7 @@ "compute_extension:accounts": [], "compute_extension:admin_actions": [], + "compute_extension:certificates": [], "compute_extension:cloudpipe": [], "compute_extension:console_output": [], "compute_extension:consoles": [], -- cgit