From df2071f104bc20c78f7e00b8491efcc24416c6bb Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 22 Aug 2008 21:12:46 +0000 Subject: [PATCH] fixed build & more accessors --- PLC/Accessors/Accessors_site.py | 5 +-- PLC/Accessors/Accessors_standard.py | 7 +++- PLC/Accessors/Accessors_wireless.py | 63 ++++++++++++++--------------- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/PLC/Accessors/Accessors_site.py b/PLC/Accessors/Accessors_site.py index 47dcf0e..1816117 100644 --- a/PLC/Accessors/Accessors_site.py +++ b/PLC/Accessors/Accessors_site.py @@ -14,12 +14,11 @@ from PLC.Interfaces import Interface from PLC.Slices import Slice from PLC.Ilinks import Ilink -from PLC.Accessors.Factory import define_accessors, all_roles +from PLC.Accessors.Factory import define_accessors, all_roles, tech_roles import sys current_module = sys.modules[__name__] #### example : attach vlan ids on interfaces ###define_accessors(current_module, Interface, "Vlan", "vlan","interface/general", "tag for setting VLAN id", -### get_roles=all_roles, -### set_roles=['admin', 'pi', 'tech'] ) +### get_roles=all_roles, set_roles=tech_roles) diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py index 1cfc15f..89109e8 100644 --- a/PLC/Accessors/Accessors_standard.py +++ b/PLC/Accessors/Accessors_standard.py @@ -14,9 +14,12 @@ current_module = sys.modules[__name__] # node architecture define_accessors(current_module, Node, "Arch", 'arch', 'node/config', 'architecture name', get_roles=all_roles, set_roles=tech_roles ) - +# distribution to be deployed +define_accessors(current_module, Node, "Pldistro", 'pldistro', 'node/config', 'PlanetLab distribution', + get_roles=all_roles, set_roles=['admin'] ) # node deployment (alpha, beta, ...) -define_accessors(current_module, Node, "Deployment", "deployment", "node/config", "deployment flavour", +define_accessors(current_module, Node, "Deployment", "deployment", "node/operation", + 'deployment flavour, typically "alpha", "beta", or "production"', get_roles=all_roles, set_roles=['admin']) # interface alias diff --git a/PLC/Accessors/Accessors_wireless.py b/PLC/Accessors/Accessors_wireless.py index 652e830..1b8a7ce 100644 --- a/PLC/Accessors/Accessors_wireless.py +++ b/PLC/Accessors/Accessors_wireless.py @@ -6,44 +6,41 @@ from PLC.Interfaces import Interface from PLC.Slices import Slice from PLC.Ilinks import Ilink -from PLC.Accessors.Factory import define_accessors, all_roles +from PLC.Accessors.Factory import define_accessors, all_roles, tech_roles import sys current_module = sys.modules[__name__] #### Wireless -define_accessors(current_module, Interface, "Mode", "wireless_mode", "interface/wireless", "wireless operation mode", +define_accessors(current_module, Interface, "WifiMode", "wifi_mode", "interface/wifi", "Wifi operation mode - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Essid", "essid", "interface/wifi", "Wireless essid - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Nw", "nw", "interface/wifi", "Wireless nw - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Freq", "freq", "interface/wifi", "Wireless freq - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Channel", "channel", "interface/wifi", "Wireless channel - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Sens", "sens", "interface/wifi", "Wireless sens - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Rate", "rate", "interface/wifi", "Wireless rate - see iwconfig", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Key", "key", "interface/wifi", "Wireless key - see iwconfig key", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Key1", "key1", "interface/wifi", "Wireless key1 - see iwconfig key[1]", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Key2", "key2", "interface/wifi", "Wireless key2 - see iwconfig key[2]", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Key3", "key3", "interface/wifi", "Wireless key3 - see iwconfig key[3]", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Key4", "key4", "interface/wifi", "Wireless key4 - see iwconfig key[4]", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "SecurityMode", "securitymode", "interface/wifi", "Wireless securitymode - see iwconfig enc", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Iwconfig", "iwconfig", "interface/wifi", "Wireless iwconfig - see ifup-wireless", + get_roles=all_roles, set_roles=tech_roles) +define_accessors(current_module, Interface, "Iwpriv", "iwpriv", "interface/wifi", "Wireless iwpriv - see ifup-wireless", get_roles=all_roles, set_roles=tech_roles) - -#["essid", "nw", "freq", "channel", "sens", "rate", "key", "key1", "key2", "key3", "key4", "securitymode", "iwconfig", "iwpriv" ] -# -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -#define_accessors(current_module, Interface, "Xxx", "Xxx", "interface/wireless", "XXX", -# get_roles=all_roles, set_roles=tech_roles) -- 2.43.0