x
/
poppy
Code Issues Proposed changes

Fix all calls to refactored services methods 

Change-Id: Ida154d8143d284d8ec097b13acb030e25b1acb27
This commit is contained in:
Isaac Mungai 2016-06-09 14:44:55 -04:00
parent 2e3b10aee2
commit 457a5b2205
6 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
poppy/distributed_task/taskflow/task/common.py
View File

@ -161,7 +161,10 @@ class UpdateProviderDetailTask(task.Task):
in provider_details_dict.items()])
service_controller, self.storage_controller = \
memoized_controllers.task_controllers('poppy', 'storage')
service_obj = self.storage_controller.get(project_id, service_id)
service_obj = self.storage_controller.get_service(
project_id,
service_id
)
service_obj.provider_details = provider_details_dict
enabled = lambda provider: any([True if 'log_delivery'
@ -176,7 +179,11 @@ class UpdateProviderDetailTask(task.Task):
"and service_id: {2}".format(service_obj.to_dict(),
project_id,
service_id))
self.storage_controller.update(project_id, service_id, service_obj)
self.storage_controller.update_service(
project_id,
service_id,
service_obj
)
LOG.info('Update service detail task complete...')

16
poppy/distributed_task/taskflow/task/create_service_tasks.py
View File

@ -56,7 +56,10 @@ class CreateProviderServicesTask(task.Task):
providers_list = json.loads(providers_list_json)
try:
service_obj = self.storage_controller.get(project_id, service_id)
service_obj = self.storage_controller.get_service(
project_id,
service_id
)
for domain in service_obj.domains:
if domain.certificate == 'san':
cert_for_domain = (
@ -158,8 +161,10 @@ class CreateServiceDNSMappingTask(task.Task):
memoized_controllers.task_controllers('poppy', 'storage')
try:
service_obj = self.storage_controller.get(project_id,
service_id)
service_obj = self.storage_controller.get_service(
project_id,
service_id
)
except ValueError:
msg = 'Creating service {0} from Poppy failed. ' \
'No such service exists'.format(service_id)
@ -207,7 +212,10 @@ class CreateLogDeliveryContainerTask(task.Task):
memoized_controllers.task_controllers('poppy', 'storage')
try:
service_obj = self.storage_controller.get(project_id, service_id)
service_obj = self.storage_controller.get_service(
project_id,
service_id
)
self.storage_controller._driver.close_connection()
except ValueError:
msg = 'Creating service {0} from Poppy failed. ' \

2
poppy/distributed_task/taskflow/task/delete_service_tasks.py
View File

@ -204,7 +204,7 @@ class DeleteStorageServiceTask(task.Task):
def execute(self, project_id, service_id):
service_controller, self.storage_controller = \
memoized_controllers.task_controllers('poppy', 'storage')
self.storage_controller.delete(project_id, service_id)
self.storage_controller.delete_service(project_id, service_id)
def revert(self, *args, **kwargs):
try:

12
poppy/distributed_task/taskflow/task/update_service_tasks.py
View File

@ -263,7 +263,11 @@ class GatherProviderDetailsTask(task.Task):
provider_details_dict[provider_name] = (
provider_details_dict[provider_name].to_dict())
self.storage_controller.update(project_id, service_id, service_obj)
self.storage_controller.update_service(
project_id,
service_id,
service_obj
)
provider_details_dict_error_tuple = (provider_details_dict, error_flag)
@ -327,7 +331,11 @@ class UpdateProviderDetailsTask_Errors(task.Task):
"and service_id: {2}".format(service_obj.to_dict(),
project_id,
service_id))
self.storage_controller.update(project_id, service_id, service_obj)
self.storage_controller.update_service(
project_id,
service_id,
service_obj
)
LOG.info('Update provider detail service worker process complete...')
def revert(self, *args, **kwargs):

12
tests/api/admin/test_san_mapping.py
View File

@ -31,7 +31,17 @@ class TestGetSetSanMappingList(base.TestBase):
[
{
"domain_name": "www.example.com",
"san_cert_name": "san.example.com"
"flavor_id": "flavor_id",
"project_id": "project_id",
"cert_type": "san",
"cert_details": {
"Akamai": {
"extra_info": {
"san cert": "san.example.com",
"akamai_spsId": 1
}
}
}
}
]
)

22
tests/unit/distributed_task/taskflow/test_flows.py
View File

@ -109,9 +109,9 @@ class TestFlowRuns(base.TestCase):
@staticmethod
def patch_create_flow(service_controller,
storage_controller, dns_controller):
storage_controller.get = mock.Mock()
storage_controller.get.return_value = mock.Mock(domains=[])
storage_controller.update = mock.Mock()
storage_controller.get_service = mock.Mock()
storage_controller.get_service.return_value = mock.Mock(domains=[])
storage_controller.update_service = mock.Mock()
storage_controller._driver.close_connection = mock.Mock()
service_controller.provider_wrapper.create = mock.Mock()
service_controller.provider_wrapper.create._mock_return_value = []
@ -124,8 +124,8 @@ class TestFlowRuns(base.TestCase):
@staticmethod
def patch_update_flow(service_controller,
storage_controller, dns_controller):
storage_controller.get = mock.Mock()
storage_controller.update = mock.Mock()
storage_controller.get_service = mock.Mock()
storage_controller.update_service = mock.Mock()
storage_controller._driver.close_connection = mock.Mock()
service_controller.provider_wrapper.update = mock.Mock()
service_controller.provider_wrapper.update._mock_return_value = []
@ -138,9 +138,9 @@ class TestFlowRuns(base.TestCase):
@staticmethod
def patch_delete_flow(service_controller,
storage_controller, dns_controller):
storage_controller.get = mock.Mock()
storage_controller.update = mock.Mock()
storage_controller.delete = mock.Mock()
storage_controller.get_service = mock.Mock()
storage_controller.update_service = mock.Mock()
storage_controller.delete_service = mock.Mock()
storage_controller._driver.close_connection = mock.Mock()
service_controller.provider_wrapper.delete = mock.Mock()
service_controller.provider_wrapper.delete._mock_return_value = []
@ -152,9 +152,9 @@ class TestFlowRuns(base.TestCase):
@staticmethod
def patch_purge_flow(service_controller,
storage_controller, dns_controller):
storage_controller.get = mock.Mock()
storage_controller.update = mock.Mock()
storage_controller.delete = mock.Mock()
storage_controller.get_service = mock.Mock()
storage_controller.update_service = mock.Mock()
storage_controller.delete_service = mock.Mock()
storage_controller._driver.close_connection = mock.Mock()
service_controller.provider_wrapper.purge = mock.Mock()
service_controller.provider_wrapper.purge._mock_return_value = []