Changeset 164

Timestamp:

09/24/08 17:08:28 (16 years ago)

Author:

bas

Message:

src/PBSQuery.py:

• added a new function getnodes_with_property() for torque > 2.1.0

Location:

trunk

Files:

• CHANGES (modified) (2 diffs)
• src/PBSQuery.py (modified) (3 diffs)

trunk/CHANGES

@@ -1 +1 @@
 =========== 2.9.8 
-        - pbs_python.spec file patch added libdir and python defines so it will
-          build for RHEL5.1/CentOS 5.1
+        - pbs_python.spec file patch added libdir and python defines so it 
+          will build for RHEL5.1/CentOS 5.1
           by        : Michael Sternberg <sternberg add anl dot gov>
           applied by: Bas van der Vlies
@@ -17 +17 @@
           Added by: Bas van der Vlies
 
-        - We now have proper destructors (free memory) in SWIG for attrl and attropl
-          attributes.
+        - We now have proper destructors (free memory) in SWIG for attrl and 
+          attropl attributes.
+          Added by: Bas van der Vlies
+
+        - PBSQuery
+           * Added getnodes_with_property() function. This will get all nodes with
+             a certain property, eg:
+              - get all nodes with property 'cores8' and return all attributes:
+                 getnodes_with_property('cores8')
+
+              - get all nodes with property 'cores2' and omly return the 
+                attributes 'state' and 'properties':
+                 attrl = [ 'state', 'properties' ]
+                 getnodes_with_property('cores2', attrl)
           Added by: Bas van der Vlies
 

trunk/src/PBSQuery.py

@@ -169 +169 @@
                 return self.d
 
-        def _statnode(self, node_name='', attrib_list=None):
+        def _statnode(self, select='', attrib_list=None, property=None):
                 """Get the node config from the pbs server"""
                 if attrib_list:
@@ -176 +176 @@
                         self.attribs = 'NULL' 
                         
+                if property:
+                        select = ':%s' %(property)
+
                 self._connect()
-                nodes = pbs.pbs_statnode(self.con, node_name, self.attribs, 'NULL')
+                nodes = pbs.pbs_statnode(self.con, select, self.attribs, 'NULL')
                 self._disconnect() 
                 
@@ -189 +192 @@
         def getnodes(self, attrib_list=None):
                 self._statnode('', attrib_list)
+                return self.d
+
+        def getnodes_with_property(self, property, attrib_list=None):
+                self._statnode('', attrib_list, property)
                 return self.d