From ac9c1b99ea1289fb8ef5ee85d3f6413110b22842 Mon Sep 17 00:00:00 2001 From: Isaac Mungai Date: Tue, 3 May 2016 10:07:20 -0400 Subject: [PATCH] Add project_id field to ssl_cert GET response Change-Id: I48d60678c20f15351fbcc0f951e47af75a92a4f6 --- poppy/transport/pecan/models/response/ssl_certificate.py | 3 ++- tests/api/ssl_certificate/test_create_ssl_certificate.py | 1 + .../transport/pecan/controllers/test_ssl_certificate.py | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/poppy/transport/pecan/models/response/ssl_certificate.py b/poppy/transport/pecan/models/response/ssl_certificate.py index 59055a34..e6410c93 100644 --- a/poppy/transport/pecan/models/response/ssl_certificate.py +++ b/poppy/transport/pecan/models/response/ssl_certificate.py @@ -22,7 +22,7 @@ from poppy.common import util class Model(collections.OrderedDict): - 'response class for SSLCertificate' + """response class for SSLCertificate.""" def __init__(self, ssl_certificate): super(Model, self).__init__() @@ -31,3 +31,4 @@ class Model(collections.OrderedDict): self['cert_type'] = ssl_certificate.cert_type self['cert_details'] = ssl_certificate.cert_details self['status'] = ssl_certificate.get_cert_status() + self['project_id'] = ssl_certificate.project_id diff --git a/tests/api/ssl_certificate/test_create_ssl_certificate.py b/tests/api/ssl_certificate/test_create_ssl_certificate.py index 57d9a2b1..ec449775 100644 --- a/tests/api/ssl_certificate/test_create_ssl_certificate.py +++ b/tests/api/ssl_certificate/test_create_ssl_certificate.py @@ -78,6 +78,7 @@ class TestCreateSSLCertificate(base.TestBase): self.assertEqual(cert['domain_name'], self.domain_name) self.assertEqual(cert['flavor_id'], flavor_id) self.assertEqual(cert['cert_type'], self.cert_type) + self.assertEqual(cert['project_id'], project_id) def tearDown(self): # Do not call delete cert for negative test diff --git a/tests/functional/transport/pecan/controllers/test_ssl_certificate.py b/tests/functional/transport/pecan/controllers/test_ssl_certificate.py index 0230a96c..a80c690a 100644 --- a/tests/functional/transport/pecan/controllers/test_ssl_certificate.py +++ b/tests/functional/transport/pecan/controllers/test_ssl_certificate.py @@ -109,6 +109,8 @@ class SSLCertificateControllerTest(base.FunctionalTest): response_list[0]["domain_name"]) self.assertEqual(ssl_certificate_json["flavor_id"], response_list[0]["flavor_id"]) + self.assertEqual(ssl_certificate_json["project_id"], + response_list[0]["project_id"]) def test_get_ssl_certificate_existing_domain_different_project_id(self): domain = 'www.iexist.com'