X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FAccessors%2FAccessors_standard.py;h=50690f45be87d5c82584062480a356f91cfca595;hb=b48e3b66786c1c1e97e4dbe5bb1659e3836bfd5f;hp=c4cc2bc30e0b2788a612dadd4e265d2c9e29a797;hpb=79804af429d6b019b8427372213f733684c6981a;p=plcapi.git

diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py
index c4cc2bc..50690f4 100644
--- a/PLC/Accessors/Accessors_standard.py
+++ b/PLC/Accessors/Accessors_standard.py
@@ -24,9 +24,16 @@ current_module = sys.modules[__name__]
 ### slice vref
 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, "InitscriptCode","initscript_code",
+                 "slice/usertools", "Slice initialization script code",
                  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
@@ -37,10 +44,11 @@ define_accessors(current_module, [Slice,Node], "Arch", "arch",
                  "node/slice/config", "node arch or slivers arch",
                  set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
 define_accessors(current_module, [Slice,Node], "Pldistro", "pldistro",
-                 "node/slice/config", "PlanetLab distribution to use for node or slivers",
+                 "node/slice/config/sfa", "PlanetLab distribution to use for node or slivers",
                  set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
+# fc of course historically was for fedora core
 define_accessors(current_module, [Slice,Node], "Fcdistro", "fcdistro",
-                 "node/slice/config", "Fedora or CentOS distribution to use for node or slivers",
+                 "node/slice/config", "Linux distribution to use for node or slivers",
                  set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
 
 # node deployment (alpha, beta, ...)
@@ -53,7 +61,11 @@ define_accessors(current_module, Node, "Extensions", "extensions",
                  set_roles=["admin"],expose_in_api=True)
 # access HRN - this is the ideal definition of roles, even if AddNodeTag cannot handle this
 define_accessors(current_module, Node, "Hrn","hrn",
-                 "node/sfa", "SFA human readable name",
+                 "node/person/sfa", "SFA human readable name",
+                 set_roles=all_roles, expose_in_api=True)
+# same for persons
+define_accessors(current_module, Person, "Hrn","hrn",
+                 "node/person/sfa", "SFA human readable name",
                  set_roles=all_roles, expose_in_api=True)
 
 # test nodes perform their installation from an uncompressed bootstrapfs