fixes transcoding issue for nodes - local nodes were transcoded to None

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

diff --git a/PLC/Methods/AdmAddNodeNetwork.py b/PLC/Methods/AdmAddNodeNetwork.py
index f46ebef..c309a77 100644 (file)
--- a/PLC/Methods/AdmAddNodeNetwork.py
+++ b/PLC/Methods/AdmAddNodeNetwork.py
@@ -1,74 +1,31 @@
 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
+from PLC.Auth import Auth
+from PLC.Methods.AddNodeNetwork import AddNodeNetwork
 
-class AdmAddNodeNetwork(Method):
-    """
-    Adds a new network for a node. Any values specified in
-    optional_vals are used, otherwise defaults are used. Acceptable
-    values for method are dhcp, static, proxy, tap, and
-    ipmi. Acceptable value for type is ipv4. If type is static, ip,
-    gateway, network, broadcast, netmask, and dns1 must all be
-    specified in optional_vals. If type is dhcp, these parameters,
-    even if specified, are ignored.
-
-    PIs and techs may only add networks to their own nodes. Admins may
-    add networks to any node.
+can_update = lambda (field, value): field not in ['nodenetwork_id', 'node_id', 'method', 'type']
 
-    Returns the new nodenetwork_id (> 0) if successful, faults otherwise.
+class AdmAddNodeNetwork(AddNodeNetwork):
+    """
+    Deprecated. See AddNodeNetwork.
     """
 
-    roles = ['admin', 'pi', 'tech']
+    status = "deprecated"
 
-    can_update = lambda (field, value): field in \
-                 ['ip', 'mac', 'gateway', 'network', 'broadcast', 'netmask',
-                  'dns1', 'dns2', 'hostname', 'bwlimit', 'is_primary']
-    update_fields = dict(filter(can_update, NodeNetwork.all_fields.items()))
+    nodenetwork_fields = dict(filter(can_update, NodeNetwork.fields.items()))
 
     accepts = [
-        PasswordAuth(),
-        Node.fields['node_id'],
+        Auth(),
+        NodeNetwork.fields['node_id'],
         NodeNetwork.fields['method'],
         NodeNetwork.fields['type'],
-        update_fields
+        nodenetwork_fields
         ]
 
-    returns = Parameter(int, 'New nodenetwork_id (> 0) if successful')
-
-    def call(self, auth, node_id, method, type, optional_vals = {}):
-        if filter(lambda field: field not in self.update_fields, optional_vals):
-            raise PLCInvalidArgument, "Invalid fields specified"
-
-        # Check if node exists
-        nodes = Nodes(self.api, [node_id]).values()
-        if not nodes:
-            raise PLCInvalidArgument, "No such node"
-       node = nodes[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']:
-            if node['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Not allowed to add node network for specified node"
-
-        # Add node network
-       nodenetwork = NodeNetwork(self.api, optional_vals)
-       nodenetwork['method'] = method
-        nodenetwork['type'] = type
-        nodenetwork.flush(commit = False)
-
-        # Associate node network with node
-        node.add_node_network(nodenetwork, commit = False)
-
-        if 'is_primary' in optional_vals and optional_vals['is_primary']:
-            node.set_primary_node_network(nodenetwork, commit = False)
-
-        self.api.db.commit()
-
-        return nodenetwork['nodenetwork_id']
+    def call(self, auth, node_id, method, type, nodenetwork_fields = {}):
+        nodenetwork_fields['node_id'] = node_id
+        nodenetwork_fields['method'] = method
+        nodenetwork_fields['type'] = type
+        return AddNodeNetwork.call(self, auth, nodenetwork_fields)