From: Steven Hardy <shardy@redhat.com>
Date: Wed, 22 May 2013 15:34:32 +0000 (+0100)
Subject: Instance resource remove unreachable/redundant Metadata update check
X-Git-Tag: 2014.1~566
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=369b7faee736119b6ea8107bce0dac381ed9e613;p=openstack-build%2Fheat-build.git

Instance resource remove unreachable/redundant Metadata update check

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

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 198f04f0..2c9b85f1 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -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):
         '''