Wsman firmware update task refine #538

nortonluo · 2017-10-31T11:08:33Z

Background

The original WSMAN based job is out of date after SMI service updated its input parameters. And also it is lack of unit test and option schema check. Currently we refine all WSMAN implementation and aimed to integrate SMI service with RackHD and replace the RACADM. We refined the WSMAN work job arch. Now it use the new common WSMAN base job as base classs and WSMAN tool as util to send out request to SMI service.

Detail

Refined the job arch to use WSMAN base job as base.
Refined payload send to SMI service.
Refined input parameter to task.
Add task schema for task parameter.
Add unit test for WSMAN control job.
Add unit test for task schema.

Test Result

Tested pass on Dell R730 server.
wsman-control.js Unit test coverage: 97%

Review: @yaolingling @anhou @lanchongyizu @AlaricChan

Refine emc diag fimrware update file upload method Change HTTP code Fix unit test bug Fix unit test coverage Fix indent Fix conflict

houndci-bot · 2017-10-31T11:08:43Z

spec/lib/jobs/wsman-control-spec.js

+                {status: "Success"},
+                {status: "Success"}
+            ];
+            job.firmwareUpdateCallback(callBackData)


Missing semicolon.

houndci-bot · 2017-10-31T11:08:43Z

spec/lib/jobs/wsman-control-spec.js

+                "body": {
+                    "response": "Request Submitted!"
+                }
+            }


Missing semicolon.

houndci-bot · 2017-10-31T11:08:43Z

spec/lib/jobs/wsman-control-spec.js

+        shareName: "emc",
+        sharePassworrd: "usr",
+        shareType: 2,
+    }


Missing semicolon.

houndci-bot · 2017-10-31T11:08:43Z

lib/jobs/wsman-control.js

-        if (!data){
-            throw new errors.NotFoundError('Dell FirmwareUpdate web service for '+ name +' is not defined in wsmanConfig.json.'); //jshint ignore:line
-        }
+        };


Unnecessary semicolon.

houndci-bot · 2017-10-31T11:08:43Z

lib/jobs/wsman-control.js

        if (isSuccessful){
            self._done();
        }
        else {
+            console.log("gg")


Missing semicolon.

houndci-bot · 2017-10-31T11:08:43Z

lib/jobs/wsman-control.js

                    }
                }
            });
-        }
-
+        };


Unnecessary semicolon.

houndci-bot · 2017-10-31T11:08:43Z

lib/jobs/wsman-control.js

        };
        logger.info('Before calling the endpoint :');
-        return self.clientRequest(apiHost,path,method,request);
+        return self.clientRequest(apiHost, path, method, request)


Missing semicolon.

houndci-bot · 2017-10-31T11:08:43Z

lib/jobs/wsman-control.js

-
+        if (options.shareType === "cifs" || options.shareType === "CIFS") {
+            this.shareConfig.shareType = 2;
+        };


Unnecessary semicolon.

houndci-bot · 2017-10-31T11:08:44Z

spec/lib/jobs/wsman-control-spec.js

+                {status: "Success"},
+                {status: "Success"}
+            ];
+            job.firmwareUpdateCallback(callBackData)


Missing semicolon.

houndci-bot · 2017-10-31T11:08:44Z

spec/lib/jobs/wsman-control-spec.js

+                "body": {
+                    "response": "Request Submitted!"
+                }
+            }


Missing semicolon.

houndci-bot · 2017-10-31T11:08:44Z

spec/lib/jobs/wsman-control-spec.js

+        shareName: "emc",
+        sharePassworrd: "usr",
+        shareType: 2,
+    }


Missing semicolon.

houndci-bot · 2017-10-31T11:08:44Z

lib/jobs/wsman-control.js

-        if (!data){
-            throw new errors.NotFoundError('Dell FirmwareUpdate web service for '+ name +' is not defined in wsmanConfig.json.'); //jshint ignore:line
-        }
+        };


Unnecessary semicolon.

houndci-bot · 2017-10-31T11:08:44Z

lib/jobs/wsman-control.js

        if (isSuccessful){
            self._done();
        }
        else {
+            console.log("gg")


Missing semicolon.

houndci-bot · 2017-10-31T11:08:44Z

lib/jobs/wsman-control.js

                    }
                }
            });
-        }
-
+        };


Unnecessary semicolon.

houndci-bot · 2017-10-31T11:08:44Z

lib/jobs/wsman-control.js

        };
        logger.info('Before calling the endpoint :');
-        return self.clientRequest(apiHost,path,method,request);
+        return self.clientRequest(apiHost, path, method, request)


Missing semicolon.

houndci-bot · 2017-10-31T11:08:44Z

lib/jobs/wsman-control.js

-
+        if (options.shareType === "cifs" || options.shareType === "CIFS") {
+            this.shareConfig.shareType = 2;
+        };


