fix: remove un-needed params from delete_ssl_cert task
- add corresponging test Change-Id: I67257223fb5656cf5ab3044028de12611b1b5671
This commit is contained in:
parent
84498fc62f
commit
b28df66cc0
|
@ -28,7 +28,7 @@ conf(project='poppy', prog='poppy', args=[])
|
|||
class DeleteProviderSSLCertificateTask(task.Task):
|
||||
default_provides = "responders"
|
||||
|
||||
def execute(self, providers_list_json, cert_obj_json):
|
||||
def execute(self):
|
||||
# Note(tonytan4ever): For right now there is no
|
||||
# way to code the process of deleting a certificate object
|
||||
# from Akamai
|
||||
|
@ -59,7 +59,12 @@ class DeleteStorageSSLCertificateTask(task.Task):
|
|||
def execute(self, project_id, domain_name, cert_type):
|
||||
service_controller, self.storage_controller = \
|
||||
memoized_controllers.task_controllers('poppy', 'storage')
|
||||
self.storage_controller.delete_cert(project_id, domain_name, cert_type)
|
||||
try:
|
||||
self.storage_controller.delete_cert(project_id,
|
||||
domain_name,
|
||||
cert_type)
|
||||
except ValueError as e:
|
||||
LOG.exception(e)
|
||||
|
||||
def revert(self, *args, **kwargs):
|
||||
try:
|
||||
|
|
|
@ -590,8 +590,8 @@ class ServicesController(base.ServicesController):
|
|||
consistency_level=self._driver.consistency_level)
|
||||
self.session.execute(stmt, args)
|
||||
else:
|
||||
raise ValueError("No certificate found for: %, type: %s" %
|
||||
(domain_name, cert_type))
|
||||
raise ValueError("No certificate found for: {0},"
|
||||
"type: {1}".format(domain_name, cert_type))
|
||||
|
||||
def create(self, project_id, service_obj):
|
||||
"""create.
|
||||
|
|
|
@ -21,6 +21,7 @@ from taskflow import engines
|
|||
from poppy.distributed_task.taskflow.flow import create_service
|
||||
from poppy.distributed_task.taskflow.flow import create_ssl_certificate
|
||||
from poppy.distributed_task.taskflow.flow import delete_service
|
||||
from poppy.distributed_task.taskflow.flow import delete_ssl_certificate
|
||||
from poppy.distributed_task.taskflow.flow import purge_service
|
||||
from poppy.distributed_task.taskflow.flow import update_service
|
||||
from poppy.distributed_task.taskflow.flow import update_service_state
|
||||
|
@ -875,3 +876,28 @@ class TestFlowRuns(base.TestCase):
|
|||
dns_controller)
|
||||
engines.run(create_ssl_certificate.create_ssl_certificate(),
|
||||
store=kwargs)
|
||||
|
||||
# Keep create credentials for now
|
||||
@mock.patch('pyrax.cloud_dns')
|
||||
@mock.patch('pyrax.set_credentials')
|
||||
def test_delete_ssl_certificate_normal(self, mock_creds, mock_dns_client):
|
||||
|
||||
kwargs = {
|
||||
'cert_type': "san",
|
||||
'project_id': json.dumps(str(uuid.uuid4())),
|
||||
'domain_name': "san.san.com",
|
||||
}
|
||||
|
||||
service_controller, storage_controller, dns_controller = \
|
||||
self.all_controllers()
|
||||
|
||||
with MonkeyPatchControllers(service_controller,
|
||||
dns_controller,
|
||||
storage_controller,
|
||||
memoized_controllers.task_controllers):
|
||||
|
||||
self.patch_create_ssl_certificate_flow(service_controller,
|
||||
storage_controller,
|
||||
dns_controller)
|
||||
engines.run(delete_ssl_certificate.delete_ssl_certificate(),
|
||||
store=kwargs)
|
||||
|
|
Loading…
Reference in New Issue