From: Tony Mack Date: Fri, 19 Jan 2007 20:36:33 +0000 (+0000) Subject: - added logging variable 'object_type' X-Git-Tag: pycurl-7_13_1~61 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e4c0c59e6bf7d7112f019272e04e6595639bcb90;p=plcapi.git - added logging variable 'object_type' --- diff --git a/PLC/Methods/AddPersonToSlice.py b/PLC/Methods/AddPersonToSlice.py index 943393b9..e9c00161 100644 --- a/PLC/Methods/AddPersonToSlice.py +++ b/PLC/Methods/AddPersonToSlice.py @@ -25,6 +25,8 @@ class AddPersonToSlice(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, person_id_or_email, slice_id_or_name): # Get account information persons = Persons(self.api, [person_id_or_email]) diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py index 9cce2b0f..683931c0 100644 --- a/PLC/Methods/AddSlice.py +++ b/PLC/Methods/AddSlice.py @@ -38,6 +38,8 @@ class AddSlice(Method): returns = Parameter(int, 'New slice_id (> 0) if successful') + object_type = 'Slice' + def call(self, auth, slice_fields): slice_fields = dict(filter(can_update, slice_fields.items())) diff --git a/PLC/Methods/AddSliceAttribute.py b/PLC/Methods/AddSliceAttribute.py index 326370a8..2a955050 100644 --- a/PLC/Methods/AddSliceAttribute.py +++ b/PLC/Methods/AddSliceAttribute.py @@ -37,6 +37,8 @@ class AddSliceAttribute(Method): returns = Parameter(int, 'New slice_attribute_id (> 0) if successful') + object_type = 'Slice' + def call(self, auth, slice_id_or_name, attribute_type_id_or_name, value, node_id_or_hostname = None): slices = Slices(self.api, [slice_id_or_name]) diff --git a/PLC/Methods/DeletePersonFromSlice.py b/PLC/Methods/DeletePersonFromSlice.py index 5a46426c..9bab6abd 100644 --- a/PLC/Methods/DeletePersonFromSlice.py +++ b/PLC/Methods/DeletePersonFromSlice.py @@ -25,6 +25,8 @@ class DeletePersonFromSlice(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, person_id_or_email, slice_id_or_name): # Get account information diff --git a/PLC/Methods/DeleteSlice.py b/PLC/Methods/DeleteSlice.py index bfb6cd60..7011de80 100644 --- a/PLC/Methods/DeleteSlice.py +++ b/PLC/Methods/DeleteSlice.py @@ -25,6 +25,8 @@ class DeleteSlice(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_id_or_name): slices = Slices(self.api, [slice_id_or_name]) diff --git a/PLC/Methods/DeleteSliceAttribute.py b/PLC/Methods/DeleteSliceAttribute.py index 11ad0180..ea3ecb20 100644 --- a/PLC/Methods/DeleteSliceAttribute.py +++ b/PLC/Methods/DeleteSliceAttribute.py @@ -28,6 +28,8 @@ class DeleteSliceAttribute(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_attribute_id): slice_attributes = SliceAttributes(self.api, [slice_attribute_id]) diff --git a/PLC/Methods/SliceCreate.py b/PLC/Methods/SliceCreate.py index 27b4611e..668f46d7 100644 --- a/PLC/Methods/SliceCreate.py +++ b/PLC/Methods/SliceCreate.py @@ -17,7 +17,11 @@ class SliceCreate(AddSlice): Slice.fields['name'], AddSlice.accepts[1] ] + + returns = Parameter(int, 'New slice_id (> 0) if successful') + object_type = 'Slice' + def call(self, auth, name, slice_fields = {}): slice_fields['name'] = name return AddSlice.call(self, auth, slice_fields) diff --git a/PLC/Methods/SliceDelete.py b/PLC/Methods/SliceDelete.py index d4ec61d1..75eef3f5 100644 --- a/PLC/Methods/SliceDelete.py +++ b/PLC/Methods/SliceDelete.py @@ -24,6 +24,8 @@ class SliceDelete(DeleteSlice): returns = Parameter(int, 'Returns 1 if successful, a fault otherwise.') + object_type = 'Slice' + def call(self, auth, slice_name): diff --git a/PLC/Methods/SliceNodesAdd.py b/PLC/Methods/SliceNodesAdd.py index e99ee52f..547bd5c7 100644 --- a/PLC/Methods/SliceNodesAdd.py +++ b/PLC/Methods/SliceNodesAdd.py @@ -24,7 +24,9 @@ class SliceNodesAdd(AddSliceToNodes): returns = Parameter(int, '1 if successful') - object_type = 'Node' + object_type = 'Slice' + + def call(self, auth, slice_name, nodes_list): diff --git a/PLC/Methods/SliceNodesDel.py b/PLC/Methods/SliceNodesDel.py index 8f2a395f..513c9437 100644 --- a/PLC/Methods/SliceNodesDel.py +++ b/PLC/Methods/SliceNodesDel.py @@ -24,7 +24,9 @@ class SliceNodesDel(DeleteSliceFromNodes): returns = Parameter(int, '1 if successful') - object_type = 'Node' + object_type = 'Slice' + + def call(self, auth, slice_name, nodes_list): diff --git a/PLC/Methods/SliceRenew.py b/PLC/Methods/SliceRenew.py index 4ac6f895..44f0e520 100644 --- a/PLC/Methods/SliceRenew.py +++ b/PLC/Methods/SliceRenew.py @@ -25,6 +25,8 @@ class SliceRenew(UpdateSlice): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_name, slice_expires): slice_fields = {} diff --git a/PLC/Methods/SliceUpdate.py b/PLC/Methods/SliceUpdate.py index 9e82d3ad..2f53ad02 100644 --- a/PLC/Methods/SliceUpdate.py +++ b/PLC/Methods/SliceUpdate.py @@ -26,6 +26,8 @@ class SliceUpdate(UpdateSlice): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_name, url, description): slice_fields = {} diff --git a/PLC/Methods/SliceUserAdd.py b/PLC/Methods/SliceUserAdd.py index 560a66a5..cee64c12 100644 --- a/PLC/Methods/SliceUserAdd.py +++ b/PLC/Methods/SliceUserAdd.py @@ -24,6 +24,8 @@ class SliceUserAdd(AddPersonToSlice): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_name, user_list): for user in user_list: diff --git a/PLC/Methods/SliceUserDel.py b/PLC/Methods/SliceUserDel.py index 1cdafa80..e350a5fc 100644 --- a/PLC/Methods/SliceUserDel.py +++ b/PLC/Methods/SliceUserDel.py @@ -26,6 +26,8 @@ class SliceUserDel(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_name, user_list): for user in user_list: DeletePersonFromSlice.call(self, auth, user, slice_name) diff --git a/PLC/Methods/UpdateSlice.py b/PLC/Methods/UpdateSlice.py index 391f2215..357a10f6 100644 --- a/PLC/Methods/UpdateSlice.py +++ b/PLC/Methods/UpdateSlice.py @@ -39,6 +39,8 @@ class UpdateSlice(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_id_or_name, slice_fields): slice_fields = dict(filter(can_update, slice_fields.items())) diff --git a/PLC/Methods/UpdateSliceAttribute.py b/PLC/Methods/UpdateSliceAttribute.py index 14e77543..5b7d48fb 100644 --- a/PLC/Methods/UpdateSliceAttribute.py +++ b/PLC/Methods/UpdateSliceAttribute.py @@ -27,6 +27,8 @@ class UpdateSliceAttribute(Method): returns = Parameter(int, '1 if successful') + object_type = 'Slice' + def call(self, auth, slice_attribute_id, value): slice_attributes = SliceAttributes(self.api, [slice_attribute_id]) if not slice_attributes: