Merge "fix: providers's service update signature"

poppy/provider/akamai/services.py

@@ -129,7 +129,6 @@ def get(self, service_name):
         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

poppy/provider/cloudfront/services.py

@@ -39,7 +39,7 @@ def get(self, service_name):
         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)
 

poppy/provider/fastly/services.py

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

poppy/provider/maxcdn/services.py

@@ -36,7 +36,7 @@ def __init__(self, driver):
 
         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.

poppy/provider/mock/services.py

@@ -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)
 

tests/unit/provider/akamai/test_services.py

@@ -155,7 +155,7 @@ def test_update_with_get_error(self, service_json):
         )
         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 @@ def test_update_with_service_id_json_load_error(self, service_json):
         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 @@ def test_update(self, service_json):
         )
         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 @@ def test_update_with_domain_protocol_change(self, service_json):
         )
         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):

tests/unit/provider/cloudfront/test_services.py

@@ -98,8 +98,7 @@ def test_create_service_unknown(self, service_json):
     @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])
 

tests/unit/provider/fastly/test_services.py

@@ -324,7 +324,7 @@ def test_update(self, service_json):
         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):

tests/unit/provider/maxcdn/test_services.py

@@ -156,8 +156,7 @@ def test_update(self, service_json):
         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 @@ def test_update_with_exception(self, service_json, mock_controllerclient,
             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 @@ def test_update_with_exception(self, service_json, mock_controllerclient,
         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])
 

tests/unit/provider/mock/test_services.py

@@ -37,8 +37,7 @@ def setUp(self, mock_driver):
     @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)