+# $Id$
+# $URL$
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Sites import Site, Sites
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+from PLC.SFA import SFA
+
+can_update = lambda (field, value): field in \
+ ['name', 'abbreviated_name', 'login_base',
+ 'is_public', 'latitude', 'longitude', 'url',
+ 'max_slices', 'max_slivers', 'enabled']
class AddSite(Method):
"""
Adds a new site, and creates a node group for that site. Any
- fields specified in optional_vals are used, otherwise defaults are
+ fields specified in site_fields are used, otherwise defaults are
used.
Returns the new site_id (> 0) if successful, faults otherwise.
roles = ['admin']
- can_update = lambda (field, value): field in \
- ['is_public', 'latitude', 'longitude', 'url',
- 'organization_id', 'ext_consortium_id']
- update_fields = dict(filter(can_update, Site.fields.items()))
+ site_fields = dict(filter(can_update, Site.fields.items()))
accepts = [
- PasswordAuth(),
- Site.fields['name'],
- Site.fields['abbreviated_name'],
- Site.fields['login_base'],
- update_fields
+ Auth(),
+ site_fields
]
returns = Parameter(int, 'New site_id (> 0) if successful')
- def call(self, auth, name, abbreviated_name, login_base, optional_vals = {}):
- if filter(lambda field: field not in self.update_fields, optional_vals):
- raise PLCInvalidArgument, "Invalid field specified"
-
- site = Site(self.api, optional_vals)
- site['name'] = name
- site['abbreviated_name'] = abbreviated_name
- site['login_base'] = login_base
+ def call(self, auth, site_fields):
+ site_fields = dict(filter(can_update, site_fields.items()))
+ site = Site(self.api, site_fields)
site.sync()
+
+ # Logging variables
+ self.event_objects = {'Site': [site['site_id']]}
+ self.message = 'Site %d created' % site['site_id']
+
+ sfa = SFA()
+ sfa.update_record(site, 'site', site['login_base'])
return site['site_id']