Merge branch 'master' into redfish_discovery_fix

RackHD · Oct 18, 2017 · 0e24e6b · 0e24e6b
2 parents 64eaad0 + fb10cbd
commit 0e24e6b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/debianstatic/on-http/changelog b/debianstatic/on-http/changelog
@@ -1,4 +1,4 @@
-on-http (2.26.0) UNRELEASED; urgency=low
+on-http (2.27.0) UNRELEASED; urgency=low
 
   * Initial release
   * release 1.0.0
@@ -34,5 +34,6 @@ on-http (2.26.0) UNRELEASED; urgency=low
   * release 2.24.0
   * release 2.25.0
   * release 2.26.0
+  * release 2.27.0
 
- -- rackhd <rackhd@emc.com>  Fri, 06 Oct 2017 21:02:47 -0400
+ -- rackhd <rackhd@emc.com>  Fri, 13 Oct 2017 21:02:41 -0400
diff --git a/lib/api/redfish-1.0/systems.js b/lib/api/redfish-1.0/systems.js
@@ -54,7 +54,6 @@ var dataFactory = function(identifier, dataName) {
             }).catch(function() {
                 return { power: "Unknown", uid: "Unknown"};
             });
-
         case 'selInfoData':
             return nodeApi.getPollersByNodeId(identifier)
             .filter(function(poller) {
@@ -64,7 +63,6 @@ var dataFactory = function(identifier, dataName) {
             }).then(function(data) {
                 return data[0].selInformation;
             });
-
         case 'selData':
             return nodeApi.getPollersByNodeId(identifier)
             .filter(function(poller) {
@@ -76,7 +74,6 @@ var dataFactory = function(identifier, dataName) {
             });
         default: 
             return nodeApi.getNodeCatalogSourceById(identifier, dataName);
-
     }
 };
 

diff --git a/lib/services/wsman-service.js b/lib/services/wsman-service.js
@@ -3,7 +3,6 @@
 'use strict';
 
 var di = require('di');
-var urlParse = require('url-parse');
 
 module.exports = wsmanServiceFactory;
 di.annotate(wsmanServiceFactory, new di.Provide('Http.Services.Wsman'));
@@ -40,20 +39,11 @@ function wsmanServiceFactory(
             	throw new errors.NotFoundError(
                     'Configuration for WSMan web services is not defined in wsmanConfig.json.');
             }
-            var parse = urlParse(self.dellConfigs.gateway);
 
-            var protocol = parse.protocol.replace(':','').trim();
-            self.settings = {
-                uri: parse.href,
-                host: parse.host.split(':')[0],
-                root: parse.pathname,
-                port: parse.port,
-                protocol: protocol,
+            self.wsman = new WsmanTool(self.dellConfigs.gateway, {
                 verifySSL: false,
                 recvTimeoutMs: 30000
-            };
-            self.wsman = new WsmanTool();
-            self.wsman.settings = self.settings;
+            });
 
             self.target = {
                 address: obm.config.host,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "on-http",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "description": "OnRack Http Server",
   "main": "index.js",
   "scripts": {