Merge "Fixes bug: service gets stuck in update_in_progress"

openstack-archive · Feb 11, 2015 · d69be94 · d69be94
2 parents 0b590b7 + 00a0a0e
commit d69be94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/poppy/manager/base/providers.py b/poppy/manager/base/providers.py
@@ -29,7 +29,7 @@ def create(self, ext, service_obj):
 
         return ext.obj.service_controller.create(service_obj)
 
-    def update(self, ext, provider_details, service_old, service_obj):
+    def update(self, ext, provider_details, service_obj):
         """Update a provider
 
         :param ext
@@ -47,7 +47,7 @@ def update(self, ext, provider_details, service_old, service_obj):
                 "Perhaps service has not been created")
         provider_service_id = provider_detail.provider_service_id
         return ext.obj.service_controller.update(
-            provider_service_id, service_old, service_obj)
+            provider_service_id, service_obj)
 
     def delete(self, ext, provider_details):
         try:

diff --git a/poppy/manager/default/service_async_workers/update_service_worker.py b/poppy/manager/default/service_async_workers/update_service_worker.py
@@ -51,7 +51,7 @@ def update_worker(project_id, service_id,
         LOG.info(u'Starting to update service from {0}'.format(provider))
         responder = service_controller.provider_wrapper.update(
             service_controller._driver.providers[provider.lower()],
-            service_old.provider_details, service_old, service_obj)
+            service_old.provider_details, service_obj)
         responders.append(responder)
         LOG.info(u'Updating service from {0} complete'.format(provider))
 

diff --git a/tests/unit/manager/default/test_provider_wrapper.py b/tests/unit/manager/default/test_provider_wrapper.py
@@ -38,17 +38,17 @@ def test_update_with_keyerror(self):
         mock_ext = mock.Mock(provider_name="no_existent_provider")
         self.assertRaises(errors.BadProviderDetail,
                           self.provider_wrapper_obj.update,
-                          mock_ext, self.fake_provider_details, {}, {})
+                          mock_ext, self.fake_provider_details, {})
 
     def test_update(self):
         mock_obj = mock.Mock(provider_name='Fastly')
         mock_ext = mock.Mock(obj=mock_obj)
         fastly_provider_detail = self.fake_provider_details['Fastly']
         self.provider_wrapper_obj.update(mock_ext,
                                          self.fake_provider_details,
-                                         {}, {})
+                                         {})
         mock_ext.obj.service_controller.update.assert_called_once_with(
-            fastly_provider_detail.provider_service_id, {}, {})
+            fastly_provider_detail.provider_service_id, {})
 
     def test_delete_with_keyerror(self):
         mock_ext = mock.Mock(obj=mock.Mock(