]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Instance resource remove unreachable/redundant Metadata update check
authorSteven Hardy <shardy@redhat.com>
Wed, 22 May 2013 15:34:32 +0000 (16:34 +0100)
committerSteven Hardy <shardy@redhat.com>
Thu, 23 May 2013 14:42:14 +0000 (15:42 +0100)
update_template_diff already throws resource.UpdateReplace if the
json_snippet contains changes other than to Metadata, so the else
here is unreachable and redundant

Change-Id: I9f0ad88d0b6fa65cafd5b2843a38913fa843a3ac

heat/engine/resources/instance.py

index 198f04f09adab0777ff8dc945d15834c37a0fe2d..2c9b85f1b90379c7cbd9add1216ce34b64174680 100644 (file)
@@ -388,11 +388,8 @@ class Instance(resource.Resource):
     def handle_update(self, json_snippet):
         tmpl_diff = self.update_template_diff(json_snippet)
 
-        for k in tmpl_diff:
-            if k == 'Metadata':
-                self.metadata = json_snippet.get('Metadata', {})
-            else:
-                raise resource.UpdateReplace(resource_name=self.name)
+        if 'Metadata' in tmpl_diff:
+            self.metadata = tmpl_diff.get('Metadata', {})
 
     def metadata_update(self, new_metadata=None):
         '''