added and removed key functions

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

diff --git a/PLC/Methods/AdmGetAllNodeNetworks.py b/PLC/Methods/AdmGetAllNodeNetworks.py
index bcd2ac4..3e9eb1c 100644 (file)
--- a/PLC/Methods/AdmGetAllNodeNetworks.py
+++ b/PLC/Methods/AdmGetAllNodeNetworks.py
@@ -16,10 +16,10 @@ class AdmGetAllNodeNetworks(Method):
     accepts = [
         PasswordAuth(),
         Mixed(Node.fields['node_id'],
-               Node.fields['hostname'])
+              Node.fields['hostname'])
         ]
 
-    returns = [NodeNetwork.all_fields]
+    returns = [NodeNetwork.fields]
 
     def call(self, auth, node_id_or_hostname):
         # Authenticated function
@@ -32,9 +32,10 @@ class AdmGetAllNodeNetworks(Method):
        node = nodes[0]
 
        # Get node networks for this node
-       nodenetworks = NodeNetworks(self.api, node['nodenetwork_ids']).values()
-       if not nodenetworks:
-            raise PLCInvalidArgument, "Node has no node networks"
+        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.