Changeset 194

Timestamp:

05/18/09 16:51:18 (15 years ago)

Author:

bas

Message:

examples/new_rack_pbsmon.py:

• ported to new data structure

File:

• trunk/examples/new_rack_pbsmon.py (modified) (2 diffs)

trunk/examples/new_rack_pbsmon.py

@@ -66 +66 @@
                 sys.exit(-1)
 
+        p.new_data_structure()
+
 # get the state of the nodes
         attr = [ 'state', 'jobs', 'properties' ]
@@ -77 +79 @@
         node_dict = {}
 
-        for nodename, node in nodes.items():
+        for id in nodes:
 
                 # Skip login nodes in status display
                 #
-                if not nodename.find('login'):
-                        continue
-
-                state = node['state']
-                if string.find(state, ',') >= 0:                        # multiple states for a node?
-                        state_list = string.split(state, ',')
-                        if pbs.ND_down in state_list: 
-                                state = pbs.ND_down
-                        else:
-                                state = string.split(state, ',')[-1]
-                                
+                if not nodes[id].name.find('login'):
+                        continue
+
+                if pbs.ND_down in nodes[id].state:
+                        state = pbs.ND_down
+                else:
+                        state = nodes[id].state[0]
 
                 state_char = PBS_STATES[state]
 
-                if node.is_free() and node.has_job():           # single job
+#               print 'TD: ', nodes[id].name, nodes[id].is_free() ,nodes[id].has_job()
+
+                if nodes[id].is_free() and nodes[id].has_job():         # single job
 #                       print 'TD: %s' % nodename, node
                         state_char = PBS_STATES[pbs_ND_single]
 
 #               print 'TD: %s %s' % (nodename, state_char)
-                dummy = string.split(nodename, '-')
+                dummy = string.split(nodes[id].name, '-')
                 node_dict[dummy[1]] = state_char