Author: croberts
Date: 2011-04-21 13:28:51 +0000 (Thu, 21 Apr 2011)
New Revision: 4729
Modified:
trunk/cumin/python/cumin/model.py
Log:
Small refactoring to eliminate several lines of code and produce something that is a bit
easier to read.
Modified: trunk/cumin/python/cumin/model.py
===================================================================
--- trunk/cumin/python/cumin/model.py 2011-04-20 22:01:21 UTC (rev 4728)
+++ trunk/cumin/python/cumin/model.py 2011-04-21 13:28:51 UTC (rev 4729)
@@ -714,6 +714,10 @@
prop.title = "Job Universe"
prop.writable = False
prop.renderer = prop.render_universe
+
+ prop = DateAdProperty(self, "JobStartDate")
+ prop.group = "Main"
+ prop.writable = False
### Condor Info Group
prop = AdProperty(self, "CondorVersion")
@@ -807,76 +811,34 @@
prop.description = "When the job was submitted"
prop.group = "Dates"
prop.writable = False
+
+ #these properties are undecorated unwritable properties
+ unwritableProps = ("LastVacateTime", "JobCurrentStartDate",
"JobLastStartDate",
+ "LastSuspensionTime", "ShadowBday",
"LastJobLeaseRenewal", "EnteredCurrentStatus",
+ "CommittedTime", "LastMatchTime",
"ScheddBday", "LastRejMatchTime")
- prop = DateAdProperty(self, "LastVacateTime")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "JobStartDate")
- prop.group = "Main"
- prop.writable = False
-
- prop = DateAdProperty(self, "JobCurrentStartDate")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "JobLastStartDate")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "LastSuspensionTime")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "ShadowBday")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "LastJobLeaseRenewal")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "EnteredCurrentStatus")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "CommittedTime")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "LastMatchTime")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "ScheddBday")
- prop.group = "Dates"
- prop.writable = False
-
- prop = DateAdProperty(self, "LastRejMatchTime")
- prop.group = "Dates"
- prop.writable = False
-
+ for currentProp in unwritableProps:
+ prop = DateAdProperty(self, currentProp)
+ prop.group = "Dates"
+ prop.writable = False
+
# other
- prop = AdProperty(self, "User")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "MinHosts")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "RemoteUserCpu")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "DiskUsage")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "ImageSize")
- prop.group = "Other"
- prop.writable = False
-
+ #all of these properties are unwritable and require no description
+ unwritableProps = ("User", "MinHosts",
"RemoteUserCpu", "DiskUsage", "ImageSize",
"RequestMemory",
+ "RequestDisk", "NumShadowStarts",
"NumJobStarts", "AutoClusterId",
+ "NumJobMatches", "DiskUsage_RAW",
"JobRunCount", "RemoteSlotID",
+ "OrigMaxHosts", "TransferFiles",
"RemoteSysCpu", "ImageSize_RAW",
+ "CurrentHosts", "ClaimId",
"PublicClaimId", "StartIpAddr", "StartdPrincipal",
+ "RemoteHost", "NumShadowExceptions",
"LastRemoteHost", "LastPuclicClaimId",
+ "BytesRecvd", "RemoteWallClockTime",
"BytesSent", "CumulativeSlotTime")
+
+
+ for currentProp in unwritableProps:
+ prop = AdProperty(self, currentProp)
+ prop.group = "Other"
+ prop.writable = False
+
+
prop = AdProperty(self, "RequestMemory")
prop.description = "Required for scheduling to partitionable slots."
prop.group = "Other"
@@ -885,102 +847,6 @@
prop.description = "Required for scheduling to partitionable slots."
prop.group = "Other"
- prop = AdProperty(self, "NumShadowStarts")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "NumJobStarts")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "AutoClusterId")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "NumJobMatches")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "DiskUsage_RAW")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "JobRunCount")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "RemoteSlotID")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "OrigMaxHosts")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "TransferFiles")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "RemoteSysCpu")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "ImageSize_RAW")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "CurrentHosts")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "ClaimId")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "PublicClaimId")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "StartdIpAddr")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "StartdPrincipal")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "RemoteHost")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "NumShadowExceptions")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "LastRemoteHost")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "LastPublicClaimId")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "BytesRecvd")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "RemoteWallClockTime")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "BytesSent")
- prop.group = "Other"
- prop.writable = False
-
- prop = AdProperty(self, "CumulativeSlotTime")
- prop.group = "Other"
- prop.writable = False
-
class JobStatusProperty(AdProperty):
def render_status(self, session, status):
return JobStatusInfo.get_status_string(status)