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
====
[plcapi.git]
/
PLC
/
Methods
/
AddConfFile.py
diff --git
a/PLC/Methods/AddConfFile.py
b/PLC/Methods/AddConfFile.py
index
eed0ae0
..
6e4fe8b
100644
(file)
--- a/
PLC/Methods/AddConfFile.py
+++ b/
PLC/Methods/AddConfFile.py
@@
-2,37
+2,36
@@
from PLC.Faults import *
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.ConfFiles import ConfFile, ConfFiles
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.ConfFiles import ConfFile, ConfFiles
-from PLC.Auth import
Password
Auth
+from PLC.Auth import Auth
can_update = lambda (field, value): field not in \
can_update = lambda (field, value): field not in \
- ['conf_file_id', '
source', 'dest', '
node_ids', 'nodegroup_ids']
+ ['conf_file_id', 'node_ids', 'nodegroup_ids']
class AddConfFile(Method):
"""
Adds a new node configuration file. Any fields specified in
conf_file_fields are used, otherwise defaults are used.
class AddConfFile(Method):
"""
Adds a new node configuration file. Any fields specified in
conf_file_fields are used, otherwise defaults are used.
- Returns
1
if successful, faults otherwise.
+ Returns
the new conf_file_id (> 0)
if successful, faults otherwise.
"""
roles = ['admin']
"""
roles = ['admin']
-
updat
e_fields = dict(filter(can_update, ConfFile.fields.items()))
+
conf_fil
e_fields = dict(filter(can_update, ConfFile.fields.items()))
accepts = [
accepts = [
- PasswordAuth(),
- ConfFile.fields['source'],
- ConfFile.fields['dest'],
- update_fields
+ Auth(),
+ conf_file_fields
]
]
- returns = Parameter(int, '
1
if successful')
+ returns = Parameter(int, '
New conf_file_id (> 0)
if successful')
- def call(self, auth, source, dest, conf_file_fields = {}):
+
+ def call(self, auth, conf_file_fields):
conf_file_fields = dict(filter(can_update, conf_file_fields.items()))
conf_file = ConfFile(self.api, conf_file_fields)
conf_file_fields = dict(filter(can_update, conf_file_fields.items()))
conf_file = ConfFile(self.api, conf_file_fields)
- conf_file['source'] = source
- conf_file['dest'] = dest
conf_file.sync()
conf_file.sync()
- return 1
+ self.event_objects = {'ConfFile': [conf_file['conf_file_id']]}
+
+ return conf_file['conf_file_id']