From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 19 Mar 2014 02:00:52 +0000 (-0400)
Subject: fix bugs
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=976d774450582012e12ced4be760d9a1fbe2689f;p=plstackapi.git

fix bugs
---

diff --git a/planetstack/observer/steps/sync_slivers.py b/planetstack/observer/steps/sync_slivers.py
index 03383d9..d832b7d 100644
--- a/planetstack/observer/steps/sync_slivers.py
+++ b/planetstack/observer/steps/sync_slivers.py
@@ -38,12 +38,21 @@ class SyncSlivers(OpenStackSyncStep):
             nics = self.get_requested_networks(sliver.slice)
             file("/tmp/scott-manager","a").write("slice: %s\nreq: %s\n" % (str(sliver.slice.name), str(nics)))
             slice_memberships = SlicePrivilege.objects.filter(slice=sliver.slice)
-            pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key]
-            pubkeys.append(sliver.creator.public_key)
-            driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, deployment=sliver.node.deployment.name)
+            pubkeys = [sm.user.public_key for sm in slice_memberships if sm.user.public_key is not None]
+            if sliver.creator.public_key:
+                pubkeys.append(sliver.creator.public_key)
+            driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, deployment=sliver.deploymentNetwork.name)
+            # look up image id
+            deployment_driver = self.driver.admin_driver(deployment=sliver.deploymentNetwork.name)
+            image_id = None
+            images = deployment_driver.shell.glance.get_images()
+            for image in images:
+                if image['name'] == sliver.image.name:
+                    image_id = image['id']
+                     
             instance = driver.spawn_instance(name=sliver.name,
                                 key_name = sliver.creator.keyname,
-                                image_id = sliver.image.image_id,
+                                image_id = image_id,
                                 hostname = sliver.node.name,
                                 pubkeys = pubkeys,
                                 nics = nics )
@@ -51,6 +60,6 @@ class SyncSlivers(OpenStackSyncStep):
             sliver.instance_name = getattr(instance, 'OS-EXT-SRV-ATTR:instance_name')
 
         if sliver.instance_id and metadata_update:
-            self.driver.update_instance_metadata(sliver.instance_id, metadata_update)
+            driver.update_instance_metadata(sliver.instance_id, metadata_update)
 
         sliver.save()    
diff --git a/planetstack/openstack/client.py b/planetstack/openstack/client.py
index c6b6b16..16f6b2e 100644
--- a/planetstack/openstack/client.py
+++ b/planetstack/openstack/client.py
@@ -70,8 +70,8 @@ class Client:
         if endpoint:
             self.endpoint = endpoint
 
-        if '@' in self.username:
-            self.username = self.username[:self.username.index('@')]
+        #if '@' in self.username:
+        #    self.username = self.username[:self.username.index('@')]
 
 class KeystoneDB:
     @require_enabled
diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index 174cf85..619a8ed 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -397,7 +397,6 @@ class OpenStackDriver:
         files = {}
         if pubkeys:
             files['/root/.ssh/authorized_keys'] = "\n".join(pubkeys)
-
         hints = {}
         availability_zone = None
         if hostname: