(no commit message)

[sfa.git] / sfa / rspecs / aggregates / rspec_manager_max.py

diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py
index 3794bf6..4a76285 100644 (file)
--- a/sfa/rspecs/aggregates/rspec_manager_max.py
+++ b/sfa/rspecs/aggregates/rspec_manager_max.py
@@ -3,7 +3,15 @@
 from sfa.util.rspec import Rspec
 import sys
 import pdb
-
+from sfa.util.misc import *
+from sfa.util.rspec import *
+from sfa.util.specdict import *
+from sfa.util.faults import *
+from sfa.util.storage import *
+from sfa.util.policy import Policy
+from sfa.util.debug import log
+from sfa.server.aggregate import Aggregates
+from sfa.server.registry import Registries
 SFA_MAX_CONF_FILE = '/etc/sfa/max_allocations'
 
 # Topology 
@@ -59,13 +67,12 @@ def collapse_alloc_dict(d):
 def alloc_links(api, links_to_add, links_to_drop, foo):
     return True
 
-def alloc_nodes(api,hrn, requested_links, links_to_delete):
+def alloc_nodes(api,hrn, requested_links):
     
     requested_nodes = link_endpoints(requested_links)
-    nodes_to_delete = link_endpoints(links_to_delete)
 
     pdb.set_trace()
-    create_slice_max_aggregate(api, hrn, requested_nodes, nodes_to_delete)
+    create_slice_max_aggregate(api, hrn, requested_nodes)
 
 # Taken from slices.py
 
@@ -220,7 +227,7 @@ def create_slice(api, hrn, rspec_xml):
             allocations_to_delete.extend([a])
 
     # Ok, let's do our thing
-    alloc_nodes(api, hrn, requested_allocations, allocations_to_delete)
+    alloc_nodes(api, hrn, requested_allocations)
     alloc_links(api, hrn, requested_allocations, allocations_to_delete)
     allocations[hrn] = requested_allocations
     commit_alloc_dict(allocations)