Setting tag sfa-0.9-10

[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 af003cc..ae1fc13 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,26 +1,43 @@
 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 start_slice(api, slicename):
-    record = {'name': hrn_to_pl_slicename(slicename)}
-    api.nodemanger.Start(record)
+def init_server():
+    from server import sfa_component_setup
+    # get current trusted gids
+    try:
+        sfa_component_setup.get_trusted_certs()
+    except:
+        # 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()
+           
+    
+
+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):
-    record = {'name': hrn_to_pl_slicename(slicename)}
-    api.nodemanager.Stop(record)
+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):
-    record = {'name': hrn_to_pl_slicename(slicename)}
-    api.nodemanager.Destroy(record)
+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):
-    record = {'name': hrn_to_pl_slicename(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(record)
+    api.nodemanager.ReCreate(slicename)
  
 def get_slices(api):
     slicenames = api.nodemanager.GetXIDs().keys()