-import os
-import xmlrpclib
-
-from sfa.util.faults import *
-from sfa.util.plxrn import PlXrn
-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 GetVersion(api):
- return version_core({'interface':'component',
- 'testbed':'myplc'})
def init_server():
from sfa.server import sfa_component_setup
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):
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.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()
- # unfortunately the data we want is given to us as
+ # 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 = PlXrn (hrn).pl_slicename()
+ 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)
- api.nodemanager.AdminTicket(nm_ticket)
-
-
+ nm_ticket = xmlrpc_client.dumps((ticket.attributes,), methodresponse=True)
+ api.driver.nodemanager.AdminTicket(nm_ticket)