changes for 3.0

[monitor.git] / nodegroups.py

diff --git a/nodegroups.py b/nodegroups.py
index e96e7b4..f5d46ba 100755 (executable)
--- a/nodegroups.py
+++ b/nodegroups.py
@@ -22,6 +22,7 @@ from nodequery import verify,query_to_dict,node_select
 
 from nodecommon import *
 import database
+import util.file
 
 def main():
        fb = database.dbLoad("findbad")
@@ -52,7 +53,7 @@ def main():
                if config.node: 
                        hostlist = [ config.node ] 
                else: 
-                       hostlist = config.getListFromFile(config.nodelist)
+                       hostlist = util.file.getListFromFile(config.nodelist)
 
                # NOTE: preserve order given in file.  Otherwise, return values are not in order
                # given to GetNodes
@@ -80,7 +81,7 @@ def main():
                group_str = "selection"
                
        else:
-               ng = api.GetNodeGroups({'name' : config.nodegroup})
+               ng = api.GetNodeGroups({'grouname' : config.nodegroup})
                nodelist = api.GetNodes(ng[0]['node_ids'])
 
                group_str = config.nodegroup