Author: justi9 Date: 2008-09-02 11:37:33 -0400 (Tue, 02 Sep 2008) New Revision: 2376 Modified: mgmt/trunk/cumin/python/cumin/model.py mgmt/trunk/cumin/python/cumin/scheduler.py Log: Add properties to schedulers; pass None down from CuminProperty rather than formatting it Modified: mgmt/trunk/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2008-09-02 15:36:42 UTC (rev 2375) +++ mgmt/trunk/cumin/python/cumin/model.py 2008-09-02 15:37:33 UTC (rev 2376) @@ -122,9 +122,6 @@ if isinstance(value, datetime): value = fmt_datetime(value) - if value is None: - value = fmt_none() - return value class CuminAction(object): @@ -1437,6 +1434,24 @@ super(CuminScheduler, self).__init__(model, "scheduler", Scheduler, SchedulerStats) + prop = CuminProperty(self, "Name") + prop.title = "Name" + + prop = CuminProperty(self, "JobQueueBirthdate") + prop.title = "Job Queue Birthdate" + + prop = CuminProperty(self, "MaxJobsRunning") + prop.title = "Max Jobs Running" + + prop = CuminProperty(self, "MyAddress") + prop.title = "Contact Address" + + prop = CuminProperty(self, "PublicNetworkIpAddr") + prop.title = "Public IP Address" + + prop = CuminProperty(self, "Machine") + prop.title = "Machine" + def get_title(self, session): return "Scheduler" Modified: mgmt/trunk/cumin/python/cumin/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-02 15:36:42 UTC (rev 2375) +++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-02 15:37:33 UTC (rev 2376) @@ -58,5 +58,8 @@ self.__tabs = TabbedModeSet(app, "tabs") self.add_child(self.__tabs) + details = CuminDetails(app, "details") + self.__tabs.add_tab(details) + class SchedulerStatus(CuminStatus): pass