NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API: fix various permissions.

Browse Source
This commit is contained in:
Julien Fontanet 2016-02-19 16:07:58 +01:00
parent 3ea2b3cc00
commit 76c8d4af25
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api.js
View File

@ -110,7 +110,7 @@ function resolveParams (method, params) {
// Register this new value. // Register this new value.
params[key] = object params[key] = object
if (permissions != null) { if (!permissions) {
permissions.push([ object.id, permission ]) permissions.push([ object.id, permission ])
} }
}) })

6
src/api/docker.js
View File

@ -1,8 +1,6 @@
export async function register ({vm}) { export async function register ({vm}) {
await this.getXapi(vm).registerDockerContainer(vm._xapiId) await this.getXapi(vm).registerDockerContainer(vm._xapiId)
} }
register.permission = 'admin'
register.description = 'Register the VM for Docker management' register.description = 'Register the VM for Docker management'
register.params = { register.params = {
@ -18,8 +16,6 @@ register.resolve = {
export async function deregister ({vm}) { export async function deregister ({vm}) {
await this.getXapi(vm).unregisterDockerContainer(vm._xapiId) await this.getXapi(vm).unregisterDockerContainer(vm._xapiId)
} }
deregister.permission = 'admin'
deregister.description = 'Deregister the VM for Docker management' deregister.description = 'Deregister the VM for Docker management'
deregister.params = { deregister.params = {
@ -53,8 +49,6 @@ export async function unpause ({vm, container}) {
} }
for (let fn of [start, stop, restart, pause, unpause]) { for (let fn of [start, stop, restart, pause, unpause]) {
fn.permission = 'admin'
fn.params = { fn.params = {
vm: { type: 'string' }, vm: { type: 'string' },
container: { type: 'string' } container: { type: 'string' }

2
src/api/vm.coffee
View File

@ -1143,7 +1143,7 @@ createCloudInitConfigDrive.resolve = {
# Not compatible with resource sets. # Not compatible with resource sets.
# FIXME: find a workaround. # FIXME: find a workaround.
sr: [ 'sr', 'SR', null ] # 'operate' ] sr: [ 'sr', 'SR', '' ] # 'operate' ]
} }
exports.createCloudInitConfigDrive = createCloudInitConfigDrive exports.createCloudInitConfigDrive = createCloudInitConfigDrive