all accessor-defined tag-types should have 'admin' role,

[plcapi.git] / PLC / Accessors / Accessors_standard.py

diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py
index 680dfd5..c3daf6e 100644 (file)
--- a/PLC/Accessors/Accessors_standard.py
+++ b/PLC/Accessors/Accessors_standard.py
@@ -31,28 +31,20 @@ define_accessors(current_module, Slice, "Initscript","initscript",
                  "slice/usertools", "Slice initialization script",
                  set_roles=["admin","pi","user"], expose_in_api=True)
 
-# xxx the accessor factory should enforce the category, descriptions and roles provided here.
 # BootManager might need to set any of these 3, so 'node' needs to be in set_roles
-define_accessors(current_module, Slice, "Arch", "arch",
+# needs 'pi' and 'tech' for managing their node
+# needs 'user' for managing their slices
+# 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=["pi","user","tech","node"], expose_in_api=True)
-define_accessors(current_module, Slice, "Pldistro", "pldistro",
+                 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",
-                 set_roles=["pi","user","tech","node"], expose_in_api=True)
-define_accessors(current_module, Slice, "Fcdistro", "fcdistro",
+                 set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
+define_accessors(current_module, [Slice,Node], "Fcdistro", "fcdistro",
                  "node/slice/config", "Fedora or CentOS distribution to use for node or slivers",
-                 set_roles=["pi","user","tech","node"], expose_in_api=True)
+                 set_roles=["admin","pi","user","tech","node"], expose_in_api=True)
 
-# Ditto for the GetNodeFlavour method
-define_accessors(current_module, Node, "Arch", "arch",
-                 "node/slice/config", "node arch or slivers arch",
-                 set_roles=["pi","user","tech"], expose_in_api=True)
-define_accessors(current_module, Node, "Pldistro", "pldistro",
-                 "node/slice/config", "PlanetLab distribution to use for node or slivers",
-                 set_roles=["pi","user","tech"], expose_in_api=True)
-define_accessors(current_module, Node, "Fcdistro", "fcdistro",
-                 "node/slice/config", "Fedora or CentOS distribution to use for node or slivers",
-                 set_roles=["pi","user","tech"], expose_in_api=True)
 # node deployment (alpha, beta, ...)
 define_accessors(current_module, Node, "Deployment", "deployment",
                  "node/operation", 'typically "alpha", "beta", or "production"',