From 2ea95268ac45ee96f6657ad424e3268ed915fc7e Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Wed, 12 Nov 2008 21:05:31 +0000 Subject: [PATCH] Slices can call recreate on themselves regardless of instantiation. Calling create/destroy on a PLC slice results in an error. White space changes. --- api_calls.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/api_calls.py b/api_calls.py index 128a11f..6d3377b 100644 --- a/api_calls.py +++ b/api_calls.py @@ -159,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')) @@ -167,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.')], @@ -176,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.')], @@ -186,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')) @@ -195,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.')], @@ -215,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""" -- 2.43.0