Merge pull request #1 from Dell-SMI/wsman-configs

configuration and event stuff for wsman microservices
RackHD-Mirror · Oct 12, 2016 · 4f30ea8 · 4f30ea8
2 parents 6e57712 + 61c6531
commit 4f30ea8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/lib/common/constants.js b/lib/common/constants.js
@@ -44,7 +44,8 @@ function constantsFactory (path) {
         Configuration: {
             Files: {
                 Global: process.env.MONORAIL_CONFIG || '/opt/monorail/config.json',
-                OnRack: '/opt/onrack/etc/monorail.json'
+                OnRack: '/opt/onrack/etc/monorail.json',
+                Dell: '/opt/dell/wsmanConfig.json'
             }
         },
         WorkItems: {

diff --git a/lib/protocol/events.js b/lib/protocol/events.js
@@ -82,7 +82,6 @@ function eventsProtocolFactory (
         );
     };
 
-
     EventsProtocol.prototype.subscribeHttpResponse = function (nodeId, callback) {
         assert.isMongoId(nodeId);
         assert.func(callback);
@@ -94,6 +93,26 @@ function eventsProtocolFactory (
         );
     };
 
+    EventsProtocol.prototype.publishHttpResponseUuid = function (id, data) {
+        assert.string(id);
+        assert.object(data);
+        return messenger.publish(
+            Constants.Protocol.Exchanges.Events.Name,
+            'http.response' + '.' + id,
+            data
+        );
+    };
+
+    EventsProtocol.prototype.subscribeHttpResponseUuid = function (id, callback) {
+        assert.uuid(id);
+        assert.func(callback);
+        return messenger.subscribe(
+            Constants.Protocol.Exchanges.Events.Name,
+            'http.response' + '.' + id,
+            callback
+        );
+    };
+
     EventsProtocol.prototype.publishDhcpBoundLease = function (nodeId, data) {
         assert.string(nodeId);
         assert.object(data);

diff --git a/lib/services/configuration.js b/lib/services/configuration.js
@@ -47,6 +47,12 @@ function configurationServiceFactory(
             console.error('Failed to load configuration file:',
                 Constants.Configuration.Files.Global);
         }
+        if (fs.existsSync(Constants.Configuration.Files.Dell)) {
+            nconf.file('dell', Constants.Configuration.Files.Dell);
+        } else {
+            console.error('Failed to load configuration file:',
+                Constants.Configuration.Files.Dell);
+        }
 
         var baseDirectory = path.resolve(__dirname + '/../..');