X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_vini.py;h=74a07e23d7128cb58d7e475c4f845b4b1c52cb1b;hb=1f53d3fdc7101644ded0d0918c10b3f6390e30ed;hp=ee693786c855eef6f48cc02dc7aea33d0b9166bf;hpb=69f41408cf316d32b532fdad7d88c488e85c002d;p=sfa.git

diff --git a/sfa/managers/aggregate_manager_vini.py b/sfa/managers/aggregate_manager_vini.py
index ee693786..74a07e23 100644
--- a/sfa/managers/aggregate_manager_vini.py
+++ b/sfa/managers/aggregate_manager_vini.py
@@ -1,13 +1,11 @@
-### $Id: slices.py 15842 2009-11-22 09:56:13Z anil $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/plc/slices.py $
-
 import datetime
 import time
 import traceback
 import sys
 
 from types import StringTypes
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
+from sfa.util.plxrn import hrn_to_pl_slicename
 from sfa.util.rspec import *
 from sfa.util.specdict import *
 from sfa.util.faults import *
@@ -16,7 +14,6 @@ from sfa.util.policy import Policy
 from sfa.util.record import *
 from sfa.util.sfaticket import SfaTicket
 from sfa.server.registry import Registries
-from sfa.util.debug import log
 from sfa.plc.slices import Slices
 import sfa.plc.peers as peers
 from sfa.managers.vini.vini_network import *
@@ -63,7 +60,7 @@ def create_slice(api, xrn, creds, xml, users):
 
     hrn, type = urn_to_hrn(xrn)
     peer = None
-    reg_objects = __get_registry_objects(slice_xrn, creds, users)
+    reg_objects = __get_registry_objects(xrn, creds, users)
     slices = Slices(api)
     peer = slices.get_peer(hrn)
     sfa_peer = slices.get_sfa_peer(hrn)
@@ -100,7 +97,7 @@ def create_slice(api, xrn, creds, xml, users):
 
 def get_rspec(api, creds, options):
     # get slice's hrn from options
-    xrn = options.get('geni_slice_urn', None)
+    xrn = options.get('geni_slice_urn', '')
     hrn, type = urn_to_hrn(xrn)
     
     # look in cache first