X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fdummy%2Fdummyaggregate.py;h=fcdca5d7d603f549414f622e16fe6fb753ec6b43;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=dc8384fc24d2dfa6904daf760e5fe580ab342cd4;hpb=8e558be62ca1e048cedb76d6036d1acbfa827bd4;p=sfa.git diff --git a/sfa/dummy/dummyaggregate.py b/sfa/dummy/dummyaggregate.py index dc8384fc..fcdca5d7 100644 --- a/sfa/dummy/dummyaggregate.py +++ b/sfa/dummy/dummyaggregate.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 from sfa.util.xrn import Xrn, hrn_to_urn, urn_to_hrn from sfa.util.sfatime import utcparse, datetime_to_string from sfa.util.sfalogging import logger @@ -46,7 +46,7 @@ class DummyAggregate: # sort slivers by node id slice_nodes = [] - if 'node_ids' in slice.keys(): + if 'node_ids' in list(slice.keys()): slice_nodes = self.driver.shell.GetNodes( {'node_ids': slice['node_ids']}) for node in slice_nodes: @@ -99,7 +99,7 @@ class DummyAggregate: users = [] user_ids = [] for slice in slices: - if 'user_ids' in slice.keys(): + if 'user_ids' in list(slice.keys()): user_ids.extend(slice['user_ids']) if user_ids: users = self.driver.shell.GetUsers({'user_ids': user_ids}) @@ -121,7 +121,7 @@ class DummyAggregate: slice['node_ids'] = node_ids nodes_dict = self.get_slice_nodes(slice, options) slivers = [] - for node in nodes_dict.values(): + for node in list(nodes_dict.values()): node.update(slice) sliver_hrn = '%s.%s-%s' % (self.driver.hrn, slice['slice_id'], node['node_id'])