Merge branch 'upstreammaster'

[sfa.git] / sfa / plc / aggregate.py

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index c76dc7d..abd118f 100644 (file)
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -195,8 +195,8 @@ class Aggregate:
                 rspec_node['slivers'] = [slivers[node['node_id']]]
                 
                 # slivers always provide the ssh service
-                login = Login({'authentication': 'ssh-keys', hostname=node['hostname'], port='22'})
-                service = Services({'login': login)
+                login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], port:'22'})
+                service = Services({'login': login})
                 rspec_node['services'].append(service)
             rspec_nodes.append(rspec_node)
         return rspec_nodes
@@ -216,6 +216,11 @@ class Aggregate:
         rspec.version.add_nodes(self.get_nodes(slice, slivers))
         rspec.version.add_links(self.get_links(slice))
         
+        # add sliver defaults
+        default_sliver_attribs = slivers.get(None, [])
+        for sliver_attrib in default_sliver_attribs:
+            rspec.version.add_default_sliver_attribute(sliver_attrib['name'], sliver_attrib['value'])  
+        
         return rspec.toxml()