From: Tony Mack Date: Tue, 27 Feb 2007 19:08:30 +0000 (+0000) Subject: - clean up unnecessary code X-Git-Tag: PLCAPI-4.2-0~169 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=108566eb23dcf7f02dc83d3ed152b397186662ab;p=plcapi.git - clean up unnecessary code --- diff --git a/PLC/Methods/AdmAddNode.py b/PLC/Methods/AdmAddNode.py index 5ef210c2..dda5c99d 100644 --- a/PLC/Methods/AdmAddNode.py +++ b/PLC/Methods/AdmAddNode.py @@ -16,8 +16,6 @@ class AdmAddNode(AddNode): status = "deprecated" - object_type = 'Node' - node_fields = dict(filter(can_update, Node.fields.items())) accepts = [ diff --git a/PLC/Methods/AdmDeleteAllPersonKeys.py b/PLC/Methods/AdmDeleteAllPersonKeys.py index c4800baa..9f038f93 100644 --- a/PLC/Methods/AdmDeleteAllPersonKeys.py +++ b/PLC/Methods/AdmDeleteAllPersonKeys.py @@ -30,8 +30,6 @@ class AdmDeleteAllPersonKeys(Method): returns = Parameter(int, '1 if successful') - object_type = 'Person' - def call(self, auth, person_id_or_email): # Get account information persons = Persons(self.api, [person_id_or_email]) diff --git a/PLC/Methods/AdmDeleteNode.py b/PLC/Methods/AdmDeleteNode.py index d781d613..2ec9ff1a 100644 --- a/PLC/Methods/AdmDeleteNode.py +++ b/PLC/Methods/AdmDeleteNode.py @@ -7,4 +7,3 @@ class AdmDeleteNode(DeleteNode): status = "deprecated" - object_type = 'Node' diff --git a/PLC/Methods/AdmDeletePersonKeys.py b/PLC/Methods/AdmDeletePersonKeys.py index f23a4726..fd24eefc 100644 --- a/PLC/Methods/AdmDeletePersonKeys.py +++ b/PLC/Methods/AdmDeletePersonKeys.py @@ -29,8 +29,6 @@ class AdmDeletePersonKeys(Method): returns = Parameter(int, '1 if successful') - object_type = 'Person' - def call(self, auth, person_id_or_email, key_ids): # Get account information persons = Persons(self.api, [person_id_or_email]) diff --git a/PLC/Methods/AdmGetNodeGroupNodes.py b/PLC/Methods/AdmGetNodeGroupNodes.py index 857e1b5d..51c392a0 100644 --- a/PLC/Methods/AdmGetNodeGroupNodes.py +++ b/PLC/Methods/AdmGetNodeGroupNodes.py @@ -13,8 +13,6 @@ class AdmGetNodeGroupNodes(Method): status = "deprecated" - object_type = 'Node' - roles = ['admin', 'pi', 'user', 'tech'] accepts = [ diff --git a/PLC/Methods/AdmGetNodes.py b/PLC/Methods/AdmGetNodes.py index e8534ef0..74d84892 100644 --- a/PLC/Methods/AdmGetNodes.py +++ b/PLC/Methods/AdmGetNodes.py @@ -7,7 +7,5 @@ class AdmGetNodes(GetNodes): status = "deprecated" - object_type = 'Node' - def call(self, auth, node_id_or_hostname_list = None, return_fields = None): return GetNodes.call(self, auth, node_id_or_hostname_list) diff --git a/PLC/Methods/AdmGetPersonRoles.py b/PLC/Methods/AdmGetPersonRoles.py index e05f9552..024b93ce 100644 --- a/PLC/Methods/AdmGetPersonRoles.py +++ b/PLC/Methods/AdmGetPersonRoles.py @@ -33,8 +33,6 @@ class AdmGetPersonRoles(Method): returns = dict - object_type = 'Person' - def call(self, auth, person_id_or_email): # Get account information persons = Persons(self.api, [person_id_or_email]) diff --git a/PLC/Methods/AdmIsPersonInRole.py b/PLC/Methods/AdmIsPersonInRole.py index b031b64a..b32ab035 100644 --- a/PLC/Methods/AdmIsPersonInRole.py +++ b/PLC/Methods/AdmIsPersonInRole.py @@ -29,8 +29,6 @@ class AdmIsPersonInRole(Method): returns = Parameter(int, "1 if account has role, 0 otherwise") - object_type = 'Person' - def call(self, auth, person_id_or_email, role_id_or_name): # This is a totally fucked up function. I have no idea why it # exists or who calls it, but here is how it is supposed to diff --git a/PLC/Methods/AdmQueryNode.py b/PLC/Methods/AdmQueryNode.py index 4c0a0324..f41d04f6 100644 --- a/PLC/Methods/AdmQueryNode.py +++ b/PLC/Methods/AdmQueryNode.py @@ -15,8 +15,6 @@ class AdmQueryNode(Method): status = "deprecated" - object_type = 'Node' - roles = ['admin', 'pi', 'user', 'tech'] accepts = [ diff --git a/PLC/Methods/AdmRebootNode.py b/PLC/Methods/AdmRebootNode.py index 2f8d36ec..c8368e32 100644 --- a/PLC/Methods/AdmRebootNode.py +++ b/PLC/Methods/AdmRebootNode.py @@ -6,5 +6,3 @@ class AdmRebootNode(RebootNode): """ status = "deprecated" - - object_type = 'Node' diff --git a/PLC/Methods/AdmUpdateNode.py b/PLC/Methods/AdmUpdateNode.py index d4951e9e..ba4b3f1d 100644 --- a/PLC/Methods/AdmUpdateNode.py +++ b/PLC/Methods/AdmUpdateNode.py @@ -6,5 +6,3 @@ class AdmUpdateNode(UpdateNode): """ status = "deprecated" - - object_type = 'Node'