solve conflicts

[sfa.git] / sfa / managers / aggregate_manager.py

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 061df12..20db05c 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -15,7 +15,7 @@ from sfa.rspecs.version_manager import VersionManager
 from sfa.rspecs.rspec import RSpec
 
 import sfa.plc.peers as peers
-from sfa.plc.api import SfaAPI
+from sfa.plc.plcsfaapi import PlcSfaApi
 from sfa.plc.aggregate import Aggregate
 from sfa.plc.slices import Slices
 
@@ -188,6 +188,8 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id):
     requested_slivers = [str(host) for host in rspec.version.get_nodes_with_slivers()]
     slices.verify_slice_nodes(slice, requested_slivers, peer) 
 
+    slices.verify_slice_links(slice, rspec.version.get_link_requests(), aggregate)
+
     # hanlde MyPLC peer association.
     # only used by plc and ple.
     slices.handle_peer(site, slice, persons, peer)
@@ -394,7 +396,7 @@ def main():
     #rspec = ListResources(api, "plc.pl.sirius", None, 'pl_test_sirius')
     print rspec
     """
-    api = SfaAPI()
+    api = PlcSfaApi()
     f = open(sys.argv[1])
     xml = f.read()
     f.close()