X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAccessors%2FAccessors_standard.py;h=8ee3e910a851c874fe9d953e947758c19e203612;hb=8b7ba869c3582b2db70f79ee920de57c1cfacf95;hp=c3daf6ee2c47eef8eb5e3554174142d66ae8a06e;hpb=8a28a076fd77728715fc980dfb174e107eea0b38;p=plcapi.git

diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py
index c3daf6e..8ee3e91 100644
--- a/PLC/Accessors/Accessors_standard.py
+++ b/PLC/Accessors/Accessors_standard.py
@@ -4,10 +4,8 @@
 from PLC.Nodes import Node
 from PLC.Interfaces import Interface
 from PLC.Slices import Slice
-from PLC.Slices import Slice
 from PLC.Sites import Site
 from PLC.Persons import Person
-#from PLC.Ilinks import Ilink
 
 from PLC.Accessors.Factory import define_accessors, admin_roles, all_roles, tech_roles
 
@@ -20,15 +18,24 @@ current_module = sys.modules[__name__]
 #
 
 # These following accessors are mostly of interest for implementing the
-# GetSliceFamily method, that takes into account the vref attribute,
-# as well as the 3 attributes below, and the PLC_FLAVOUR config category
+# The GetSliceFamily and GetNodeFlavour methods take into account various tags, 
+# esp. arch, fcdistro, pldistro, vref (for slices) and deployment (for nodes)
+# as well as the global PLC_FLAVOUR config category
+# in order to return all configuration details for a given node or slice
 
 ### 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,14 +44,21 @@ define_accessors(current_module, Slice, "Initscript","initscript",
 # needs 'admin' so the Set method is accessible
 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)
+                 set_roles=all_roles, expose_in_api=True)
 define_accessors(current_module, [Slice,Node], "Pldistro", "pldistro",
-                 "node/slice/config", "PlanetLab distribution to use for node or slivers",
-                 set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
+                 "node/slice/config/sfa", "PlanetLab distribution to use for node or slivers",
+                 set_roles=all_roles, 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",
-                 set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
+                 "node/slice/config", "Linux distribution to use for node or slivers",
+                 set_roles=all_roles, expose_in_api=True)
 
+# the virtualization model to use - this is only used by the bootmanager for 
+# picking the right options e.g. prior to reinstalling
+# see PLC_FLAVOUR_VIRT_MAP to see how the default gets computed
+define_accessors(current_module, Node, "Virt", "virt",
+                 "node/operation", 'typically "vs" or "lxc"',
+                 set_roles=all_roles, expose_in_api=True)
 # node deployment (alpha, beta, ...)
 define_accessors(current_module, Node, "Deployment", "deployment",
                  "node/operation", 'typically "alpha", "beta", or "production"',
@@ -54,8 +68,8 @@ define_accessors(current_module, Node, "Extensions", "extensions",
                  "node/config", "space-separated list of extensions to install",
                  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",
+define_accessors(current_module, [Node,Person,Slice,Site] , "Hrn", "hrn",
+                 "node/person/slice/site/sfa", "SFA human readable name",
                  set_roles=all_roles, expose_in_api=True)
 
 # test nodes perform their installation from an uncompressed bootstrapfs
@@ -94,3 +108,14 @@ define_accessors(current_module, Interface, "Alias", "alias",
 define_accessors(current_module, Interface, "Backdoor", "backdoor",
                  "interface/hidden", "For testing new settings",
                  set_roles=admin_roles)
+
+# we need to identify objects created through SFA interfaces
+define_accessors(current_module, [Person,Slice,Site] , "SfaCreated", "sfa_created",
+                 "person/slice/site/sfa", "Tag objects created through SFA interfaces",
+                 set_roles=all_roles, expose_in_api=True)
+
+# set any value to this tag to prevent a site from showing up
+# in the person registration form
+define_accessors(current_module, Site, "DisabledRegistration", "disabled_registration",
+                 "site", "Sites that have a non-void value are excluded from the drop-down list on the registration form",
+                 set_roles=admin_roles, expose_in_api=True)