Changeset 143

Timestamp:

10/19/06 09:58:39 (18 years ago)

Author:

bas

Message:

src/PBSQuery.py:

• Added some functions get_version() for server, get_nodes for jobs

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• src/PBSQuery.py (modified) (4 diffs)

trunk/CHANGES

@@ -10 +10 @@
           Suggested by: Ramon Bastiaans
           Fixed by    : Bas van der Vlies
+
+        - PBSQuery.py
+           * Added get_version() for server class, returns the version of 
+             the batch server
+           * Added get_nodes() for job class, returns a list of nodes on 
+             which the job is run
 
 =========== Version 2.9.2

trunk/debian/changelog

@@ +1 @@
+pbs-python (2.9.2-4) unstable; urgency=low
+
+  * PBSQuery: Make use of UserDict module
+
+ -- Bas van der Vlies <bas@rc.sara.nl>  Wed, 18 Oct 2006 11:46:34 +0200
+
 pbs-python (2.9.2-3) unstable; urgency=low
 

trunk/src/PBSQuery.py

@@ -61 +61 @@
 import pbs
 import UserDict
+import string
 import sys
 
@@ -232 +233 @@
                         return self.TRUE 
 
+        def get_nodes(self):
+                nodes = self.get_value('exec_host')
+                if nodes:
+                        l = string.split(nodes,'+')
+                        return l
+                return list()
+
+
 class node(_PBSobject):
         """PBS node class"""
@@ -251 +260 @@
 class queue(_PBSobject):
         """PBS queue class"""
-        def __init__(self):
-                UserDict.UserDict.__init__(self)
-                self.name = None
-
         def is_enabled(self):
                 if self.get_value('enabled') == 'True':
@@ -270 +275 @@
         """PBS server class"""
 
+        def get_version(self):
+                return self.get_value('pbs_version')
+
 def main():
         p = PBSQuery() 
         serverinfo = p.get_serverinfo()
-        for name, server in serverinfo.items():
-                print server
-        for key in server.keys():
-                print key, ' = ', server[key]
+        for server in serverinfo.keys():
+                print server, ' version: ', serverinfo[server].get_version()
+        for resource in serverinfo[server].keys():
+                print '\t ', resource, ' = ', serverinfo[server][resource]
 
         queues = p.getqueues()
-        for queue in queues.values():
-                if queue.is_execution():
-                        print queue
-                if queue.has_key('acl_groups'):
-                        print 'acl_groups: yes'
-                else:
-                        print 'acl_groups: no'
+        for queue in queues.keys():
+                print queue
+                if queues[queue].is_execution():
+                        print '\t ', queues[queue]
+                if queues[queue].has_key('acl_groups'):
+                        print '\t acl_groups: yes'
+                else:
+                        print '\t acl_groups: no'
 
         jobs = p.getjobs()