From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 6 Aug 2012 04:32:41 +0000 (-0400)
Subject: fix TypeError
X-Git-Tag: sfa-2.1-14~58
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d063f83d6c95d1a12f2e50397752b6db957b749f;p=sfa.git

fix TypeError
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 17f42d82..da2fc53d 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -171,7 +171,9 @@ class OSAggregate:
 
 
     def create_instance_key(self, slice_hrn, user):
-        key_name = "%s:%s" (slice_name, Xrn(user['urn']).get_hrn())
+        slice_name = Xrn(slice_hrn).leaf
+        user_name = Xrn(user['urn']).leaf
+        key_name = "%s:%s" % (slice_name, user_name)
         pubkey = user['keys'][0]
         key_found = False
         existing_keys = self.driver.shell.nova_manager.keypairs.findall(name=key_name)