X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Feuca_shell.py;h=e2bdf7f86d7c010fab5e961e199ff50b778a8839;hb=3d9943d1e5f993408b618cde29ff31b3585e5cef;hp=dfeee5a5c4cbcffaf9c3298aff5069e119e091e8;hpb=04cdf5af60dff0dcc75b4f86897f812538105cc6;p=sfa.git

diff --git a/sfa/openstack/euca_shell.py b/sfa/openstack/euca_shell.py
index dfeee5a5..e2bdf7f8 100644
--- a/sfa/openstack/euca_shell.py
+++ b/sfa/openstack/euca_shell.py
@@ -17,16 +17,33 @@ class EucaShell:
 
     def __init__(self, config):
         self.config = config
+        self.nova_shell = NovaShell(config)
+        self.access_key = None
+        self.secret_key = None
 
-    def get_euca_connection(self):
+    def init_context(self, project_name=None):
+        
+        # use the context of the specified  project's project
+        # manager. 
+        if project_name:
+            project = self.nova_shell.auth_manager.get_project(project_name)
+            self.access_key = "%s:%s" % (project.project_manager.name, project_name)
+            self.secret_key = project.project_manager.secret
+        else:
+            # use admin user's context
+            admin_user = self.nova_shell.auth_manager.get_user(self.config.SFA_NOVA_USER)
+            #access_key = admin_user.access
+            self.access_key = '%s' % admin_user.name
+            self.secret_key = admin_user.secret
+
+    def get_euca_connection(self, project_name=None):
         if not has_boto:
             logger.info('Unable to access EC2 API - boto library not found.')
             return None
-        nova = NovaShell(self.config)
-        admin_user = nova.auth_manager.get_user(self.config.SFA_NOVA_USER)
-        #access_key = admin_user.access
-        access_key = '%s' % admin_user.name
-        secret_key = admin_user.secret
+
+        if not self.access_key or not self.secret_key:
+            self.init_context(project_name)
+        
         url = self.config.SFA_NOVA_API_URL
         host = None
         port = None    
@@ -46,8 +63,8 @@ class EucaShell:
             port = int(parts[0])
             parts = parts[1:]
             path = '/'+'/'.join(parts)
-        return boto.connect_ec2(aws_access_key_id=access_key,
-                                aws_secret_access_key=secret_key,
+        return boto.connect_ec2(aws_access_key_id=self.access_key,
+                                aws_secret_access_key=self.secret_key,
                                 is_secure=use_ssl,
                                 region=RegionInfo(None, 'eucalyptus', host),
                                 host=host,