From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 14 Jun 2010 19:09:05 +0000 (+0000)
Subject: Fixes for Eucalyptus aggregate manager
X-Git-Tag: sfa-1.0-0~172
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=b822d090b9b6ee257313f4d6ca816336c5c3e852

Fixes for Eucalyptus aggregate manager
---

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 9b970380..82ddb578 100644
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -3,7 +3,6 @@ from sfa.util.faults import *
 from sfa.util.namespace import *
 from sfa.util.rspec import RSpec
 from sfa.server.registry import Registries
-from sfa.plc.nodes import *
 
 import boto
 from boto.ec2.regioninfo import RegionInfo
diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index a75dd335..c0c0d13d 100644
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -103,7 +103,7 @@ class SfaAPI(BaseAPI):
         self.credential = None
         # Initialize the PLC shell only if SFA wraps a myPLC
         rspec_type = self.config.get_aggregate_type()
-        if (rspec_type == 'pl' or rspec_type == 'vini'):
+        if (rspec_type == 'pl' or rspec_type == 'vini' or rspec_type == 'eucalyptus'):
             self.plshell = self.getPLCShell()
             self.plshell_version = "4.3"