From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 11 Sep 2012 14:33:39 +0000 (-0400)
Subject: client id should remain as long as slice remains alive
X-Git-Tag: sfa-2.1-14~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a138be0bc9c64130bbd365a618b0642ff9cdb7e6;p=sfa.git

client id should remain as long as slice remains alive
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 861e1be6..8522ddde 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -307,6 +307,8 @@ class OSAggregate:
                     metadata['security_groups'] = group_name
                     if node.get('component_id'):
                         metadata['component_id'] = node['component_id']
+                    if node.get('client_id'):
+                        metadata['client_id'] = node['client_id']
                     server = self.driver.shell.nova_manager.servers.create(flavor=flavor_id,
                                                             image=image_id,
                                                             key_name = key_name,
@@ -314,8 +316,6 @@ class OSAggregate:
                                                             files=files,
                                                             meta=metadata, 
                                                             name=instance_name)
-                    if node.get('client_id'):
-                        server.metadata['client_id'] = node['client_id']
                     created_instances.append(server)
                     
                 except Exception, err: