Changeset 357

Timestamp:

04/11/18 15:02:50 (6 years ago)

Author:

martijk

Message:

additional print compatibility fixes

Location:

trunk/examples

Files:

• pbs_joblogin (modified) (1 diff)
• pbs_jobmonitor (modified) (1 diff)
• pbsmon.py (modified) (1 diff)
• rack_pbsmon.py (modified) (3 diffs)

trunk/examples/pbs_joblogin

@@ -24 +24 @@
 #            (os.getenv('USER'))
 #
+from __future__ import print_function
 from PBSQuery import PBSQuery
 import sys,os

trunk/examples/pbs_jobmonitor

@@ -24 +24 @@
 #            (os.getenv('USER'))
 #
+from __future__ import print_function
 from PBSQuery import PBSQuery
 import sys,os

trunk/examples/pbsmon.py

@@ -10 +10 @@
 # $Id$
 #
+from __future__ import print_function
 import sys
 import string

trunk/examples/rack_pbsmon.py

@@ -1 +1 @@
 #! /usr/bin/env python
 #
-#       pbsmon  WJ104
+#   pbsmon  WJ104
 #
-#       Hint: set ts=4
+#   Hint: set ts=4
 #
-
+from __future__ import print_function
 import os
 import sys
@@ -20 +20 @@
 
 PBS_STATES = {
-        pbs.ND_free                             : '_',
-        pbs.ND_down                             : 'X',
-        pbs.ND_offline                  : '.',
-        pbs.ND_reserve                  : 'R',
-        pbs.ND_job_exclusive    : 'J',
-        pbs.ND_job_sharing              : 'S',
-        pbs.ND_busy                             : '*',
-        pbs.ND_state_unknown    : '?',
-        pbs.ND_timeshared               : 'T',
-        pbs.ND_cluster                  : 'C',
-        pbs_ND_single                   : 'j'
+    pbs.ND_free             : '_',
+    pbs.ND_down             : 'X',
+    pbs.ND_offline          : '.',
+    pbs.ND_reserve          : 'R',
+    pbs.ND_job_exclusive    : 'J',
+    pbs.ND_job_sharing      : 'S',
+    pbs.ND_busy             : '*',
+    pbs.ND_state_unknown    : '?',
+    pbs.ND_timeshared       : 'T',
+    pbs.ND_cluster          : 'C',
+    pbs_ND_single           : 'j'
 }
 
@@ -36 +36 @@
 
 def pbsmon():
-        global NODES_PER_RACK, N_RACKS, PBS_STATES
+    global NODES_PER_RACK, N_RACKS, PBS_STATES
 
-        if len(sys.argv) > 1:
-                pbs_server = sys.argv[1]
-        else:
-                pbs_server = pbs.pbs_default()
+    if len(sys.argv) > 1:
+        pbs_server = sys.argv[1]
+    else:
+        pbs_server = pbs.pbs_default()
 
-        if not pbs_server:
-                print('No default pbs server, usage: %s [server]' % os.path.basename(sys.argv[0]))
-                sys.exit(1)
+    if not pbs_server:
+        print('No default pbs server, usage: %s [server]' % os.path.basename(sys.argv[0]))
+        sys.exit(1)
 
-        con = pbs.pbs_connect(pbs_server)
-        if con < 0:
-                errno, text = pbs.error()
-                print(errno, text)
-                sys.exit(1)
+    con = pbs.pbs_connect(pbs_server)
+    if con < 0:
+        errno, text = pbs.error()
+        print(errno, text)
+        sys.exit(1)
 
 # get the state of the nodes
-        attrl = pbs.new_attrl(2)
-        attrl[0].name = 'state'
-        attrl[1].name = 'jobs'
-        nodes = pbs.pbs_statnode(con, '', attrl, 'NULL')
+    attrl = pbs.new_attrl(2)
+    attrl[0].name = 'state'
+    attrl[1].name = 'jobs'
+    nodes = pbs.pbs_statnode(con, '', attrl, 'NULL')
 
-        node_dict = {}
+    node_dict = {}
 
-        count_states = {}
-        for key in PBS_STATES.keys():
-                count_states[key] = 0
+    count_states = {}
+    for key in PBS_STATES.keys():
+        count_states[key] = 0
 
