From: root Date: Wed, 16 Mar 2011 17:00:33 +0000 (-0400) Subject: Merge commit 'origin/master' X-Git-Tag: plcapi-5.0-33~17 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72f34552c9d6f81c6f0789ff03b07f2e7c34efa0;hp=5d1186b318a037732efa0c59c9921388bafd086f;p=plcapi.git Merge commit 'origin/master' --- diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py index 2c1e141..8b81734 100644 --- a/PLC/Accessors/Accessors_standard.py +++ b/PLC/Accessors/Accessors_standard.py @@ -25,8 +25,15 @@ current_module = sys.modules[__name__] define_accessors(current_module, Slice, "Vref", "vref", "slice/config", "vserver reference image name", set_roles=["admin","pi","user","node"], expose_in_api=True) +# this contains the actual script text +# if set, it supersedes 'initscript' +define_accessors(current_module, Slice, "InitscriptBody","initscript_body", + "slice/usertools", "Slice initialization script body", + set_roles=["admin","pi","user"], expose_in_api=True) +# this may contain a *name* that refers to the GetInitScripts +# it was initially designed to share scripts among slices define_accessors(current_module, Slice, "Initscript","initscript", - "slice/usertools", "Slice initialization script", + "slice/usertools", "Slice initialization script name", set_roles=["admin","pi","user"], expose_in_api=True) # BootManager might need to set any of these 3, so 'node' needs to be in set_roles