x/poppy
Code Issues Proposed changes

bugfix: update all references to san_info_storage

Browse Source 
A few leftover references to san_info_storage changed to
cert_info_storage.

Change-Id: Ia31cf8cf372034efbc6e851ac6de0baba218cda1
This commit is contained in:
Isaac Mungai 2016-04-22 15:25:12 -04:00
parent 4c0f9dec4a
commit 429d256ff9
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
poppy/manager/default/ssl_certificate.py
View File

@ -260,7 +260,9 @@ class DefaultSSLCertificateController(base.SSLCertificateController):
"%s is not a valid san cert, valid san certs are: %s" %
(san_cert_name, akamai_driver.san_cert_cnames))
akamai_driver = self._driver.providers['akamai'].obj
res = akamai_driver.san_info_storage.get_cert_config(san_cert_name)
res = akamai_driver.cert_info_storage.get_cert_config(
san_cert_name
)
else:
# if not using akamai driver just return an empty list
res = {}
@ -294,7 +296,7 @@ class DefaultSSLCertificateController(base.SSLCertificateController):
new_cert_config['jobId'] = (
resp_json['requestList'][0]['jobId']
)
res = akamai_driver.san_info_storage.update_cert_config(
res = akamai_driver.cert_info_storage.update_cert_config(
san_cert_name, new_cert_config)
else:
# if not using akamai driver just return an empty list

12
poppy/provider/akamai/services.py
View File

@ -51,8 +51,8 @@ class ServiceController(base.ServiceBase):
return self.driver.akamai_sub_customer_api_client
@property
def san_info_storage(self):
return self.driver.san_info_storage
def cert_info_storage(self):
return self.driver.cert_info_storage
@property
def mod_san_queue(self):
@ -592,14 +592,14 @@ class ServiceController(base.ServiceBase):
for san_cert_name in self.san_cert_cnames:
enabled = (
self.san_info_storage.get_enabled_status(
self.cert_info_storage.get_enabled_status(
san_cert_name
)
)
if not enabled:
continue
lastSpsId = (
self.san_info_storage.get_cert_last_spsid(
self.cert_info_storage.get_cert_last_spsid(
san_cert_name
)
)
@ -631,7 +631,7 @@ class ServiceController(base.ServiceBase):
san_cert_name)
continue
# issue modify san_cert sps request
cert_info = self.san_info_storage.get_cert_info(
cert_info = self.cert_info_storage.get_cert_info(
san_cert_name)
cert_info['add.sans'] = cert_obj.domain_name
string_post_data = '&'.join(
@ -653,7 +653,7 @@ class ServiceController(base.ServiceBase):
# get last item in results array and use its jobID
results = resp_dict['Results']['data']
this_job_id = results[0]['results']['jobID']
self.san_info_storage.save_cert_last_ids(
self.cert_info_storage.save_cert_last_ids(
san_cert_name,
this_sps_id,
this_job_id

12
tests/unit/provider/akamai/test_services.py
View File

@ -645,10 +645,10 @@ class TestServices(base.TestCase):
}
lastSpsId = (
controller.san_info_storage.get_cert_last_spsid(
controller.cert_info_storage.get_cert_last_spsid(
"secure.san1.poppycdn.com"))
controller.san_info_storage.get_cert_info.return_value = {
controller.cert_info_storage.get_cert_info.return_value = {
'cnameHostname': "secure.san1.poppycdn.com",
'jobId': "secure.san1.poppycdn.com",
'issuer': 1789,
@ -657,7 +657,7 @@ class TestServices(base.TestCase):
'slot-deployment.class': 'esslType'
}
cert_info = controller.san_info_storage.get_cert_info(
cert_info = controller.cert_info_storage.get_cert_info(
"secure.san1.poppycdn.com")
cert_info['add.sans'] = "www.abc.com"
string_post_cert_info = '&'.join(
@ -724,10 +724,10 @@ class TestServices(base.TestCase):
}
lastSpsId = (
controller.san_info_storage.get_cert_last_spsid(
controller.cert_info_storage.get_cert_last_spsid(
"secure.san1.poppycdn.com"))
controller.san_info_storage.get_cert_info.return_value = {
controller.cert_info_storage.get_cert_info.return_value = {
'cnameHostname': "secure.san1.poppycdn.com",
'jobId': "secure.san1.poppycdn.com",
'issuer': 1789,
@ -736,7 +736,7 @@ class TestServices(base.TestCase):
'slot-deployment.class': 'esslType'
}
cert_info = controller.san_info_storage.get_cert_info(
cert_info = controller.cert_info_storage.get_cert_info(
"secure.san1.poppycdn.com")
cert_info['add.sans'] = "www.abc.com"