From: Faiyaz Ahmed Date: Tue, 25 Nov 2008 20:35:57 +0000 (+0000) Subject: Merge from trunk- Includes support for GENI Component wrapper X-Git-Tag: NodeManager-1.7-38~8 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=a66245c005f3f0543bfc6746a3c367f6fc2d4e9e Merge from trunk- Includes support for GENI Component wrapper --- diff --git a/api.py b/api.py index f8200fb..0e51ba3 100644 --- a/api.py +++ b/api.py @@ -17,6 +17,7 @@ import socket import struct import threading import xmlrpclib +import sys import accounts import database @@ -25,6 +26,13 @@ import sliver_vs import ticket import tools from api_calls import * +try: + sys.path.append("/etc/planetlab") + from plc_config import * +except: + logger.log("api: Warning: Configuration file /etc/planetlab/plc_config.py not found", 2) + PLC_SLICE_PREFIX="pl" + logger.log("api: Warning: admin slice prefix set to %s" %(PLC_SLICE_PREFIX), 2) API_SERVER_PORT = 812 UNIX_ADDR = '/tmp/sliver_mgr.api' @@ -56,17 +64,32 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): ucred = self.request.getsockopt(socket.SOL_SOCKET, SO_PEERCRED, sizeof_struct_ucred) xid = struct.unpack('3i', ucred)[2] caller_name = pwd.getpwuid(xid)[0] - if method_name not in ('ReCreate', 'Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'): + # Special case the genicw + if method_name == "AdminTicket": + if caller_name == PLC_SLICE_PREFIX+"_genicw": + try: result = method(*args) + except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) + else: + raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name) + # Anyone can call these functions + elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'): + # Authenticate the caller if not in the above fncts. target_name = args[0] + # Gather target slice's object. target_rec = database.db.get(target_name) + # only work on slivers. Sannity check. if not (target_rec and target_rec['type'].startswith('sliver.')): raise xmlrpclib.Fault(102, \ 'Invalid argument: the first argument must be a sliver name.') - if not caller_name in (target_name, target_rec['delegations']): + # only manipulate slivers who delegate you authority + if caller_name in (target_name, target_rec['delegations']): + try: result = method(target_rec, *args[1:]) + except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) + else: raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name) - try: result = method(target_rec, *args[1:]) + else: # Execute anonymous call. + try: result = method(*args) except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err) - else: result = method(*args) if result == None: result = 1 return result diff --git a/api_calls.py b/api_calls.py index cd97e13..6d3377b 100644 --- a/api_calls.py +++ b/api_calls.py @@ -121,6 +121,24 @@ def Ticket(ticket): except Exception, err: raise xmlrpclib.Fault(102, 'Ticket error: ' + str(err)) +@export_to_docbook(roles=['self'], + accepts=[Parameter(str, 'A ticket returned from GetSlivers()')], + returns=Parameter(int, '1 if successful')) +@export_to_api(1) +def AdminTicket(ticket): + """Admin interface to create slivers based on ticket returned by GetSlivers(). + """ + try: + data, = xmlrpclib.loads(ticket)[0] + name = data['slivers'][0]['name'] + if data != None: + deliver_ticket(data) + logger.log('Admin Ticket delivered for %s' % name) + Create(database.db.get(name)) + except Exception, err: + raise xmlrpclib.Fault(102, 'Ticket error: ' + str(err)) + + @export_to_docbook(roles=['self'], accepts=[], returns={'sliver_name' : Parameter(int, 'the associated xid')}) @@ -141,6 +159,7 @@ def GetSSHKeys(): keydict[rec['name']] = rec['keys'] return keydict + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], returns=Parameter(int, '1 if successful')) @@ -149,6 +168,8 @@ def Create(sliver_name): """Create a non-PLC-instantiated sliver""" rec = sliver_name if rec['instantiation'] == 'delegated': accounts.get(rec['name']).ensure_created(rec) + else: raise Exception, "Only PLC can create non delegated slivers." + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], @@ -158,6 +179,8 @@ def Destroy(sliver_name): """Destroy a non-PLC-instantiated sliver""" rec = sliver_name if rec['instantiation'] == 'delegated': accounts.get(rec['name']).ensure_destroyed() + else: raise Exception, "Only PLC can destroy non delegated slivers." + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], @@ -168,6 +191,7 @@ def Start(sliver_name): rec = sliver_name accounts.get(rec['name']).start(rec) + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], returns=Parameter(int, '1 if successful')) @@ -177,16 +201,18 @@ def Stop(sliver_name): rec = sliver_name accounts.get(rec['name']).stop() + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], returns=Parameter(int, '1 if successful')) - @export_to_api(1) def ReCreate(sliver_name): """Stop, Destroy, Create, Start sliver in order to reinstall it.""" - Stop(sliver_name) - Destroy(sliver_name) - Create(sliver_name) + rec = sliver_name + accounts.get(rec['name']).stop() + accounts.get(rec['name']).ensure_created(rec) + accounts.get(rec['name']).start(rec) + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], @@ -197,24 +223,23 @@ def GetEffectiveRSpec(sliver_name): rec = sliver_name return rec.get('_rspec', {}).copy() + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], - returns={ - "resource name" : Parameter(int, "amount") - } - ) + returns={"resource name" : Parameter(int, "amount")}) @export_to_api(1) def GetRSpec(sliver_name): """Return the RSpec allocated to the specified sliver, excluding loans""" rec = sliver_name return rec.get('rspec', {}).copy() + @export_to_docbook(roles=['nm-controller', 'self'], accepts=[Parameter(str, 'A sliver/slice name.')], returns=[Mixed(Parameter(str, 'recipient slice name'), Parameter(str, 'resource name'), - Parameter(int, 'resource amount'))] - ) + Parameter(int, 'resource amount'))]) + @export_to_api(1) def GetLoans(sliver_name): """Return the list of loans made by the specified sliver"""