git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
164b2d6
..
ba9b7eb
100644
(file)
--- a/
sfa/managers/component_manager_pl.py
+++ b/
sfa/managers/component_manager_pl.py
@@
-1,11
+1,12
@@
-import xmlrpclib
-
from sfa.util.faults import SliverDoesNotExist
from sfa.util.faults import SliverDoesNotExist
-from sfa.util.plxrn import PlXrn
-from sfa.trust.sfaticket import SfaTicket
from sfa.util.version import version_core
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):
+def GetVersion(api
, options
):
return version_core({'interface':'component',
'testbed':'myplc'})
return version_core({'interface':'component',
'testbed':'myplc'})
@@
-17,7
+18,7
@@
def init_server():
except:
# our keypair may be old, try refreshing
sfa_component_setup.get_node_key()
except:
# our keypair may be old, try refreshing
sfa_component_setup.get_node_key()
- sfa_component_setup.
get_c
redential(force=True)
+ sfa_component_setup.
GetC
redential(force=True)
sfa_component_setup.get_trusted_certs()
def SliverStatus(api, slice_xrn, creds):
sfa_component_setup.get_trusted_certs()
def SliverStatus(api, slice_xrn, creds):
@@
-64,7
+65,7
@@
def redeem_ticket(api, ticket_string):
raise SliverDoesNotExist(slicename)
# convert ticket to format nm is used to
raise SliverDoesNotExist(slicename)
# convert ticket to format nm is used to
- nm_ticket = xmlrpc
lib
.dumps((ticket.attributes,), methodresponse=True)
+ nm_ticket = xmlrpc
_client
.dumps((ticket.attributes,), methodresponse=True)
api.driver.nodemanager.AdminTicket(nm_ticket)
api.driver.nodemanager.AdminTicket(nm_ticket)