Merge 821f46b into 0dab5e1

RackHD · Nov 6, 2017 · 39be0ee · 39be0ee
2 parents 0dab5e1 + 821f46b
commit 39be0ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/lib/jobs/dell-wsman-configure-bios.js b/lib/jobs/dell-wsman-configure-bios.js
@@ -88,8 +88,7 @@ function DellWsmanConfigureBiosFactory(
             "enableBootDevices": this.options.enableBootDevices,
             "disableBootDevices": this.options.disableBootDevices,
             "rebootJobType": this.options.rebootJobType,
-            "scheduledStartTime": this.options.scheduledStartTime,
-            "untilTime": this.options.untilTime
+            "scheduledStartTime": 'TIME_NOW'
         };
 
         var wsman = new WsmanTool(self.dell.gateway, {

diff --git a/lib/task-data/schemas/dell-wsman-set-bios.json b/lib/task-data/schemas/dell-wsman-set-bios.json
@@ -52,16 +52,6 @@
             "type": "integer",
             "maximum": 3,
             "minimum": 1
-        },
-        "scheduledStartTime": {
-            "description": "Specify the start time of job schedule",
-            "type": "string",
-            "pattern": "(?:(?:(?:(?:(?:[13579][26]|[2468][048])00)|(?:[0-9]{2}(?:(?:[13579][26])|(?:[2468][048]|0[48]))))(?:(?:(?:09|04|06|11)(?:0[1-9]|1[0-9]|2[0-9]|30))|(?:(?:01|03|05|07|08|10|12)(?:0[1-9]|1[0-9]|2[0-9]|3[01]))|(?:02(?:0[1-9]|1[0-9]|2[0-9]))))|(?:[0-9]{4}(?:(?:(?:09|04|06|11)(?:0[1-9]|1[0-9]|2[0-9]|30))|(?:(?:01|03|05|07|08|10|12)(?:0[1-9]|1[0-9]|2[0-9]|3[01]))|(?:02(?:[01][0-9]|2[0-8])))))(?:0[0-9]|1[0-9]|2[0-3])(?:[0-5][0-9]){2}"
-        },
-        "untilTime": {
-            "description": "Specify the until time of finishing job schedule",
-            "type": "string",
-            "pattern": "(?:(?:(?:(?:(?:[13579][26]|[2468][048])00)|(?:[0-9]{2}(?:(?:[13579][26])|(?:[2468][048]|0[48]))))(?:(?:(?:09|04|06|11)(?:0[1-9]|1[0-9]|2[0-9]|30))|(?:(?:01|03|05|07|08|10|12)(?:0[1-9]|1[0-9]|2[0-9]|3[01]))|(?:02(?:0[1-9]|1[0-9]|2[0-9]))))|(?:[0-9]{4}(?:(?:(?:09|04|06|11)(?:0[1-9]|1[0-9]|2[0-9]|30))|(?:(?:01|03|05|07|08|10|12)(?:0[1-9]|1[0-9]|2[0-9]|3[01]))|(?:02(?:[01][0-9]|2[0-8])))))(?:0[0-9]|1[0-9]|2[0-3])(?:[0-5][0-9]){2}"
         }
     },
     "properties": {
@@ -82,13 +72,7 @@
         },
         "rebootJobType": {
             "$ref": "#/definitions/rebootJobType"
-        },
-        "scheduledStartTime": {
-            "$ref": "#/definitions/scheduledStartTime"
-        },
-        "untilTime": {
-            "$ref": "#/definitions/untilTime"
         }
     },
-    "required": ["attributes", "rebootJobType", "scheduledStartTime", "untilTime"]
+    "required": ["attributes", "rebootJobType"]
 }
diff --git a/lib/task-data/tasks/dell-wsman-configure-bios.js b/lib/task-data/tasks/dell-wsman-configure-bios.js
@@ -9,13 +9,11 @@ module.exports = {
     optionsSchema: 'dell-wsman-set-bios.json',
     options: {
         attributes: null,
-        biosBootSequenceOrder: null,
-        hddSequenceOrder: null,
-        enableBootDevices: null,
-        disableBootDevices: null,
-        rebootJobType: null,
-        scheduledStartTime: null,
-        untilTime: null
+        biosBootSequenceOrder: [''],
+        hddSequenceOrder: [''],
+        enableBootDevices: [''],
+        disableBootDevices: [''],
+        rebootJobType: 1
     },
     properties: {}
 };