From 5dfb299e3760290fda079e788a6eeec1f3737fd9 Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Wed, 28 Aug 2019 16:49:38 +0200 Subject: [PATCH] chore(xo-server-sdn-controller): use `?.` to simplify tests (#4459) --- packages/xo-server-sdn-controller/src/index.js | 5 ++--- packages/xo-server-sdn-controller/src/ovsdb-client.js | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/xo-server-sdn-controller/src/index.js b/packages/xo-server-sdn-controller/src/index.js index d991ea89c..40cf5b826 100644 --- a/packages/xo-server-sdn-controller/src/index.js +++ b/packages/xo-server-sdn-controller/src/index.js @@ -714,8 +714,7 @@ class SDNController extends EventEmitter { _setControllerNeeded(xapi) { const controller = find(xapi.objects.all, { $type: 'SDN_controller' }) return !( - controller !== undefined && - controller.protocol === PROTOCOL && + controller?.protocol === PROTOCOL && controller.address === '' && controller.port === 0 ) @@ -818,7 +817,7 @@ class SDNController extends EventEmitter { for (const host of hosts) { const pif = find(host.$PIFs, { network: network.$ref }) - if (pif !== undefined && pif.currently_attached && host.$metrics.live) { + if (pif?.currently_attached && host.$metrics.live) { newCenter = host } } diff --git a/packages/xo-server-sdn-controller/src/ovsdb-client.js b/packages/xo-server-sdn-controller/src/ovsdb-client.js index 37ec27e7d..3b3a16e8c 100644 --- a/packages/xo-server-sdn-controller/src/ovsdb-client.js +++ b/packages/xo-server-sdn-controller/src/ovsdb-client.js @@ -146,7 +146,7 @@ export class OvsdbClient { let opResult do { opResult = jsonObjects[0].result[i] - if (opResult !== undefined && opResult.error !== undefined) { + if (opResult?.error !== undefined) { error = opResult.error details = opResult.details }