from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.policy import Policy
-from sfa.server.aggregate import Aggregates
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']
end_time = int(threshold.strftime("%s"))
duration = end_time - start_time
- aggregates = Aggregates(self.api)
+ aggregates = self.api.aggregates
rspecs = {}
networks = []
rspec = RSpec()
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']
# convert the rspec dict to xml
rspec = RSpec()
rspec.parseDict(resourceDict)
- return rspec
+ return rspec.toxml()