- clean up unnecessary code

diff --git a/PLC/Methods/AdmAddNode.py b/PLC/Methods/AdmAddNode.py
index 5ef210c..dda5c99 100644 (file)
--- a/PLC/Methods/AdmAddNode.py
+++ b/PLC/Methods/AdmAddNode.py
@@ -16,8 +16,6 @@ class AdmAddNode(AddNode):
 
     status = "deprecated"
 
 
     status = "deprecated"
 

-    object_type = 'Node'
-

     node_fields = dict(filter(can_update, Node.fields.items()))
 
     accepts = [
     node_fields = dict(filter(can_update, Node.fields.items()))
 
     accepts = [

diff --git a/PLC/Methods/AdmDeleteAllPersonKeys.py b/PLC/Methods/AdmDeleteAllPersonKeys.py
index c4800ba..9f038f9 100644 (file)
--- a/PLC/Methods/AdmDeleteAllPersonKeys.py
+++ b/PLC/Methods/AdmDeleteAllPersonKeys.py
@@ -30,8 +30,6 @@ class AdmDeleteAllPersonKeys(Method):
 
     returns = Parameter(int, '1 if successful')
 
 
     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])
     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 d781d61..2ec9ff1 100644 (file)
--- a/PLC/Methods/AdmDeleteNode.py
+++ b/PLC/Methods/AdmDeleteNode.py
@@ -7,4 +7,3 @@ class AdmDeleteNode(DeleteNode):
 
     status = "deprecated"
 
 
     status = "deprecated"
 

-    object_type = 'Node'

diff --git a/PLC/Methods/AdmDeletePersonKeys.py b/PLC/Methods/AdmDeletePersonKeys.py
index f23a472..fd24eef 100644 (file)
--- a/PLC/Methods/AdmDeletePersonKeys.py
+++ b/PLC/Methods/AdmDeletePersonKeys.py
@@ -29,8 +29,6 @@ class AdmDeletePersonKeys(Method):
 
     returns = Parameter(int, '1 if successful')
 
 
     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])
     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 857e1b5..51c392a 100644 (file)
--- a/PLC/Methods/AdmGetNodeGroupNodes.py
+++ b/PLC/Methods/AdmGetNodeGroupNodes.py
@@ -13,8 +13,6 @@ class AdmGetNodeGroupNodes(Method):
 
     status = "deprecated"
 
 
     status = "deprecated"
 

-    object_type = 'Node'
-

     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [

diff --git a/PLC/Methods/AdmGetNodes.py b/PLC/Methods/AdmGetNodes.py
index e8534ef..74d8489 100644 (file)
--- a/PLC/Methods/AdmGetNodes.py
+++ b/PLC/Methods/AdmGetNodes.py
@@ -7,7 +7,5 @@ class AdmGetNodes(GetNodes):
 
     status = "deprecated"
 
 
     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)
     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 e05f955..024b93c 100644 (file)
--- a/PLC/Methods/AdmGetPersonRoles.py
+++ b/PLC/Methods/AdmGetPersonRoles.py
@@ -33,8 +33,6 @@ class AdmGetPersonRoles(Method):
 
     returns = dict
 
 
     returns = dict
 

-    object_type = 'Person'
-

     def call(self, auth, person_id_or_email):
         # Get account information
         persons = Persons(self.api, [person_id_or_email])
     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 b031b64..b32ab03 100644 (file)
--- 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")
 
 
     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
     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 4c0a032..f41d04f 100644 (file)
--- a/PLC/Methods/AdmQueryNode.py
+++ b/PLC/Methods/AdmQueryNode.py
@@ -15,8 +15,6 @@ class AdmQueryNode(Method):
 
     status = "deprecated"
 
 
     status = "deprecated"
 

-    object_type = 'Node'
-

     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [

diff --git a/PLC/Methods/AdmRebootNode.py b/PLC/Methods/AdmRebootNode.py
index 2f8d36e..c8368e3 100644 (file)
--- a/PLC/Methods/AdmRebootNode.py
+++ b/PLC/Methods/AdmRebootNode.py
@@ -6,5 +6,3 @@ class AdmRebootNode(RebootNode):
     """
 
     status = "deprecated"
     """
 
     status = "deprecated"

-
-    object_type = 'Node'

diff --git a/PLC/Methods/AdmUpdateNode.py b/PLC/Methods/AdmUpdateNode.py
index d4951e9..ba4b3f1 100644 (file)
--- a/PLC/Methods/AdmUpdateNode.py
+++ b/PLC/Methods/AdmUpdateNode.py
@@ -6,5 +6,3 @@ class AdmUpdateNode(UpdateNode):
     """
 
     status = "deprecated"
     """
 
     status = "deprecated"

-
-    object_type = 'Node'