From 5bee893fff781f6f06c53c9f0e0632c44ecd5cb5 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 3 Jan 2014 12:00:59 -0800 Subject: [PATCH] allow hpc_service and rr_service to be None when calling write_slices_file --- planetstack/hpc_observer/hpclib.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/planetstack/hpc_observer/hpclib.py b/planetstack/hpc_observer/hpclib.py index e91a468..5375c2f 100644 --- a/planetstack/hpc_observer/hpclib.py +++ b/planetstack/hpc_observer/hpclib.py @@ -62,14 +62,18 @@ class HpcLibrary: return mapping - def write_slices_file(self, hpc_service, rr_service): + def write_slices_file(self, hpc_service=None, rr_service=None): + if (hpc_service is None): + hpc_service = HpcService.objects.get() + + if (rr_service is None): + rr_service = RequestRouterService.objects.get() + mapping = self.extract_slice_info(hpc_service) rr_mapping = self.extract_slice_info(rr_service) mapping.update(rr_mapping) - print mapping - fn = "/tmp/slices" f = open(fn, "w") @@ -95,9 +99,7 @@ PUPPET_MASTER_PORT="8140" """ % mapping) if __name__ == '__main__': - hpc_service = HpcService.objects.get() - rr_service = RequestRouterService.objects.get() lib = HpcLibrary() - lib.write_slices_file(hpc_service, rr_service) + lib.write_slices_file() -- 2.43.0