From: Anil-Kumar Vengalil Date: Wed, 13 Jan 2010 16:58:48 +0000 (+0000) Subject: getting the get_resources call working X-Git-Tag: sfa-0.9-9~12 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a1332ff9978a86b78f561e194ea10e6b6c19bb8e getting the get_resources call working --- diff --git a/sfa/plc/nodes.py b/sfa/plc/nodes.py index ae732f56..9c5cf628 100644 --- a/sfa/plc/nodes.py +++ b/sfa/plc/nodes.py @@ -50,7 +50,7 @@ class Nodes(SimpleStorage): def refresh_nodes_aggregate(self): rspec = RSpec() - rspec.parseString(self.get_rspec().toxml()) + rspec.parseString(self.get_rspec()) # filter nodes according to policy blist = self.policy['node_blacklist'] @@ -131,11 +131,11 @@ class Nodes(SimpleStorage): resourceDict = {'RSpec': resources} # convert rspec dict to xml rspec.parseDict(resourceDict) - return rspec + return rspec.toxml() def refresh_nodes_smgr(self): - rspec = self.get_rspec_smgr() + rspec = RSpec(xml=self.get_rspec_smgr()) # filter according to policy blist = self.policy['node_blacklist'] wlist = self.policy['node_whitelist'] @@ -259,5 +259,5 @@ class Nodes(SimpleStorage): # convert the rspec dict to xml rspec = RSpec() rspec.parseDict(resourceDict) - return rspec + return rspec.toxml()