Unnecessary semicolon.

nortonluo · 2017-11-01T03:46:05Z

spec/lib/jobs/wsman-control-spec.js

+    });
+
+    beforeEach(function(){
+        job = new WsmanJob({}, {"nodeId": nodeId}, uuid.v4());


New job in before

nortonluo · 2017-11-01T03:50:01Z

spec/lib/jobs/wsman-control-spec.js

+
+        it('Should get error: data is Failed', function(){
+            var callBackData = [{status: "Failed"}];
+            expect(function(){


Add fail+success in date

lanchongyizu · 2017-11-01T06:38:51Z

Please add run-test label to trigger Concourse CI.

houndci-bot · 2017-11-02T15:11:27Z

spec/lib/jobs/dell-wsman-firmware-update-job-spec.js

+        },
+        node: nodeId
+    };
+    var shareConfig = {


'shareConfig' is defined but never used.

houndci-bot · 2017-11-02T15:11:27Z

lib/jobs/dell-wsman-firmware-update-job.js

+        var failureFound = false;
+        if (data !== null && data.length > 0) {
+            data.forEach(function (item) {
+                if ( !(item.status === 'undefined' || item.status === null || item.status === ""|| failureFound == true)){


Expected '===' and instead saw '=='.

houndci-bot · 2017-11-02T15:11:27Z

lib/jobs/dell-wsman-firmware-update-job.js

+            password :"",
+        };
+        this.rebootNeeded = options.rebootNeeded || "YES";
+        this.dellConfigs = undefined;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:27Z

lib/jobs/dell-wsman-firmware-update-job.js

+            user :"",
+            password :"",
+        };
+        this.rebootNeeded = options.rebootNeeded || "YES";


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:27Z

lib/jobs/dell-wsman-firmware-update-job.js

+        if (options.shareFolderType === "cifs" || options.shareFolderType === "CIFS") {
+            this.shareConfig.shareType = 2;
+        }
+        this.targetConfig = {


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:27Z

lib/jobs/dell-wsman-firmware-update-job.js

+            this.shareConfig.shareType = 0;
+        }
+        if (options.shareFolderType === "cifs" || options.shareFolderType === "CIFS") {
+            this.shareConfig.shareType = 2;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:28Z

lib/jobs/dell-wsman-firmware-update-job.js

+            shareType: 2
+        };
+        if (options.shareFolderType === "nfs" || options.shareFolderType === "NFS") {
+            this.shareConfig.shareType = 0;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:28Z

lib/jobs/dell-wsman-firmware-update-job.js

+        wsmanFirmwareUpdateJob.super_.call(this, logger, options, context, taskId);
+
+        this.nodeId = this.context.target;
+        this.shareConfig =  {


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:28Z

lib/jobs/dell-wsman-firmware-update-job.js

+    function wsmanFirmwareUpdateJob(options, context, taskId) {
+        wsmanFirmwareUpdateJob.super_.call(this, logger, options, context, taskId);
+
+        this.nodeId = this.context.target;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-02T15:11:28Z

lib/jobs/dell-wsman-firmware-update-job.js

+     * @constructor
+     */
+    function wsmanFirmwareUpdateJob(options, context, taskId) {
+        wsmanFirmwareUpdateJob.super_.call(this, logger, options, context, taskId);


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

nortonluo · 2017-11-03T02:41:04Z

spec/lib/jobs/dell-wsman-firmware-update-job-spec.js

+
+    describe('handle cases for _handleAsyncRequest function', function(){
+        beforeEach(function() {
+            job.wsman = new WsmanTool();


WSMANTOOL init parameter

nortonluo · 2017-11-03T02:42:23Z

lib/jobs/dell-wsman-firmware-update-job.js

+        var self = this;
+
+        self.dellConfigs = configuration.get('dell');
+        if (!self.dellConfigs || !self.dellConfigs.gateway) {


dellConfigs.firmware

anhou · 2017-11-07T08:08:27Z

lib/jobs/dell-wsman-firmware-update-job.js

@@ -0,0 +1,204 @@
+//Copyright 2016, EMC, Inc.


anhou · 2017-11-07T08:11:17Z

lib/jobs/dell-wsman-firmware-update-job.js

+                if ( !(item.status === 'undefined' || item.status === null || item.status === ""|| failureFound === true)){
+                    if(item.status === 'Failed') {
+                        isSuccessful = false;
+                        failureFound = true;


what's the difference with isSuccessful?

If the array has multiple result field only isSussessful is insufficient to judge. Add a "failurlfound" flag just like a break operation(break could not be used in foreach).

anhou · 2017-11-07T08:11:47Z

lib/task-data/base-tasks/dell-wsman-update-firmware.js

@@ -0,0 +1,16 @@
+// Copyright 2016, EMC, Inc.


anhou · 2017-11-07T08:15:20Z

lib/jobs/dell-wsman-firmware-update-job.js

+
+    /*
+     *  Initialize basic configuration for the job
+     *


anhou · 2017-11-07T08:15:41Z

lib/jobs/dell-wsman-firmware-update-job.js

+{
+    var logger = Logger.initialize(wsmanFirmwareUpdateJobFactory);
+    /**
+     *


anhou · 2017-11-07T09:21:09Z

Please squash the commits

houndci-bot · 2017-11-07T09:42:19Z

lib/jobs/dell-wsman-firmware-update-job.js

+     * @constructor
+     */
+    function wsmanFirmwareUpdateJob(options, context, taskId) {
+        var self = this;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

houndci-bot · 2017-11-07T10:17:18Z

lib/jobs/dell-wsman-firmware-update-job.js

+     */
+    function wsmanFirmwareUpdateJob(options, context, taskId) {
+        wsmanFirmwareUpdateJob.super_.call(this, logger, options, context, taskId);
+        var self = this;


If a strict mode function is executed using function invocation, its 'this' value will be undefined.

Refine Format Refine based on hound Refine format Remove debug info Refine code based on review comments Refine this to self Fix conflict Fix conflict Retest CI Refine copyrights fields Change copyrights Fix this ->self Remove debug Fix hound Fix hound message

tgelter and others added 3 commits September 12, 2017 17:39

Relax pattern constraint on VaultToken value until regex is fixed

d018d26

Refine emc diag fimrware update file upload method Change HTTP code Fix unit test bug Fix unit test coverage Fix indent Fix conflict

Merge branch 'master' of https://github.com/RackHD/on-tasks

56612e6

Merge branch 'master' of https://github.com/RackHD/on-tasks

c12372f

houndci-bot reviewed Oct 31, 2017

View reviewed changes

nortonluo force-pushed the wsmanfirmware branch from ef434ee to 4cee316 Compare October 31, 2017 11:41

nortonluo commented Nov 1, 2017

View reviewed changes

houndci-bot reviewed Nov 2, 2017

View reviewed changes

nortonluo commented Nov 3, 2017

View reviewed changes

PengTian0 added the run-test label Nov 6, 2017

nortonluo force-pushed the wsmanfirmware branch 2 times, most recently from ceeaacf to ebea69b Compare November 6, 2017 08:53

lanchongyizu approved these changes Nov 7, 2017

View reviewed changes

AlaricChan approved these changes Nov 7, 2017

View reviewed changes

anhou reviewed Nov 7, 2017

View reviewed changes

lib/jobs/dell-wsman-firmware-update-job.js Outdated

@@ -0,0 +1,204 @@

//Copyright 2016, EMC, Inc.

Copy link

Member

anhou Nov 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copyright

anhou reviewed Nov 7, 2017

View reviewed changes

lib/task-data/base-tasks/dell-wsman-update-firmware.js Outdated

@@ -0,0 +1,16 @@

// Copyright 2016, EMC, Inc.

Copy link

Member

anhou Nov 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copyright

anhou reviewed Nov 7, 2017

View reviewed changes

lib/jobs/dell-wsman-firmware-update-job.js Outdated

/*

* Initialize basic configuration for the job

*

Copy link

Member

anhou Nov 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused '*'

anhou reviewed Nov 7, 2017

View reviewed changes

lib/jobs/dell-wsman-firmware-update-job.js Outdated

{

var logger = Logger.initialize(wsmanFirmwareUpdateJobFactory);

/**

*

Copy link

Member

anhou Nov 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused '*'

nortonluo force-pushed the wsmanfirmware branch from 093d032 to eabe80e Compare November 7, 2017 09:42

houndci-bot reviewed Nov 7, 2017

View reviewed changes

nortonluo force-pushed the wsmanfirmware branch 2 times, most recently from 7ec98c5 to 9725e80 Compare November 7, 2017 10:17

houndci-bot reviewed Nov 7, 2017

View reviewed changes

nortonluo force-pushed the wsmanfirmware branch from 9725e80 to 3aa0b92 Compare November 7, 2017 10:29

nortonluo force-pushed the wsmanfirmware branch from 3aa0b92 to 6c99533 Compare November 7, 2017 10:32

anhou approved these changes Nov 8, 2017

View reviewed changes

anhou merged commit 50d776b into RackHD:master Nov 8, 2017

                                   }
                               }
                           });
-                      }
+                      };

Wsman firmware update task refine #538

Wsman firmware update task refine #538

Conversation

nortonluo commented Oct 31, 2017 • edited Loading

Background

Detail

Test Result

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lanchongyizu commented Nov 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anhou commented Nov 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nortonluo commented Oct 31, 2017 •

edited

Loading