From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 12 Jun 2012 01:56:03 +0000 (-0400)
Subject: include <service/> and <login/> elements
X-Git-Tag: sfa-2.1-12~63
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=288efb83d32eaa9513efcd7cefc99b5591c2c2a0;p=sfa.git

include <service/> and <login/> elements
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 0b3ab54d..b98d427d 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -119,7 +119,13 @@ class OSAggregate:
             disk_image = image_manager.get_disk_image(instance.image_ref)
             sliver['disk_image'] = [disk_image.to_rspec_object()]
             rspec_node['slivers'] = [sliver]
-            rspec_node['interfaces'] = interfaces 
+            rspec_node['interfaces'] = interfaces
+            # slivers always provide the ssh service
+            login = Login({'authentication': 'ssh-keys', 
+                           'hostname': interfaces[0]['ips'][0]['address'], 
+                           'port':'22', 'username': 'root'})
+            service = Services({'login': login})
+            rspec_node['services'] = [service] 
             rspec_nodes.append(rspec_node)
         return rspec_nodes