diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-21 13:48:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-21 13:48:32 +0000 |
| commit | facf42d0bab7a4f97c654a5724189609ad185559 (patch) | |
| tree | dbbeece6e637310a7b2a2cddd6c42f69e70588b5 | |
| parent | 1a9c3788044db950b37859d6fcdfe28b33efc49d (diff) | |
| parent | 198a915f21f0ed9dfcfa74cc16ad173253047d8f (diff) | |
| download | nova-facf42d0bab7a4f97c654a5724189609ad185559.tar.gz nova-facf42d0bab7a4f97c654a5724189609ad185559.tar.xz nova-facf42d0bab7a4f97c654a5724189609ad185559.zip | |
Merge "Cleanup certificate API extension"
| -rw-r--r-- | nova/api/openstack/compute/contrib/certificates.py | 13 | ||||
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/certificates.py | 13 |
2 files changed, 4 insertions, 22 deletions
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py index 64a6e26fe..4fe49aadf 100644 --- a/nova/api/openstack/compute/contrib/certificates.py +++ b/nova/api/openstack/compute/contrib/certificates.py @@ -38,15 +38,6 @@ class CertificateTemplate(xmlutil.TemplateBuilder): return xmlutil.MasterTemplate(root, 1) -class CertificatesTemplate(xmlutil.TemplateBuilder): - def construct(self): - root = xmlutil.TemplateElement('certificates') - elem = xmlutil.SubTemplateElement(root, 'certificate', - selector='certificates') - make_certificate(elem) - return xmlutil.MasterTemplate(root, 1) - - def _translate_certificate_view(certificate, private_key=None): return { 'data': certificate, @@ -64,7 +55,7 @@ class CertificatesController(object): @wsgi.serializers(xml=CertificateTemplate) def show(self, req, id): - """Return a list of certificates.""" + """Return certificate information.""" context = req.environ['nova.context'] authorize(context) if id != 'root': @@ -76,7 +67,7 @@ class CertificatesController(object): @wsgi.serializers(xml=CertificateTemplate) def create(self, req, body=None): - """Return a list of certificates.""" + """Create a certificate.""" context = req.environ['nova.context'] authorize(context) pk, cert = self.cert_rpcapi.generate_x509_cert(context, diff --git a/nova/api/openstack/compute/plugins/v3/certificates.py b/nova/api/openstack/compute/plugins/v3/certificates.py index 4af679ebe..175780f9c 100644 --- a/nova/api/openstack/compute/plugins/v3/certificates.py +++ b/nova/api/openstack/compute/plugins/v3/certificates.py @@ -39,15 +39,6 @@ class CertificateTemplate(xmlutil.TemplateBuilder): return xmlutil.MasterTemplate(root, 1) -class CertificatesTemplate(xmlutil.TemplateBuilder): - def construct(self): - root = xmlutil.TemplateElement('certificates') - elem = xmlutil.SubTemplateElement(root, 'certificate', - selector='certificates') - make_certificate(elem) - return xmlutil.MasterTemplate(root, 1) - - def _translate_certificate_view(certificate, private_key=None): return { 'data': certificate, @@ -65,7 +56,7 @@ class CertificatesController(object): @wsgi.serializers(xml=CertificateTemplate) def show(self, req, id): - """Return a list of certificates.""" + """Return certificate information.""" context = req.environ['nova.context'] authorize(context) if id != 'root': @@ -77,7 +68,7 @@ class CertificatesController(object): @wsgi.serializers(xml=CertificateTemplate) def create(self, req, body=None): - """Return a list of certificates.""" + """Create a certificate.""" context = req.environ['nova.context'] authorize(context) pk, cert = self.cert_rpcapi.generate_x509_cert(context, |