From 6bfe8c14f0ea3a8cd42b19fb90061cdb0d5b1bc8 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Thu, 12 Mar 2009 15:14:39 +0000 Subject: [PATCH] fix bug in refresh_components --- geni/slicemgr.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/geni/slicemgr.py b/geni/slicemgr.py index da490391..dac3856f 100644 --- a/geni/slicemgr.py +++ b/geni/slicemgr.py @@ -58,7 +58,7 @@ class SliceMgr(GeniServer): self.nodes = SimpleStorage(nodes_file) self.nodes.load() - slices_file = os.sep.join([self.server_basedir, 'smgr' + self.hrn + '.slices']) + slices_file = os.sep.join([self.server_basedir, 'smgr.' + self.hrn + '.slices']) self.slices = SimpleStorage(slices_file) self.slices.load() @@ -195,17 +195,15 @@ class SliceMgr(GeniServer): for aggregate in aggregates: try: # get the rspec from the aggregate - agg_server = self.aggregates[aggregate] agg_rspec = self.aggregates[aggregate].list_nodes(self.credential) - # extract the netspec from each aggregates rspec rspec.parseString(agg_rspec) - networks.extend({'NetSpec': rspec.getDictsByTagName('NetSpec')}) + networks.extend([{'NetSpec': rspec.getDictsByTagName('NetSpec')}]) except: # XX print out to some error log print "Error calling list nodes at aggregate %s" % aggregate raise - + # create the rspec dict resources = {'networks': networks, 'start_time': start_time, 'duration': duration} resourceDict = {'Rspec': resources} -- 2.43.0