From fa7848a6c859b4c8842380f4f25852168ecca79f Mon Sep 17 00:00:00 2001
From: Robert Estelle <robert@getpreo.com>
Date: Thu, 13 Nov 2014 19:57:15 -0500
Subject: [PATCH] EC2 subnet/route-table: Simplify tag updating.
---
cloud/amazon/ec2_vpc_subnet.py | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/cloud/amazon/ec2_vpc_subnet.py b/cloud/amazon/ec2_vpc_subnet.py
index 396719d4e0a..3d2d52c0a58 100644
--- a/cloud/amazon/ec2_vpc_subnet.py
+++ b/cloud/amazon/ec2_vpc_subnet.py
@@ -164,36 +164,17 @@ def get_resource_tags(vpc_conn, resource_id):
vpc_conn.get_all_tags(filters={'resource-id': resource_id})}
-def dict_diff(old, new):
- x = {}
- old_keys = set(old.keys())
- new_keys = set(new.keys())
-
- for k in old_keys.difference(new_keys):
- x[k] = {'old': old[k]}
-
- for k in new_keys.difference(old_keys):
- x[k] = {'new': new[k]}
-
- for k in new_keys.intersection(old_keys):
- if new[k] != old[k]:
- x[k] = {'new': new[k], 'old': old[k]}
-
- return x
-
-
def ensure_tags(vpc_conn, resource_id, tags, add_only, dry_run):
try:
cur_tags = get_resource_tags(vpc_conn, resource_id)
- diff = dict_diff(cur_tags, tags)
- if not diff:
+ if cur_tags == tags:
return {'changed': False, 'tags': cur_tags}
- to_delete = {k: diff[k]['old'] for k in diff if 'new' not in diff[k]}
+ to_delete = {k: cur_tags[k] for k in cur_tags if k not in tags}
if to_delete and not add_only:
vpc_conn.delete_tags(resource_id, to_delete, dry_run=dry_run)
- to_add = {k: diff[k]['new'] for k in diff if 'old' not in diff[k]}
+ to_add = {k: tags[k] for k in tags if k not in cur_tags}
if to_add:
vpc_conn.create_tags(resource_id, to_add, dry_run=dry_run)