flat_leaves option on ResourceGroup.diff()

orchestrator/model/resources.py

@@ -141,9 +141,9 @@ class ResourceGroup(Resource):
     def resources(self):
     def resources(self):
         return list(self.__resources.values())
         return list(self.__resources.values())
 
 
-    def diff(self, other):
-        flat_self = self.flatten()
-        flat_other = other.flatten()
+    def diff(self, other, flat_leaves=True):
+        flat_self = self.flatten(flat_leaves=flat_leaves)
+        flat_other = other.flatten(flat_leaves=flat_leaves)
         diff_keys = set(flat_self.keys()).symmetric_difference(flat_other.keys())
         diff_keys = set(flat_self.keys()).symmetric_difference(flat_other.keys())
         return {key: flat_self.get(key, flat_other.get(key)) for key in diff_keys}
         return {key: flat_self.get(key, flat_other.get(key)) for key in diff_keys}
 
 

tests/test_model.py

@@ -334,7 +334,7 @@ class ResourceGroupTest(TestCase):
         # then
         # then
         self.assertEqual(expected_flat_dict, flat_dict)
         self.assertEqual(expected_flat_dict, flat_dict)
 
 
-    def test_resource_group_diff(self):
+    def test_resource_group_diff_flat_leaves(self):
         # given
         # given
         group1 = ResourceGroup(self.TEST_TREE_DICT)
         group1 = ResourceGroup(self.TEST_TREE_DICT)
 
 
@@ -348,8 +348,29 @@ class ResourceGroupTest(TestCase):
         }
         }
 
 
         # when
         # when
-        diff1 = group1.diff(group2)
-        diff2 = group2.diff(group1)
+        diff1 = group1.diff(group2, flat_leaves=True)
+        diff2 = group2.diff(group1, flat_leaves=True)
+
+        # then
+        self.assertEqual(diff1, diff2)
+        self.assertEqual(expected_diff, diff1)
+
+    def test_resource_group_diff_not_flat_leaves(self):
+        # given
+        group1 = ResourceGroup(self.TEST_TREE_DICT)
+
+        tree_dict2 = copy.deepcopy(self.TEST_TREE_DICT)
+        removed_resource = tree_dict2['resources'][0]
+        del tree_dict2['resources'][0]
+        group2 = ResourceGroup(tree_dict2)
+
+        expected_diff = {
+            'root.instance-1': Instance(id=removed_resource['id'])
+        }
+
+        # when
+        diff1 = group1.diff(group2, flat_leaves=False)
+        diff2 = group2.diff(group1, flat_leaves=False)
 
 
         # then
         # then
         self.assertEqual(diff1, diff2)
         self.assertEqual(diff1, diff2)