Merge pull request #268 from pvelumul/configpush_changes

providing a flag to consider deleted filters in ContractSubject while…

acitoolkit/acitoolkit.py

@@ -3951,6 +3951,10 @@ def get_json(self):
         for entry in self.get_filters():
             filt = {subjectFilter: {'attributes': {'tnVzFilterName': entry.name}}}
             filters.append(filt)
+
+        for entry in self.get_filters(deleted=True):
+            filt = {'vzRsSubjFiltAtt': {'attributes': {'status': 'deleted', 'tnVzFilterName': entry.name}}}
+            filters.append(filt)
         resp_json[subject]['children'] = filters
 
         terminals = []
@@ -3975,16 +3979,22 @@ def add_filter(self, filter_obj):
             raise TypeError('add_filter not called with Filter')
         self._add_relation(filter_obj)
 
-    def get_filters(self):
+    def get_filters(self, deleted=False):
         """
         Get all of the filters that are attached to this ContractSubject.
 
         :returns: List of Filter objects
         """
         resp = []
         for relation in self._relations:
-            if isinstance(relation.item, Filter):
-                resp.append(relation.item)
+            if deleted:
+                if relation.status == 'detached':
+                    if isinstance(relation.item, Filter):
+                        resp.append(relation.item)
+            else:
+                if relation.status == 'attached':
+                    if isinstance(relation.item, Filter):
+                        resp.append(relation.item)
         return resp
 
     def _get_instance_subscription_urls(self):