Changeset 205 for trunk

Timestamp:

11/12/09 15:43:13 (14 years ago)

Author:

bas

Message:

Preparing for new version 3.5

src/PBSQuery.py:

• rewrite of dictionary code

Location:

trunk

Files:

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

trunk/AUTHORS

@@ -6 +6 @@
 
 PBSQuery module:
-        Roy Dragseth
         Bas van der Vlies
 
@@ -14 +13 @@
         Dennis Stam
         Sil Westerveld
+        Roy Dragseth

trunk/CHANGES

@@ -1 @@
-=========== 3.2.5
-        - PBSQuery
-          The class function of node, job and queue support old and new data structure. 
-        Author: Bas van der Vlies
+=========== 3.5.0
+  * PBSQuery
+        The class functions of node, job and queue support old and new data
+        structure.
+
+        Changed the behaviour of the new data stucture, We can use it as
+        dictionary and as class attribute, this is equivalent, eg:
+          - print node['np'] and print node.np
+
+        for a node we parse the 'status' line and split on '=' char, You now can
+        use these statements, eg
+          - print node.status.arch     (node['status'].arch or node['status']['arch'])
+          - print node.status.nsession
+
+        for a job we parse the 'Variable_List' line and split on '=' char, You now can
+        use the statements, eg:
+          - print job.Variable_List.PBS_O_WORKDIR
+          - print job.Variable_List.PBS_O_HOME
+
+        For more info see examples/new_interface.py
+
+    Author: Bas van der Vlies
+
+ * new_rack_pbsmon.py
+        Rewrite to new data structure and automatically determine how many nodes
+        and racks cluster has and skip printing of empty racks (default), use -w/--wide
+        for old behaviour.
+
+   Author: Bas van der Vlies
+
 
 =========== 3.2.0

trunk/debian/changelog

@@ -1 @@
-pbs-python (3.2.5-2) intrepid; urgency=low
+pbs-python (3.5.0-1) lenny; urgency=low
 
   * PBSQuery
-        The class function of node, job and queue support old and new data
+        The class functions of node, job and queue support old and new data
         structure.
+
+        Changed the behaviour of the new data stucture, We can use it as 
+        dictionary and as class attribute, this is equivalent, eg:
+          - print node['np'] and print node.np 
+
+        for a node we parse the 'status' line and split on '=' char, You now can 
+        use these statements, eg
+          - print node.status.arch     (node['status'].arch or node['status']['arch'])
+          - print node.status.nsession
+
+        for a job we parse the 'Variable_List' line and split on '=' char, You now can 
+        use the statements, eg:
+          - print job.Variable_List.PBS_O_WORKDIR
+          - print job.Variable_List.PBS_O_HOME
+
+        For more info see examples/new_interface.py
+
     Author: Bas van der Vlies
 
@@ -13 +30 @@
    Author: Bas van der Vlies
 
- -- Bas van der Vlies <bas@rc.sara.nl>  Mon, 18 May 2009 17:03:16 +0200
+ -- Bas van der Vlies <bas@rc.sara.nl>  Mon, 12 Nov 2009 15:03:16 +0200
 
 pbs-python (3.2.0-1) intrepid; urgency=low

trunk/src/PBSQuery.py

@@ -131 +131 @@
                              values contain a '=' character
 
-                          eg: 
+                  eg: 
                             print node['np']
                                 >> [ '2' ]
@@ -144 +144 @@
                         self.d[item.name] = new 
                         
-                        new.name = item.name 
+                        new.name = item.name
 
                         for a in item.attribs:
 
-                                if a.resource:
-                                        key = '%s.%s' %(a.name, a.resource)
-                                else:
-                                        key = a.name
-
                                 if self.OLD_DATA_STRUCTURE:
+
+                                        if a.resource:
+                                                key = '%s.%s' %(a.name, a.resource)
+                                        else:
+                                                key = '%s' %(a.name)
+
                                         new[key] = a.value
+
                                 else:
                                         values = string.split(a.value, ',') 
-                                        
-                                        if len(values) == 1:
-                                                # simple form
-                                                # print 'simple %s =  %s' %(key, values[0])
+                                        sub_dict = string.split(a.value, '=')
+
+
+                                        if len(sub_dict) > 1:
+                                                # We must creat sub dict, only for specified 
+                                                # key values
                                                 #
-                                                new[key] = values
-
-                                        else:
-                                                # list check
-                                                list_or_dict = string.split(a.value, '=')
-
-
-                                                if len(list_or_dict) == 1:
-                                                        # This is a list
-                                                        # print 'list %s = %s' %(key, values)
+                                                if a.name in ['status', 'Variable_List']:
+
+                                                        for v in values:
+
+                                                                tmp_l = v.split('=')
+
+                                                                # Check if we already added the key
+                                                                #
+                                                                if new.has_key(a.name):
+                                                                        new[a.name][ tmp_l[0] ] = tmp_l[1:]
+
+                                                                else:
+                                                                        tmp_d  = dict()
+                                                                        tmp_d[ tmp_l[0] ] = tmp_l[1:]
+                                                                        new[a.name] = class_func(tmp_d) 
+
+                                        else: 
+                                                # Check if it is a resource type variable, eg:
+                                                #  - Resource_List.(nodes, walltime, ..)
+                                                #
+                                                if a.resource:
+
+                                                        if new.has_key(a.name):
+                                                                new[a.name][a.resource] = values
+
+                                                        else:
+                                                                tmp_d = dict()
+                                                                tmp_d[a.resource] = values
+                                                                new[a.name] = class_func(tmp_d) 
+                                                else:
+                                                        # Simple value
                                                         #
-                                                        new[key] = values
-
-                                                else:
-                                                        # This is dictionary
-                                                        # print 'dict %s = %s' %(key, values)
-                                                        #
-                                                        new[key] = dict()
-                                                        for v in values:
-                                                                # First argument is the key and the rest is the value 
-                                                                # - value can contain a '='
-                                                                #
-                                                                tmp = v.split('=')
-                                                                new[key][ tmp[0] ] =  tmp[1:] 
-                                                
+                                                        new[a.name] = values
+
                 self._free(l)
                 
@@ -309 +322 @@
         FALSE = 0
 
-        def __init__(self):
+        def __init__(self, dictin = None):
                 UserDict.UserDict.__init__(self)
                 self.name = None
+
+                if dictin:
+                        if dictin.has_key('name'):
+                                self.name = dictin['name']
+                                del dictin['name']
+                        self.data = dictin
 
         def get_value(self, key):
@@ -329 +348 @@
                         return self.data[name]
                 except KeyError:
-                        error = 'invalid attribute %s' %(name)
+                        error = 'Attribute key error: %s' %(name)
                         raise PBSError(error)
 

trunk/src/pbs.py

@@ -534 +534 @@
   Returns the pbs python interface version as a string. 
   """
-  return '3.2.5'
+  return '3.5.0'
 
 # A useful dict with error codes to text