remove simplejson dependency

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

diff --git a/PLC/Methods/AddInterface.py b/PLC/Methods/AddInterface.py
index 662d7fd..ec35fc7 100644 (file)
--- a/PLC/Methods/AddInterface.py
+++ b/PLC/Methods/AddInterface.py
@@ -1,4 +1,6 @@
-# $Id$
+#
+# Thierry Parmentelat - INRIA
+#
 from PLC.Faults import *
 from PLC.Auth import Auth
 from PLC.Method import Method
@@ -12,14 +14,14 @@ from PLC.InterfaceTags import InterfaceTags
 from PLC.Methods.AddInterfaceTag import AddInterfaceTag
 from PLC.Methods.UpdateInterfaceTag import UpdateInterfaceTag
 
-can_update = ['interface_id', 'node_id']
+cannot_update = ['interface_id', 'node_id']
 
 class AddInterface(Method):
     """
 
     Adds a new network for a node. Any values specified in
     interface_fields are used, otherwise defaults are
-    used. 
+    used.
 
     If type is static, then ip, gateway, network, broadcast, netmask,
     and dns1 must all be specified in interface_fields. If type is
@@ -33,7 +35,8 @@ class AddInterface(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    accepted_fields = Row.accepted_fields(can_update, [Interface.fields,Interface.tags], exclude=True)
+    accepted_fields = Row.accepted_fields(cannot_update, Interface.fields, exclude=True)
+    accepted_fields.update(Interface.tags)
 
     accepts = [
         Auth(),
@@ -44,12 +47,13 @@ class AddInterface(Method):
 
     returns = Parameter(int, 'New interface_id (> 0) if successful')
 
-    
-    def call(self, auth, node_id_or_hostname, interface_fields):
 
-        interface_fields = Row.check_fields (interface_fields, self.accepted_fields)
+    def call(self, auth, node_id_or_hostname, interface_fields):
 
         [native,tags,rejected]=Row.split_fields(interface_fields,[Interface.fields,Interface.tags])
+
+        # type checking
+        native = Row.check_fields (native, self.accepted_fields)
         if rejected:
             raise PLCInvalidArgument, "Cannot add Interface with column(s) %r"%rejected
 
@@ -57,7 +61,7 @@ class AddInterface(Method):
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
             raise PLCInvalidArgument, "No such node %r"%node_id_or_hostname
-       node = nodes[0]
+        node = nodes[0]
 
         # Authenticated function
         assert self.caller is not None
@@ -69,17 +73,17 @@ class AddInterface(Method):
                 raise PLCPermissionDenied, "Not allowed to add an interface to the specified node"
 
         # Add interface
-       interface = Interface(self.api, native)
+        interface = Interface(self.api, native)
         interface['node_id'] = node['node_id']
-       # if this is the first interface, make it primary
-       if not node['interface_ids']:
-               interface['is_primary'] = True
+        # if this is the first interface, make it primary
+        if not node['interface_ids']:
+            interface['is_primary'] = True
         interface.sync()
-       
-       # Logging variables
-       self.object_objects = { 'Node': [node['node_id']], 
-                                'Interface' : [interface['interface_id']] }
-       self.message = "Interface %d added" % interface['interface_id']
+
+        # Logging variables
+        self.event_objects = { 'Node': [node['node_id']],
+                               'Interface' : [interface['interface_id']] }
+        self.message = "Interface %d added" % interface['interface_id']
 
         for (tagname,value) in tags.iteritems():
             # the tagtype instance is assumed to exist, just check that