Merge "Use stable Resource plugin interface in UpdateWaitConditionHandle"

This commit is contained in:
Zuul 2024-04-24 17:20:37 +00:00 committed by Gerrit Code Review
commit b67ea2e0f7
2 changed files with 6 additions and 3 deletions

View File

@ -233,8 +233,8 @@ class UpdateWaitConditionHandle(aws_wch.WaitConditionHandle):
support_status = support.SupportStatus(version='2014.1') support_status = support.SupportStatus(version='2014.1')
def update(self, after, before=None, prev_resource=None, def _needs_update(self, after, before, after_props, before_props,
new_template_id=None, new_requires=None): prev_resource, check_init_complete=True):
raise resource.UpdateReplace(self.name) raise resource.UpdateReplace(self.name)

View File

@ -25,6 +25,7 @@ from heat.engine.clients.os import swift as swift_plugin
from heat.engine import environment from heat.engine import environment
from heat.engine import resource from heat.engine import resource
from heat.engine.resources.openstack.heat import wait_condition_handle as h_wch from heat.engine.resources.openstack.heat import wait_condition_handle as h_wch
from heat.engine import scheduler
from heat.engine import stack as parser from heat.engine import stack as parser
from heat.engine import template as tmpl from heat.engine import template as tmpl
from heat.objects import resource as resource_objects from heat.objects import resource as resource_objects
@ -489,5 +490,7 @@ class HeatWaitConditionTest(common.HeatTestCase):
handle = self.stack['update_wait_handle'] handle = self.stack['update_wait_handle']
self.assertEqual((handle.CREATE, handle.COMPLETE), handle.state) self.assertEqual((handle.CREATE, handle.COMPLETE), handle.state)
self.assertRaises( self.assertRaises(
resource.UpdateReplace, handle.update, None, None) resource.UpdateReplace,
scheduler.TaskRunner(handle.update, handle.t))