-        for node in nodes:
-                node_attr = node.attribs
-                temp = string.split(node_attr[0].value, ',')
-                state = temp[0]
-                state_char = PBS_STATES[state]
-                count_states[state] = count_states[state] + 1
+    for node in nodes:
+        node_attr = node.attribs
+        temp = string.split(node_attr[0].value, ',')
+        state = temp[0]
+        state_char = PBS_STATES[state]
+        count_states[state] = count_states[state] + 1
 
-                if state == pbs.ND_free:
-                        if len(node_attr) > 1:
-#                               print 'TD: %s' % node.name, node_attr[1]
-                                state_char = PBS_STATES[pbs_ND_single]
-                                count_states[pbs.ND_free] = count_states[pbs.ND_free] - 1
-                                count_states[pbs_ND_single] = count_states[pbs_ND_single] + 1
+        if state == pbs.ND_free:
+            if len(node_attr) > 1:
+#               print 'TD: %s' % node.name, node_attr[1]
+                state_char = PBS_STATES[pbs_ND_single]
+                count_states[pbs.ND_free] = count_states[pbs.ND_free] - 1
+                count_states[pbs_ND_single] = count_states[pbs_ND_single] + 1
 
-#               print 'TD: %s %s' % (node.name, state_char)
-                node_dict[node.name] = state_char
+#       print 'TD: %s %s' % (node.name, state_char)
+        node_dict[node.name] = state_char
 
-        legend = PBS_STATES.keys()
-        legend.sort()
+    legend = PBS_STATES.keys()
+    legend.sort()
 
 # print nodes with gb-r%dn%d naming scheme
-        print('  ', end=' ')
-        for rack in xrange(1, N_RACKS+1):
-                print('%2d' % rack, end=' ')
-        print()
+    print('  ', end=' ')
+    for rack in xrange(1, N_RACKS+1):
+        print('%2d' % rack, end=' ')
+    print()
 
-        for node_nr in xrange(1, NODES_PER_RACK+1):
-                print('%2d' % node_nr, end=' ')
+    for node_nr in xrange(1, NODES_PER_RACK+1):
+        print('%2d' % node_nr, end=' ')
 
-                for rack in xrange(1, N_RACKS+1):
-                        node_name = 'gb-r%dn%d' % (rack, node_nr)
+        for rack in xrange(1, N_RACKS+1):
+            node_name = 'gb-r%dn%d' % (rack, node_nr)
 
-                        if node_dict.has_key(node_name):
-                                print(' %s' % node_dict[node_name], end=' ')
+            if node_dict.has_key(node_name):
+                print(' %s' % node_dict[node_name], end=' ')
 
-                                del node_dict[node_name]
-                        else:
-                                print('  ', end=' ')
+                del node_dict[node_name]
+            else:
+                print('  ', end=' ')
 
-                if node_nr-1 < len(legend):
-                        state = legend[node_nr-1]
-                        print('  %s  %-13s : %d' % (PBS_STATES[state], state, count_states[state]))
-                else:
-                        print()
+        if node_nr-1 < len(legend):
+            state = legend[node_nr-1]
+            print('  %s  %-13s : %d' % (PBS_STATES[state], state, count_states[state]))
+        else:
+            print()
 
-        print()
+    print()
 
 # any other nodes?
-        arr = node_dict.keys()
-        if arr:
-                arr.sort()
+    arr = node_dict.keys()
+    if arr:
+        arr.sort()
 
-                for node in arr:
-                        print('%s %s' % (node, node_dict[node]))
+        for node in arr:
+            print('%s %s' % (node, node_dict[node]))
 
-                print()
+        print()
 
-#       n = 0
-#       for state in legend:
-#               print '%s  %-13s : %-3d     ' % (PBS_STATES[state], state, count_states[state]),
-#               n = n + 1
-#               if n > 1:
-#                       n = 0
-#                       print
+#   n = 0
+#   for state in legend:
+#       print '%s  %-13s : %-3d     ' % (PBS_STATES[state], state, count_states[state]),
+#       n = n + 1
+#       if n > 1:
+#           n = 0
+#           print
 
 
 if __name__ == '__main__':
-        pbsmon()
+    pbsmon()