Improved filter v42 backward compatibility handling for both argument

and return filters.

diff --git a/PLC/Methods/GetNodes.py b/PLC/Methods/GetNodes.py
index 9e07b97..bc7dc7e 100644 (file)
--- a/PLC/Methods/GetNodes.py
+++ b/PLC/Methods/GetNodes.py
@@ -90,6 +90,7 @@ class v42GetNodes(v43GetNodes):
     """
     Legacy wrapper for v43GetNodes.
     """
+
     accepts = [
         Auth(),
         Mixed([Mixed(Node.fields['node_id'],
@@ -103,12 +104,19 @@ class v42GetNodes(v43GetNodes):
 
     def call(self, auth, node_filter = None, return_fields = None):
         # convert nodenetwork_ids -> interface_ids
-        if node_filter <> None and isinstance(node_filter, dict) and \
-               node_filter.has_key('nodenetwork_ids') and \
-               not node_filter.has_key('interface_ids'):
-            node_filter['interface_ids']=node_filter['nodenetwork_ids']
+        if isinstance(node_filter, dict):
+            if node_filter.has_key('nodenetwork_ids'):
+                interface_ids = node_filter.pop('nodenetwork_ids')
+                if not node_filter.has_key('interface_ids'):
+                    node_filter['interface_ids']=interface_ids
+
+        if isinstance(return_fields, list):
+            if 'nodenetwork_ids' in return_fields:
+                return_fields.remove('nodenetwork_ids')
+                if 'interface_ids' not in return_fields:
+                    return_fields.append('interface_ids')
         nodes = v43GetNodes.call(self,auth,node_filter,return_fields)
-        # add in a interface_ids -> nodenetwork_ids
+        # if interface_ids are present, then create a nodenetwork_ids mapping
         for node in nodes:
             if node.has_key('interface_ids'):
                 node['nodenetwork_ids']=node['interface_ids']

diff --git a/PLC/Methods/GetSlices.py b/PLC/Methods/GetSlices.py
index f496356..8728db1 100644 (file)
--- a/PLC/Methods/GetSlices.py
+++ b/PLC/Methods/GetSlices.py
@@ -75,17 +75,38 @@ class v43GetSlices(Method):
 
         return slices
 
+slice_fields = Slice.fields.copy()
+slice_fields['slice_attribute_ids']=Parameter([int], "Legacy version of slice_tag_ids")
+
 class v42GetSlices(v43GetSlices):
     """
     Legacy wrapper for v43GetSlices.
     """
 
+    accepts = [
+        Auth(),
+        Mixed([Mixed(Slice.fields['slice_id'],
+                     Slice.fields['name'])],
+              Parameter(str,"name"),
+              Parameter(int,"slice_id"),
+              Filter(slice_fields)),
+        Parameter([str], "List of fields to return", nullok = True)
+        ]
+
+    returns = [slice_fields]
+
     def call(self, auth, slice_filter = None, return_fields = None):
         # convert nodenetwork_ids -> interface_ids
-        if slice_filter <> None and isinstance(slice_filter, dict) and \
-               slice_filter.has_key('slice_attribute_ids') and \
-               not slice_filter.has_key('slice_tag_ids'):
-            slice_filter['slice_tag_ids']=slice_filter['slice_attribute_ids']
+        if isinstance(slice_filter, dict):
+            if slice_filter.has_key('slice_attribute_ids'):
+                slice_tag_ids = slice_filter.pop('slice_attribute_ids') 
+                if not slice_filter.has_key('slice_tag_ids'):
+                    slice_filter['slice_tag_ids']=slice_tag_ids
+        if isinstance(return_fields, list):
+            if 'slice_attribute_ids' in return_fields:
+                return_fields.remove('slice_attribute_ids')
+                if 'slice_tag_ids' not in return_fields:
+                    return_fields.append('slice_tag_ids')
         slices = v43GetSlices.call(self,auth,slice_filter,return_fields)
         # add in a slice_tag_ids -> slice_attribute_ids
         for slice in slices: