From: Tony Mack Date: Tue, 24 Mar 2009 16:02:30 +0000 (+0000) Subject: list nodes now collapsed into list resources X-Git-Tag: sfa-0.9-0@14641~545 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c1a4828f9007bf48f57f88591d8518a326ffb32;p=sfa.git list nodes now collapsed into list resources --- diff --git a/geni/aggregate.py b/geni/aggregate.py index 5ae2c6fd..0ba4a0fa 100644 --- a/geni/aggregate.py +++ b/geni/aggregate.py @@ -153,7 +153,8 @@ class Aggregate(GeniServer): Convert hrn to planetlab name. """ parts = slicename.split("_") - slice_hrn = parts[0] + "." + "_".join(parts[1:]) + slice_hrn = ".".join([self.hrn, parts[0]]) + "." + "_".join(parts[1:]) + return slice_hrn def refresh_components(self): @@ -246,7 +247,7 @@ class Aggregate(GeniServer): slices = self.shell.GetSlices(self.auth, {}, ['name']) slice_hrns = [self.slicename_to_hrn(slice['name']) for slice in slices] - + return slice_hrns def get_rspec(self, hrn, type): @@ -516,9 +517,12 @@ class Aggregate(GeniServer): self.decode_authentication(cred, 'listslices') return self.getSlices() - def get_resources(self, cred, hrn): + def get_resources(self, cred, hrn = None): self.decode_authentication(cred, 'listnodes') - return self.getResources(hrn) + if not hrn: + return self.getNodes() + else: + return self.getResources(hrn) def get_ticket(self, cred, hrn, rspec): self.decode_authentication(cred, 'getticket') diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py index 1fb1679e..580fc611 100644 --- a/geni/util/geniclient.py +++ b/geni/util/geniclient.py @@ -256,7 +256,7 @@ class GeniClient(): # @param cred a credential # @param hrn slice hrn - def get_resources(self, cred, hrn): + def get_resources(self, cred, hrn=None): result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn) return result