Fixed a bug that showed instances not associated with the slice

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index e1d9303..e62381a 100644 (file)
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -370,7 +370,10 @@ def get_rspec(api, xrn, origin_hrn):
                 instanceId.append(instance.instance_id)
 
             # Get the information about those instances using their ids.
-            reservations = conn.get_all_instances(instanceId)
+            if len(instanceId) > 0:
+                reservations = conn.get_all_instances(instanceId)
+            else:
+                reservations = []
             for reservation in reservations:
                 for instance in reservation.instances:
                     instances.append(instance)

diff --git a/sfatables/globals.py b/sfatables/globals.py
index fe6788d..4e8e77e 100644 (file)
--- a/sfatables/globals.py
+++ b/sfatables/globals.py
@@ -1,5 +1,5 @@
 import os.path
 
-sfatables_config = '/etc/sfatables'
+sfatables_config = '/Users/andy/Desktop/svn.planet-lab.org/sfa/trunk/sfatables'
 match_dir = os.path.join(sfatables_config, "matches")
 target_dir = os.path.join(sfatables_config, "targets")