From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 15 Mar 2012 19:43:05 +0000 (-0400)
Subject: import Euca2ool
X-Git-Tag: sfa-2.1-4~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a6c363bda8e5807e48b2a24bc9e2031209117748;p=sfa.git

import Euca2ool
---

diff --git a/sfa/openstack/euca_shell.py b/sfa/openstack/euca_shell.py
index 9f1bc7d2..e47c1066 100644
--- a/sfa/openstack/euca_shell.py
+++ b/sfa/openstack/euca_shell.py
@@ -6,6 +6,12 @@ try:
 except:
     has_boto=False    
 
+try: 
+    from euca2ools import Euca2ool
+    has_euca = True
+except:
+    has_euca = False
+
 from sfa.util.sfalogging import logger
 from sfa.openstack.nova_shell import NovaShell
 from sfa.util.config import Config
@@ -22,6 +28,11 @@ class EucaShell:
         if not has_boto:
             logger.info('Unable to access EC2 API - boto library not found.')
             return None
+        if not has_euca:
+            logger.info('euca2ools library not found.')
+            return None
+
+        self.euca2ool = Euca2ool()
         nova = NovaShell(self.config)
         admin_user = nova.auth_manager.get_user(self.config.SFA_NOVA_USER)
         access_key = admin_user.access