summaryrefslogtreecommitdiff
path: root/glanceclient/v2/schemas.py
diff options
context:
space:
mode:
authorSteve Martinelli <s.martinelli@gmail.com>2016-08-19 06:10:14 +0000
committerSteve Martinelli <s.martinelli@gmail.com>2016-08-19 06:10:14 +0000
commitb78285761db0c6cd730117d2c90bc9de2114bf4d (patch)
treef7d44fa7d8df5dc315477c2d8a78973c10441293 /glanceclient/v2/schemas.py
parente77322c17931810f4029ef339a791f702f2f4580 (diff)
downloadpython-glanceclient-b78285761db0c6cd730117d2c90bc9de2114bf4d.tar.gz
Revert "Don't update tags every time"
This reverts commit e77322c17931810f4029ef339a791f702f2f4580. Change-Id: Ida826a2aa888beeb76dbe657b2ccd6cb088157ed
Diffstat (limited to 'glanceclient/v2/schemas.py')
-rw-r--r--glanceclient/v2/schemas.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/glanceclient/v2/schemas.py b/glanceclient/v2/schemas.py
index 8c838f8..8247d31 100644
--- a/glanceclient/v2/schemas.py
+++ b/glanceclient/v2/schemas.py
@@ -31,12 +31,12 @@ class SchemaBasedModel(warlock.Model):
"""
def _make_custom_patch(self, new, original):
- if 'tags' in new and 'tags' not in original:
+ if not self.get('tags'):
+ tags_patch = []
+ else:
tags_patch = [{"path": "/tags",
"value": self.get('tags'),
"op": "replace"}]
- else:
- tags_patch = []
patch_string = jsonpatch.make_patch(original, new).to_string()
patch = json.loads(patch_string)
@@ -55,6 +55,9 @@ class SchemaBasedModel(warlock.Model):
if (name not in original and name in new and
prop.get('is_base', True)):
original[name] = None
+
+ original['tags'] = None
+ new['tags'] = None
return self._make_custom_patch(new, original)