bug fix

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

diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py
index dd48df8..2e1b3c3 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,11 +1,11 @@
 import os
 import xmlrpclib
 from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.sfaticket import SfaTicket
 
 def init_server():
-    from server import sfa_component_setup
+    from sfa.server import sfa_component_setup
     # get current trusted gids
     try:
         sfa_component_setup.get_trusted_certs()
@@ -13,20 +13,26 @@ def init_server():
         # our keypair may be old, try refreshing
         sfa_component_setup.get_node_key()
         sfa_component_setup.get_credential(force=True)
-        sfa_component_sertup.get_trusted_certs()
+        sfa_component_setup.get_trusted_certs()
            
-    
-
-def start_slice(api, slicename):
+def start_slice(api, xrn):
+    hrn, type = urn_to_hrn(xrn)
+    slicename = hrn_to_pl_slicename(hrn)
     api.nodemanger.Start(slicename)
 
-def stop_slice(api, slicename):
+def stop_slice(api, xrn):
+    hrn, type = urn_to_hrn(xrn)
+    slicename = hrn_to_pl_slicename(hrn)
     api.nodemanager.Stop(slicename)
 
-def delete_slice(api, slicename):
+def delete_slice(api, xrn):
+    hrn, type = urn_to_hrn(xrn)
+    slicename = hrn_to_pl_slicename(hrn)
     api.nodemanager.Destroy(slicename)
 
-def reset_slice(api, slicename):
+def reset_slice(api, xrn):
+    hrn, type = urn_to_hrn(xrn)
+    slicename = hrn_to_pl_slicename(hrn)
     if not api.sliver_exists(slicename):
         raise SliverDoesNotExist(slicename)
     api.nodemanager.ReCreate(slicename)
@@ -48,6 +54,6 @@ def redeem_ticket(api, ticket_string):
 
     # convert ticket to format nm is used to
     nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True)
-    self.api.nodemanager.AdminTicket(nm_ticket)
+    api.nodemanager.AdminTicket(nm_ticket)