X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodes.py;fp=PLC%2FNodes.py;h=f478054b7ddad7dbad438807a358061e352b196f;hb=952c83c9dc4cef2e7c746281247883ac9d4685f3;hp=6886b78dc7d05b03a5275b79f311e26a961a582b;hpb=99b2c2b5e068b21b1208733a77fdf908257c51e5;p=plcapi.git

diff --git a/PLC/Nodes.py b/PLC/Nodes.py
index 6886b78..f478054 100644
--- a/PLC/Nodes.py
+++ b/PLC/Nodes.py
@@ -97,7 +97,7 @@ class Node(AlchemyObj):
 
     def validate_node_type(self, node_type):
         # Make sure node type does not alredy exist
-        conflicts = NodeTypes(self.api, [name])
+        conflicts = NodeTypes(self.api, [node_type])
         if not conflicts:
             raise PLCInvalidArgument, "Invalid node_type"
         return node_type
@@ -314,7 +314,10 @@ class Nodes(list):
             # Separate the list into integers and strings
             ints = filter(lambda x: isinstance(x, (int, long)), node_filter)
             strs = filter(lambda x: isinstance(x, StringTypes), node_filter)
-            nodes = Node().select(filter={'node_id': ints, 'hostname': strs})
+            node_filter = {}
+            if ints: node_filter['node_id'] = ints 
+            if strs: node_filter['hostname'] = strs    
+            nodes = Node().select(filter=node_filter)
         elif isinstance(node_filter, dict):
             nodes = Node().select(filter=node_filter)
         elif isinstance (node_filter, StringTypes):