x
/
poppy
Code Issues Proposed changes

fix: providers's service update signature 

- The base class does not include param service_old in the signature,
  this patch fixes that in the derived classes.

Change-Id: I5f593347cfb4ed695ab2387709c542c1be929c17
This commit is contained in:
Sriram Madapusi Vasudevan 2015-02-06 09:41:09 -05:00
parent 03a35d4a2d
commit 6e705c971a
10 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,6 @@ class ServiceController(base.ServiceBase):
pass
def update(self, provider_service_id,
service_old,
service_obj):
# depending on domains field presented or not, do PUT/POST
# and depending on origins field presented or not, set behavior on

2
poppy/provider/cloudfront/services.py
View File

@ -39,7 +39,7 @@ class ServiceController(base.ServiceBase):
return {'domains': [], 'origins': [], 'caching': []}
# TODO(obulpathi): update service
def update(self, service_name, service_old, service_obj):
def update(self, service_name, service_obj):
links = {}
return self.responder.updated(service_name, links)

1
poppy/provider/fastly/services.py
View File

@ -157,7 +157,6 @@ class ServiceController(base.ServiceBase):
def update(self,
provider_service_id,
service_old,
service_obj):
try:
service = self.client.get_service_details(provider_service_id)

2
poppy/provider/maxcdn/services.py
View File

@ -36,7 +36,7 @@ class ServiceController(base.ServiceBase):
self.driver = driver
def update(self, pullzone_id, service_old, service_obj):
def update(self, pullzone_id, service_obj):
'''MaxCDN update.
manager needs to pass in pullzone id to delete.

2
poppy/provider/mock/services.py
View File

@ -28,7 +28,7 @@ class ServiceController(base.ServiceBase):
def __init__(self, driver):
super(ServiceController, self).__init__(driver)
def update(self, service_name, service_old, service_obj):
def update(self, service_name, service_obj):
links = {}
return self.responder.updated(service_name, links)

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

@ -155,7 +155,7 @@ class TestServices(base.TestCase):
)
service_obj = service.load_from_json(service_json)
resp = controller.update(
provider_service_id, service_obj, service_obj)
provider_service_id, service_obj)
self.assertIn('error', resp[self.driver.provider_name])
@ddt.file_data('data_update_service.json')
@ -164,7 +164,7 @@ class TestServices(base.TestCase):
provider_service_id = None
service_obj = service.load_from_json(service_json)
resp = self.controller.update(
provider_service_id, service_obj, service_obj)
provider_service_id, service_obj)
self.assertIn('error', resp[self.driver.provider_name])
@ddt.file_data('data_update_service.json')
@ -186,7 +186,7 @@ class TestServices(base.TestCase):
)
service_obj = service.load_from_json(service_json)
resp = controller.update(
provider_service_id, service_obj, service_obj)
provider_service_id, service_obj)
self.assertIn('id', resp[self.driver.provider_name])
@ddt.file_data('data_update_service.json')
@ -208,7 +208,7 @@ class TestServices(base.TestCase):
)
service_obj = service.load_from_json(service_json)
resp = controller.update(
provider_service_id, service_obj, service_obj)
provider_service_id, service_obj)
self.assertIn('id', resp[self.driver.provider_name])
def test_purge_all(self):

3
tests/unit/provider/cloudfront/test_services.py
View File

@ -98,8 +98,7 @@ class TestServices(base.TestCase):
@ddt.file_data('data_service.json')
def test_update(self, service_json):
service_obj = service.load_from_json(service_json)
service_old = service_obj
resp = self.controller.update(self.provider_service_id, service_old,
resp = self.controller.update(self.provider_service_id,
service_obj)
self.assertIn('id', resp[self.driver.provider_name])

2
tests/unit/provider/fastly/test_services.py
View File

@ -324,7 +324,7 @@ class TestServices(base.TestCase):
controller.client.list_versions.return_value = [self.version]
service_obj = service.load_from_json(service_json)
resp = controller.update(
provider_service_id, service_obj, service_obj)
provider_service_id, service_obj)
self.assertIn('id', resp[self.driver.provider_name])
def test_purge_with_exception(self):

5
tests/unit/provider/maxcdn/test_services.py
View File

@ -156,8 +156,7 @@ class TestServices(base.TestCase):
controller = services.ServiceController(new_driver)
# test create, everything goes through successfully
service_obj = service.load_from_json(service_json)
service_old = service_obj
resp = controller.update(self.provider_service_id, service_old,
resp = controller.update(self.provider_service_id,
service_obj)
self.assertIn('id', resp[new_driver.provider_name])
@ -179,7 +178,6 @@ class TestServices(base.TestCase):
RuntimeError('Updating service mysteriously failed.')})
resp = controller_with_update_exception.update(
self.provider_service_id,
service_json,
service_json)
self.assertIn('error', resp[driver.provider_name])
@ -191,7 +189,6 @@ class TestServices(base.TestCase):
service_obj = service.load_from_json(service_json)
resp = controller_with_update_exception.update(
self.provider_service_id,
service_obj,
service_obj)
self.assertIn('error', resp[driver.provider_name])

3
tests/unit/provider/mock/test_services.py
View File

@ -37,8 +37,7 @@ class MockProviderServicesTest(base.TestCase):
@ddt.file_data('data_service.json')
def test_update(self, service_json):
service_obj = service.load_from_json(service_json)
service_old = service_obj
response = self.sc.update(self.test_provider_service_id, service_old,
response = self.sc.update(self.test_provider_service_id,
service_obj)
self.assertTrue(response is not None)