- updated with Thierrys patch which handles conflicting email addresses between peers

[plcapi.git] / PLC / Methods / AdmUpdateNodeNetwork.py

diff --git a/PLC/Methods/AdmUpdateNodeNetwork.py b/PLC/Methods/AdmUpdateNodeNetwork.py
index 8977cbe..a85d62a 100644 (file)
--- a/PLC/Methods/AdmUpdateNodeNetwork.py
+++ b/PLC/Methods/AdmUpdateNodeNetwork.py
@@ -1,76 +1,8 @@
+from PLC.Methods.UpdateNodeNetwork import UpdateNodeNetwork
 
-from PLC.Faults import *
-from PLC.Method import Method
-from PLC.Parameter import Parameter, Mixed
-from PLC.Nodes import Node, Nodes
-from PLC.NodeNetworks import NodeNetwork, NodeNetworks
-from PLC.Auth import PasswordAuth
-
-class AdmUpdateNodeNetwork(Method):
+class AdmUpdateNodeNetwork(UpdateNodeNetwork):
     """
-    Updates an existing node network. Any values specified in update_fields 
-    are used, otherwise defaults are used. Acceptable values for method are
-    dhcp and static. If type is static, the parameter update_fields must
-    be present and ip, gateway, network, broadcast, netmask, and dns1 must
-    all be specified. If type is dhcp, these parameters, even if
-    specified, are ignored.
-    
-    PIs and techs may only update networks associated with their own
-    nodes. Admins may update any node network.
- 
-    Returns 1 if successful, faults otherwise.
+    Deprecated. See UpdateNodeNetwork.
     """
 
-    roles = ['admin', 'pi', 'tech']
-
-    can_update = lambda (field, value): field not in \
-                 ['nodenetwork_id']
-    update_fields = dict(filter(can_update, NodeNetwork.fields.items()))
-
-    accepts = [
-        PasswordAuth(),
-       Mixed(NodeNetwork.fields['nodenetwork_id'],
-             NodeNetwork.fields['hostname']),
-       update_fields
-        ]
-
-    returns = Parameter(int, '1 if successful')
-
-    def call(self, auth, nodenetwork_id_or_hostname, update_fields):
-        # Check for invalid fields
-        if filter(lambda field: field not in self.update_fields, update_fields):
-            raise PLCInvalidArgument, "Invalid fields specified"
-
-        # XML-RPC cannot marshal None, so we need special values to
-        # represent "unset".
-        for key, value in update_fields.iteritems():
-            if value == -1 or value == "null":
-                if key in ['method', 'type', 'mac', 'ip', 'bwlimit']:
-                    raise PLCInvalidArgument, "%s cannot be unset" % key
-                update_fields[key] = None
-
-       # Get node network information
-       nodenetworks = NodeNetworks(self.api, [nodenetwork_id_or_hostname]).values()
-       if not nodenetworks:
-            raise PLCInvalidArgument, "No such node network"
-
-       nodenetwork = nodenetworks[0]
-               
-        # Authenticated function
-        assert self.caller is not None
-
-       # If we are not an admin, make sure that the caller is a
-        # member of the site where the node exists.
-        if 'admin' not in self.caller['roles']:
-            nodes = Nodes(self.api, [nodenetwork['node_id']]).values()
-            if not nodes:
-                raise PLCPermissionDenied, "Node network is not associated with a node"
-            node = nodes[0]
-            if node['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Not allowed to update node network"
-
-       # Update node network
-       nodenetwork.update(update_fields)
-        nodenetwork.flush()
-       
-        return 1
+    status = "deprecated"