From 8e8b1c009aa79fd2cdf6f2adb0f374cf7b7e53b2 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Fri, 22 Feb 2019 19:46:49 +0100 Subject: [PATCH] feat(xen-api#unsetField): replaced by `setField(_, null)` --- packages/xen-api/src/index.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/xen-api/src/index.js b/packages/xen-api/src/index.js index 022c8f521..a9fccbd90 100644 --- a/packages/xen-api/src/index.js +++ b/packages/xen-api/src/index.js @@ -737,15 +737,16 @@ export class Xapi extends EventEmitter { getKeys(entries).map(entry => { const value = entries[entry] if (value !== undefined) { - return value === null - ? this.unsetFieldEntry(type, ref, field, entry) - : this.setFieldEntry(type, ref, field, entry, value) + return this.setFieldEntry(type, ref, field, entry, value) } }) ).then(noop) } async setFieldEntry(type, ref, field, entry, value) { + if (value === null) { + return this.call(`${type}.remove_from_${field}`, ref, entry) + } while (true) { try { await this.call(`${type}.add_to_${field}`, ref, entry, value) @@ -755,14 +756,10 @@ export class Xapi extends EventEmitter { throw error } } - await this.unsetFieldEntry(type, ref, field, entry) + await this.call(`${type}.remove_from_${field}`, ref, entry) } } - unsetFieldEntry(type, ref, field, entry) { - return this.call(`${type}.remove_from_${field}`, ref, entry) - } - watchTask(ref) { const watchers = this._taskWatchers if (watchers === undefined) {