- silently remove fields that can't be updated from slice_fields, for

  backward compatibility with SliceAdd

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 76dc24d..08a4937 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -7,9 +7,12 @@ from PLC.Slices import Slice, Slices
 from PLC.Auth import PasswordAuth
 from PLC.Sites import Site, Sites
 
+can_update = lambda (field, value): field in \
+             ['instantiation', 'url', 'description', 'max_nodes']
+
 class AddSlice(Method):
     """
-    Adds a new slice. Any fields specified in optional_vals are used,
+    Adds a new slice. Any fields specified in slice_fields are used,
     otherwise defaults are used.
 
     Valid slice names are lowercase and begin with the login_base
@@ -26,8 +29,6 @@ class AddSlice(Method):
 
     roles = ['admin', 'pi']
 
-    can_update = lambda (field, value): field in \
-                 ['instantiation', 'url', 'description', 'max_nodes']
     update_fields = dict(filter(can_update, Slice.fields.items()))
 
     accepts = [
@@ -38,9 +39,8 @@ class AddSlice(Method):
 
     returns = Parameter(int, 'New slice_id (> 0) if successful')
 
-    def call(self, auth, name, optional_vals = {}):
-        if filter(lambda field: field not in self.update_fields, optional_vals):
-            raise PLCInvalidArgument, "Invalid field specified"
+    def call(self, auth, name, slice_fields = {}):
+        slice_fields = dict(filter(can_update, slice_fields.items()))
 
         # 1. Lowercase.
         # 2. Begins with login_base (only letters).

diff --git a/PLC/Methods/UpdateSlice.py b/PLC/Methods/UpdateSlice.py
index 2efe00b..8b34ed1 100644 (file)
--- a/PLC/Methods/UpdateSlice.py
+++ b/PLC/Methods/UpdateSlice.py
@@ -7,10 +7,13 @@ from PLC.Slices import Slice, Slices
 from PLC.Auth import PasswordAuth
 from PLC.Sites import Site, Sites
 
+can_update = lambda (field, value): field in \
+             ['instantiation', 'url', 'description', 'max_nodes', 'expires']
+
 class UpdateSlice(Method):
     """
     Updates the parameters of an existing slice with the values in
-    update_fields.
+    slice_fields.
 
     Users may only update slices of which they are members. PIs may
     update any of the slices at their sites, or any slices of which
@@ -25,8 +28,6 @@ class UpdateSlice(Method):
 
     roles = ['admin', 'pi', 'user']
 
-    can_update = lambda (field, value): field in \
-                 ['instantiation', 'url', 'description', 'max_nodes', 'expires']
     update_fields = dict(filter(can_update, Slice.fields.items()))
 
     accepts = [
@@ -38,9 +39,8 @@ class UpdateSlice(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, slice_id_or_name, update_fields):
-        if filter(lambda field: field not in self.update_fields, update_fields):
-            raise PLCInvalidArgument, "Invalid field specified"
+    def call(self, auth, slice_id_or_name, slice_fields):
+        slice_fields = dict(filter(can_update, slice_fields.items()))
 
         slices = Slices(self.api, [slice_id_or_name]).values()
         if not slices: