Merge "Add version to the cert rpc API."

1 files changed, 6 insertions, 7 deletions

diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 601825950..7c33c295e 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -19,6 +19,7 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+import nova.cert.rpcapi
 from nova import flags
 from nova import log as logging
 from nova import network
@@ -64,6 +65,7 @@ class CertificatesController(object):
 
     def __init__(self):
         self.network_api = network.API()
+        self.cert_rpcapi = nova.cert.rpcapi.CertAPI()
         super(CertificatesController, self).__init__()
 
     @wsgi.serializers(xml=CertificateTemplate)
@@ -74,9 +76,8 @@ class CertificatesController(object):
         if id != 'root':
             msg = _("Only root certificate can be retrieved.")
             raise webob.exc.HTTPNotImplemented(explanation=msg)
-        cert = rpc.call(context, FLAGS.cert_topic,
-                        {"method": "fetch_ca",
-                         "args": {"project_id": context.project_id}})
+        cert = self.cert_rpcapi.fetch_ca(context,
+                project_id=context.project_id)
         return {'certificate': _translate_certificate_view(cert)}
 
     @wsgi.serializers(xml=CertificateTemplate)
@@ -84,10 +85,8 @@ class CertificatesController(object):
         """Return a list of certificates."""
         context = req.environ['nova.context']
         authorize(context)
-        pk, cert = rpc.call(context, FLAGS.cert_topic,
-                            {"method": "generate_x509_cert",
-                             "args": {"user_id": context.user_id,
-                                      "project_id": context.project_id}})
+        pk, cert = self.cert_rpcapi.generate_x509_cert(context,
+                user_id=context.user_id, project_id=context.project_id)
         context = req.environ['nova.context']
         return {'certificate': _translate_certificate_view(cert, pk)}