X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Faggregate.py;h=c394bab31b27e5976585c712e28fc266f9857d0c;hb=18e0eb870738ec44d469b2cdac3c4eb88534d2d1;hp=a995542ec06aa9ea139ea9233cbbab8ce05b8196;hpb=5eb519a6659149aa620b1165ec2866f0afd69403;p=sfa.git diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index a995542e..c394bab3 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -208,7 +208,7 @@ class Aggregate: rspec_node['slivers'] = [sliver] # slivers always provide the ssh service - login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], port:'22'}) + login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22'}) service = Services({'login': login}) rspec_node['services'].append(service) rspec_nodes.append(rspec_node) @@ -228,7 +228,7 @@ class Aggregate: rspec = RSpec(version=rspec_version, user_options=self.user_options) if slice and 'expiration_date' in slice: rspec.set('expires', epochparse(slice['expiration_date'])) - rspec.version.add_nodes(self.get_nodes(slice), slivers) + rspec.version.add_nodes(self.get_nodes(slice, slivers)) rspec.version.add_links(self.get_links(slice)) # add sliver defaults