This commit was manufactured by cvs2svn to create branch

[plcapi.git] / PLC / Methods / GetNodeNetworks.py

diff --git a/PLC/Methods/GetNodeNetworks.py b/PLC/Methods/GetNodeNetworks.py
index 14cdd48..558dcf3 100644 (file)
--- a/PLC/Methods/GetNodeNetworks.py
+++ b/PLC/Methods/GetNodeNetworks.py
@@ -1,46 +1,30 @@
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
+from PLC.Filter import Filter
 from PLC.NodeNetworks import NodeNetwork, NodeNetworks
-from PLC.Nodes import Node, Nodes
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class GetNodeNetworks(Method):
     """
-    Returns all the networks this node is connected to, as an array of
-    structs.
+    Returns an array of structs containing details about node network
+    interfacess. If nodenetworks_filter is specified and is an array
+    of node network identifiers, or a struct of node network
+    attributes, only node network interfaces matching the filter will
+    be returned. If return_fields is specified, only the
+    specified details will be returned.
     """
 
-    roles = ['admin', 'pi', 'user', 'tech']
+    roles = ['admin', 'pi', 'user', 'tech', 'node', 'anonymous']
 
     accepts = [
-        PasswordAuth(),
-        Mixed(Node.fields['node_id'],
-              Node.fields['hostname'])
+        Auth(),
+        Mixed([NodeNetwork.fields['nodenetwork_id']],
+              Filter(NodeNetwork.fields)),
+        Parameter([str], "List of fields to return", nullok = True)
         ]
 
     returns = [NodeNetwork.fields]
-
-    def call(self, auth, node_id_or_hostname):
-        # Authenticated function
-        assert self.caller is not None
-
-        # Get node information
-        nodes = Nodes(self.api, [node_id_or_hostname]).values()
-       if not nodes:
-            raise PLCInvalidArgument, "No such node"
-       node = nodes[0]
-
-       # Get node networks for this node
-        if node['nodenetwork_ids']:
-            nodenetworks = NodeNetworks(self.api, node['nodenetwork_ids']).values()
-        else:
-            nodenetworks = []
-
-       # Filter out undesired or None fields (XML-RPC cannot marshal
-        # None) and turn each node into a real dict.
-        valid_return_fields_only = lambda (key, value): value is not None
-        nodenetworks = [dict(filter(valid_return_fields_only, nodenetwork.items())) \
-                        for nodenetwork in nodenetworks]
-               
-       return nodenetworks
+    
+    def call(self, auth, nodenetwork_filter = None, return_fields = None):
+        return NodeNetworks(self.api, nodenetwork_filter, return_fields)