deeper pass on xmlrpclib vs xmlrpc.client as well as configparser

[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 ec5e24c..ba9b7eb 100644 (file)
--- a/sfa/managers/component_manager_pl.py
+++ b/sfa/managers/component_manager_pl.py
@@ -1,12 +1,12 @@
-import os
-import xmlrpclib
+from sfa.util.faults import SliverDoesNotExist
+from sfa.util.version import version_core
+from sfa.util.py23 import xmlrpc_client
 
-from sfa.util.faults import *
-from sfa.util.plxrn import PlXrn
 from sfa.trust.sfaticket import SfaTicket
-from sfa.util.version import version_core
 
-def GetVersion(api):
+from sfa.planetlab.plxrn import PlXrn
+
+def GetVersion(api, options):
     return version_core({'interface':'component',
                          'testbed':'myplc'})
 
@@ -18,7 +18,7 @@ def init_server():
     except:
         # our keypair may be old, try refreshing
         sfa_component_setup.get_node_key()
-        sfa_component_setup.get_credential(force=True)
+        sfa_component_setup.GetCredential(force=True)
         sfa_component_setup.get_trusted_certs()
 
 def SliverStatus(api, slice_xrn, creds):
@@ -30,26 +30,26 @@ def SliverStatus(api, slice_xrn, creds):
            
 def start_slice(api, xrn, creds):
     slicename = PlXrn(xrn, type='slice').pl_slicename()
-    api.nodemanger.Start(slicename)
+    api.driver.nodemanager.Start(slicename)
 
 def stop_slice(api, xrn, creds):
     slicename = PlXrn(xrn, type='slice').pl_slicename()
-    api.nodemanager.Stop(slicename)
+    api.driver.nodemanager.Stop(slicename)
 
 def DeleteSliver(api, xrn, creds, call_id):
     slicename = PlXrn(xrn, type='slice').pl_slicename()
-    api.nodemanager.Destroy(slicename)
+    api.driver.nodemanager.Destroy(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(slicename)
+    api.driver.nodemanager.ReCreate(slicename)
  
 # 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.nodemanager.GetXIDs()
+    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
@@ -65,7 +65,7 @@ def redeem_ticket(api, ticket_string):
         raise SliverDoesNotExist(slicename)
 
     # convert ticket to format nm is used to
-    nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True)
-    api.nodemanager.AdminTicket(nm_ticket)
+    nm_ticket = xmlrpc_client.dumps((ticket.attributes,), methodresponse=True)
+    api.driver.nodemanager.AdminTicket(nm_ticket)