git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of svn keywords once and for good
[plcapi.git]
/
PLC
/
Methods
/
AddSite.py
diff --git
a/PLC/Methods/AddSite.py
b/PLC/Methods/AddSite.py
index
10d6585
..
13ac1fd
100644
(file)
--- a/
PLC/Methods/AddSite.py
+++ b/
PLC/Methods/AddSite.py
@@
-2,11
+2,12
@@
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Sites import Site, Sites
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Sites import Site, Sites
-from PLC.Auth import
Password
Auth
+from PLC.Auth import Auth
can_update = lambda (field, value): field in \
['name', 'abbreviated_name', 'login_base',
can_update = lambda (field, value): field in \
['name', 'abbreviated_name', 'login_base',
- 'is_public', 'latitude', 'longitude', 'url']
+ 'is_public', 'latitude', 'longitude', 'url',
+ 'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id']
class AddSite(Method):
"""
class AddSite(Method):
"""
@@
-22,21
+23,19
@@
class AddSite(Method):
site_fields = dict(filter(can_update, Site.fields.items()))
accepts = [
site_fields = dict(filter(can_update, Site.fields.items()))
accepts = [
-
Password
Auth(),
+ Auth(),
site_fields
]
returns = Parameter(int, 'New site_id (> 0) if successful')
site_fields
]
returns = Parameter(int, 'New site_id (> 0) if successful')
- event_type = 'Add'
- object_type = 'Site'
- object_ids = []
-
def call(self, auth, site_fields):
site_fields = dict(filter(can_update, site_fields.items()))
site = Site(self.api, site_fields)
site.sync()
def call(self, auth, site_fields):
site_fields = dict(filter(can_update, site_fields.items()))
site = Site(self.api, site_fields)
site.sync()
- self.object_ids = [site['site_id']]
-
- return site['site_id']
+ # Logging variables
+ self.event_objects = {'Site': [site['site_id']]}
+ self.message = 'Site %d created' % site['site_id']
+
+ return site['site_id']