X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fcomponent_manager_pl.py;h=ba9b7ebf10647d83233c82e13a089c57e1c9b9da;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=ddd3891f85100711456c93b994db005da5712315;hpb=052103bbe7f80d817694c7eaa4d9bb1a1a9e0bd5;p=sfa.git

diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py
index ddd3891f..ba9b7ebf 100644
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,57 +1,71 @@
-import os
-import xmlrpclib
-from sfa.util.faults import *
-from sfa.util.misc import *
-from sfa.util.sfaticket import SfaTicket
+from sfa.util.faults import SliverDoesNotExist
+from sfa.util.version import version_core
+from sfa.util.py23 import xmlrpc_client
+
+from sfa.trust.sfaticket import SfaTicket
+
+from sfa.planetlab.plxrn import PlXrn
+
+def GetVersion(api, options):
+    return version_core({'interface':'component',
+                         'testbed':'myplc'})
 
 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()
     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()
-           
-    
+        sfa_component_setup.GetCredential(force=True)
+        sfa_component_setup.get_trusted_certs()
 
-def start_slice(api, slicename):
-    record = api.nmdb.get(hrn_to_pl_slicename(slicename))
-    api.nodemanger.Start(record)
+def SliverStatus(api, slice_xrn, creds):
+    result = {}
+    result['geni_urn'] = slice_xrn
+    result['geni_status'] = 'unknown'
+    result['geni_resources'] = {}
+    return result
+           
+def start_slice(api, xrn, creds):
+    slicename = PlXrn(xrn, type='slice').pl_slicename()
+    api.driver.nodemanager.Start(slicename)
 
-def stop_slice(api, slicename):
-    record = api.nmdb.get(hrn_to_pl_slicename(slicename))
-    api.nodemanager.Stop(record)
+def stop_slice(api, xrn, creds):
+    slicename = PlXrn(xrn, type='slice').pl_slicename()
+    api.driver.nodemanager.Stop(slicename)
 
-def delete_slice(api, slicename):
-    record = api.nmdb.get(hrn_to_pl_slicename(slicename))
-    api.nodemanager.Destroy(record)
+def DeleteSliver(api, xrn, creds, call_id):
+    slicename = PlXrn(xrn, type='slice').pl_slicename()
+    api.driver.nodemanager.Destroy(slicename)
 
-def reset_slice(api, slicename):
-    record = api.nmdb.get(hrn_to_pl_slicename(slicename))
+def reset_slice(api, xrn):
+    slicename = PlXrn(xrn, type='slice').pl_slicename()
     if not api.sliver_exists(slicename):
         raise SliverDoesNotExist(slicename)
-    api.nodemanager.ReCreate(record)
+    api.driver.nodemanager.ReCreate(slicename)
  
-def get_slices(api):
-    slicenames = api.nodemanager.GetXIDs().keys()
-    return slicenames
-
-def roboot():
-    os.system("/sbin/reboot")        
+# xxx outdated - this should accept a credential & call_id
+def ListSlices(api):
+    # this returns a tuple, the data we want is at index 1 
+    xids = api.driver.nodemanager.GetXIDs()
+    # unfortunately the data we want is given to us as 
+    # a string but we really want it as a dict
+    # lets eval it
+    slices = eval(xids[1])
+    return slices.keys()
 
 def redeem_ticket(api, ticket_string):
     ticket = SfaTicket(string=ticket_string)
     ticket.decode()
     hrn = ticket.attributes['slivers'][0]['hrn']
-    slicename = hrn_to_pl_slicename(hrn)
+    slicename = PlXrn (hrn).pl_slicename()
     if not api.sliver_exists(slicename):
         raise SliverDoesNotExist(slicename)
 
     # convert ticket to format nm is used to
-    nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True)
-    self.api.nodemanager.AdminTicket(nm_ticket)
+    nm_ticket = xmlrpc_client.dumps((ticket.attributes,), methodresponse=True)
+    api.driver.nodemanager.AdminTicket(nm_ticket)