From 536f954e0a5e94a706f4332e530f6fab332a19e1 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Tue, 5 Mar 2024 01:31:28 -0700 Subject: [PATCH] default freenas api version to 2 Signed-off-by: Travis Glenn Hansen --- src/driver/freenas/http/api.js | 6 +++++- src/driver/freenas/http/index.js | 11 ++++++++--- src/driver/freenas/ssh.js | 6 +++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/driver/freenas/http/api.js b/src/driver/freenas/http/api.js index 5c4d335..a153cbb 100644 --- a/src/driver/freenas/http/api.js +++ b/src/driver/freenas/http/api.js @@ -119,7 +119,11 @@ class Api { return 2; } - return 1; + if (systemVersion.v1) { + return 1; + } + + return 2; } async getIsFreeNAS() { diff --git a/src/driver/freenas/http/index.js b/src/driver/freenas/http/index.js index bb2a1b8..8dd7eae 100644 --- a/src/driver/freenas/http/index.js +++ b/src/driver/freenas/http/index.js @@ -12,7 +12,7 @@ class Client { // default to v1.0 for now if (!this.options.apiVersion) { - this.options.apiVersion = 1; + this.options.apiVersion = 2; } } @@ -131,7 +131,11 @@ class Client { delete options.httpAgent; delete options.httpsAgent; - let duration = parseFloat((Math.round((_.get(response, 'duration', 0) + Number.EPSILON) * 100) / 100) / 1000).toFixed(2); + let duration = parseFloat( + Math.round((_.get(response, "duration", 0) + Number.EPSILON) * 100) / + 100 / + 1000 + ).toFixed(2); this.logger.debug("FREENAS HTTP REQUEST DETAILS: " + stringify(options)); this.logger.debug("FREENAS HTTP REQUEST DURATION: " + duration + "s"); @@ -140,7 +144,8 @@ class Client { "FREENAS HTTP RESPONSE STATUS CODE: " + _.get(response, "statusCode", "") ); this.logger.debug( - "FREENAS HTTP RESPONSE HEADERS: " + stringify(_.get(response, "headers", "")) + "FREENAS HTTP RESPONSE HEADERS: " + + stringify(_.get(response, "headers", "")) ); this.logger.debug("FREENAS HTTP RESPONSE BODY: " + stringify(body)); } diff --git a/src/driver/freenas/ssh.js b/src/driver/freenas/ssh.js index 72097c2..35018a7 100644 --- a/src/driver/freenas/ssh.js +++ b/src/driver/freenas/ssh.js @@ -2106,7 +2106,11 @@ class FreeNASSshDriver extends ControllerZfsBaseDriver { return 2; } - return 1; + if (systemVersion.v1) { + return 1; + } + + return 2; } async getIsFreeNAS() {