keep track of slice instances

[plcapi.git] / PLC / Nodes.py

diff --git a/PLC/Nodes.py b/PLC/Nodes.py
index 6886b78..f478054 100644 (file)
--- 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):