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
- fix errors
[plcapi.git]
/
PLC
/
Methods
/
AddSiteAddress.py
diff --git
a/PLC/Methods/AddSiteAddress.py
b/PLC/Methods/AddSiteAddress.py
index
4524996
..
746cb0e
100644
(file)
--- a/
PLC/Methods/AddSiteAddress.py
+++ b/
PLC/Methods/AddSiteAddress.py
@@
-2,7
+2,7
@@
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Addresses import Address, Addresses
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Addresses import Address, Addresses
-from PLC.Auth import
Password
Auth
+from PLC.Auth import Auth
from PLC.Sites import Site, Sites
can_update = lambda (field, value): field in \
from PLC.Sites import Site, Sites
can_update = lambda (field, value): field in \
@@
-24,7
+24,7
@@
class AddSiteAddress(Method):
address_fields = dict(filter(can_update, Address.fields.items()))
accepts = [
address_fields = dict(filter(can_update, Address.fields.items()))
accepts = [
-
Password
Auth(),
+ Auth(),
Mixed(Site.fields['site_id'],
Site.fields['login_base']),
address_fields
Mixed(Site.fields['site_id'],
Site.fields['login_base']),
address_fields
@@
-32,15
+32,12
@@
class AddSiteAddress(Method):
returns = Parameter(int, 'New address_id (> 0) if successful')
returns = Parameter(int, 'New address_id (> 0) if successful')
- event_type = 'Add'
- object_type = 'Address'
- object_ids = []
- def call(self, auth, site_id_or_login_base, address_fields
= {}
):
+ def call(self, auth, site_id_or_login_base, address_fields):
address_fields = dict(filter(can_update, address_fields.items()))
# Get associated site details
address_fields = dict(filter(can_update, address_fields.items()))
# Get associated site details
- sites = Sites(self.api, [site_id_or_login_base])
.values()
+ sites = Sites(self.api, [site_id_or_login_base])
if not sites:
raise PLCInvalidArgument, "No such site"
site = sites[0]
if not sites:
raise PLCInvalidArgument, "No such site"
site = sites[0]
@@
-53,6
+50,9
@@
class AddSiteAddress(Method):
address.sync(commit = False)
site.add_address(address, commit = True)
address.sync(commit = False)
site.add_address(address, commit = True)
+ # Logging variables
self.object_ids = [site['site_id'], address['address_id']]
self.object_ids = [site['site_id'], address['address_id']]
+ self.message = 'Address %d assigned to Site %d' % \
+ (address['address_id'], site['site_id'])
return address['address_id']
return address['address_id']