Merge "Patch service endpoint"

tests/unit/provider/cloudfront/test_services.py

@@ -33,6 +33,7 @@ class TestServices(base.TestCase):
         super(TestServices, self).setUp()
 
         self.service_name = uuid.uuid1()
+        self.provider_service_id = uuid.uuid1()
         self.mock_get_client = mock_get_client
         self.driver = MockDriver()
         self.controller = services.ServiceController(self.driver)
@@ -97,7 +98,10 @@ class TestServices(base.TestCase):
     @ddt.file_data('data_service.json')
     def test_update(self, service_json):
         service_obj = service.load_from_json(service_json)
-        resp = self.controller.update(self.service_name, service_obj)
+        service_old = service_obj
+        service_updates = service_obj
+        resp = self.controller.update(self.provider_service_id, service_old,
+                                      service_updates, service_obj)
         self.assertIn('id', resp[self.driver.provider_name])
 
     def test_delete_exceptions(self):

tests/unit/provider/fastly/test_services.py

@@ -234,7 +234,10 @@ class TestServices(base.TestCase):
     def test_update(self, service_json):
         provider_service_id = uuid.uuid1()
         controller = services.ServiceController(self.driver)
-        resp = controller.update(provider_service_id, 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, service_obj)
         self.assertIn('id', resp[self.driver.provider_name])
 
     def test_purge_with_exception(self):

tests/unit/provider/maxcdn/test_services.py

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import uuid
+
 import ddt
 import mock
 from oslo.config import cfg
@@ -90,8 +92,8 @@ class TestServices(base.TestCase):
 
     def setUp(self):
         super(TestServices, self).setUp()
-
         self.conf = cfg.ConfigOpts()
+        self.provider_service_id = uuid.uuid1()
 
     @mock.patch.object(driver.CDNProvider, 'client',
                        new=fake_maxcdn_api_client())
@@ -154,8 +156,10 @@ class TestServices(base.TestCase):
         controller = services.ServiceController(new_driver)
         # test create, everything goes through successfully
         service_obj = service.load_from_json(service_json)
-        service_name = 'test_service_name'
-        resp = controller.update(service_name, service_obj)
+        service_old = service_obj
+        service_updates = service_obj
+        resp = controller.update(self.provider_service_id, service_old,
+                                 service_updates, service_obj)
         self.assertIn('id', resp[new_driver.provider_name])
 
     @ddt.file_data('data_service.json')
@@ -170,14 +174,14 @@ class TestServices(base.TestCase):
                                         fake_maxcdn_client_get_return_value
                                         })
 
-        service_name = 'test_service_name'
-
         controller_with_update_exception = services.ServiceController(driver)
         controller_with_update_exception.client.configure_mock(**{
             'put.side_effect':
             RuntimeError('Updating service mysteriously failed.')})
         resp = controller_with_update_exception.update(
-            service_name,
+            self.provider_service_id,
+            service_json,
+            service_json,
             service_json)
         self.assertIn('error', resp[driver.provider_name])
 
@@ -188,7 +192,9 @@ class TestServices(base.TestCase):
         })
         service_obj = service.load_from_json(service_json)
         resp = controller_with_update_exception.update(
-            service_name,
+            self.provider_service_id,
+            service_obj,
+            service_obj,
             service_obj)
         self.assertIn('error', resp[driver.provider_name])
 

tests/unit/provider/mock/test_services.py

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