Merge pull request #589 from lanchongyizu/bugfix/RAC-6514

fix Graph.Dell.Configure.Idrac issue
RackHD · Mar 20, 2018 · d085c7a · d085c7a
2 parents 0df7a66 + c30a778
commit d085c7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/jobs/racadm-control.js b/lib/jobs/racadm-control.js
@@ -46,14 +46,19 @@ function racadmToolJobFactory(
 
         this.nodeId = this.context.target;
         this.action = options.action;
-        this.userConfig = {user: options.serverUsername, password: options.serverPassword, 
+        this.userConfig = {user: options.serverUsername, password: options.serverPassword,
             filePath: options.serverFilePath};
         if (typeof options.forceReboot !== "undefined") {
             this.userConfig.forceReboot = options.forceReboot;
         }
         if (typeof options.components !== "undefined") {
             this.userConfig = options.components;
         }
+        if (typeof options.ip !== "undefined") {
+            this.userConfig.ip = options.ip;
+            this.userConfig.netMask = options.netMask;
+            this.userConfig.gateway = options.gateway;
+        }
     }
     util.inherits(RacadmToolJob, BaseJob);
 

diff --git a/lib/utils/job-utils/racadm-tool.js b/lib/utils/job-utils/racadm-tool.js
@@ -552,11 +552,12 @@ function racadmFactory(
      * @return {promise}
      */
     RacadmTool.prototype.setIdracIP = function(host, user, password, data) {
+        var self = this;
         return  Promise.try(function(){
             if (Constants.Regex.IpAddress.test(data.ip) &&
                 Constants.Regex.IpAddress.test(data.netMask) &&
                 Constants.Regex.IpAddress.test(data.gateway)) {
-                return this.runCommand(host, user, password,
+                return self.runCommand(host, user, password,
                     "setniccfg -s " + data.ip + " " + data.netMask + " " + data.gateway);
             }else{
                 throw new Errors.MyError('Invalid format of the input');