From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 11 Nov 2011 04:10:00 +0000 (-0500)
Subject: fix call to get_nodes()
X-Git-Tag: sfa-1.1-3~41
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=18e0eb870738ec44d469b2cdac3c4eb88534d2d1;p=sfa.git

fix call to get_nodes()
---

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