Merge b3c8197 into 5fcda12

lib/jobs/ucs-catalog.js

@@ -6,15 +6,15 @@ var di = require('di');
 module.exports = UcsCatalogJobFactory;
 di.annotate(UcsCatalogJobFactory, new di.Provide('Job.Ucs.Catalog'));
 di.annotate(UcsCatalogJobFactory, new di.Inject(
-    'Job.Base',
+    'Job.Ucs.Base',
     'Logger',
     'Promise',
     'Assert',
     'Util',
     'Services.Waterline',
     'Services.Encryption',
     '_',
-    'JobUtils.UcsTool'
+    'uuid'
 ));
 
 function UcsCatalogJobFactory(
@@ -26,7 +26,7 @@ function UcsCatalogJobFactory(
     waterline,
     encryption,
     _,
-    UcsTool
+    uuid
 ) {
     var logger = Logger.initialize(UcsCatalogJobFactory);
 
@@ -47,7 +47,7 @@ function UcsCatalogJobFactory(
         if(_.isEmpty(this.nodes)) {
             this.nodes = [ this.context.target ];
         }
-        this.ucs = new UcsTool();
+        this._obmsCollection = {};
         this.boardChildrenToExtend = [
             //"disk-collection",
             "memarray-collection"
@@ -72,52 +72,82 @@ function UcsCatalogJobFactory(
         });
     };
 
+    /**
+     * @memberOf UcsCatalogJob
+     * @param {string} nodeId: node ID
+     */
+    UcsCatalogJob.prototype._getObmsByNodeId = function (nodeId) {
+        var self = this;
+        var obms = self._obmsCollection[nodeId];
+        if (!obms) {
+            return waterline.obms.findByNode(nodeId, 'ucs-obm-service', true)
+                .then(function(obmSetting) {
+                    if (obmSetting) {
+                        self._obmsCollection[nodeId] = {
+                            obmSetting: obmSetting
+                        };
+                        return self._obmsCollection[nodeId];
+                    } else {
+                        return Promise.reject(
+                            new Error("No ucs-obm-service found for id: %s".format(nodeId)));
+                    }
+                });
+        } else {
+            return Promise.resolve(self._obmsCollection[nodeId]);
+        }
+    };
+
     /**
      * @memberOf UcsCatalogJob
      * @param {String} dn: distinguished name of ucs managed object
      * @param {Boolean} withSelfData: boolean value to indicate if to include self data of dn
      * @return {Object}: JSON data got from ucs service
      */
-    UcsCatalogJob.prototype._getDataByDN = function (dn, withSelfData) {
+    UcsCatalogJob.prototype._getCatalogByDN = function (dn, nodeId, withSelfData) {
         var self = this;
         var groupingPattern = /^(.*)-\d{1,2}$/;
-        var url = "/catalog?identifier=" + dn;
+        var callbackId = uuid.v4();
+        var url = "/catalog/async?identifier=%s&callbackId=%s"
+            .format(dn, callbackId);
         var result = {};
-        return self.ucs.clientRequest(url)
-        .then(function(res) {
-            return res.body;
-        })
-        .map(function(data) {
-            var matched;
-            matched = data.rn.match(groupingPattern);
-
-            if(dn === data.dn){
-                if(!withSelfData) {
-                    return;
-                } else {
-                    result[data.rn] = data;
-                }
-            } else {
-                if(matched) {
-                    var name = matched[1] + "-collection";
-                    result[name] = result[name] || [];
-                    result[name].push(data);
+        return self._getObmsByNodeId(nodeId)
+            .then(function(entity){
+                var settings = entity.obmSetting.config;
+                return self._ucsRequestAsync(url, settings, callbackId)
+                    .then(function(res) {
+                        return res.body;
+                    });
+            })
+            .map(function(data) {
+                var matched;
+                matched = data.rn.match(groupingPattern);
+                if(dn === data.dn){
+                    if(!withSelfData) {
+                        return;
+                    } else {
+                        result[data.rn] = data;
+                    }
                 } else {
-                    result[data.rn] = data;
+                    if(matched) {
+                        var name = matched[1] + "-collection";
+                        result[name] = result[name] || [];
+                        result[name].push(data);
+                    } else {
+                        result[data.rn] = data;
+                    }
                 }
-            }
-        })
-        .then(function() {
-            return result;
-        });
+            })
+            .then(function() {
+                return result;
+            });
     };
 
     /**
      * @memberOf UcsCatalogJob
      * @param {Object | arrayOfObject} collection: board children object data
      * @return {Object}: JSON data got from ucs service
      */
-    UcsCatalogJob.prototype._extendBoardChildCatalog = function(collection) {
+    UcsCatalogJob.prototype._extendBoardChildCatalog = function(collection, nodeId) {
         var self = this;
         var _collection;
         if (!_.isArray(collection)) {
@@ -126,7 +156,7 @@ function UcsCatalogJobFactory(
             _collection = collection;
         }
         return Promise.map(_collection, function(item) {
-            return self._getDataByDN(item.dn)
+            return self._getCatalogByDN(item.dn, nodeId)
             .then(function(result) {
                 item.children = result;
             });
@@ -138,7 +168,7 @@ function UcsCatalogJobFactory(
      * @param {Object} board: board object data
      * @return {Promise}
      */
-    UcsCatalogJob.prototype._extendBoardCatalog = function(board) {
+    UcsCatalogJob.prototype._extendBoardCatalog = function(board, nodeId) {
         var self = this;
         var extendPromiseList = [];
         var boardKeys = _.keys(board);
@@ -151,7 +181,7 @@ function UcsCatalogJobFactory(
             });
             _.forEach(boardChildrenToExtend, function(boardChild){
                 var boardChildData = board[boardChild];
-                extendPromiseList.push(self._extendBoardChildCatalog(boardChildData));
+                extendPromiseList.push(self._extendBoardChildCatalog(boardChildData, nodeId));
             });
             return Promise.all(extendPromiseList);
         });
@@ -165,23 +195,21 @@ function UcsCatalogJobFactory(
     UcsCatalogJob.prototype.catalogServers = function(nodeId) {
         var self = this;
         var nodeName = '';
-        return self.ucs.setup(nodeId)
-        .then(function(){
-            return waterline.nodes.getNodeById(nodeId);
-        })
+        return waterline.nodes.getNodeById(nodeId)
         .then(function(node){
             nodeName = node.name;
             var isChassis = _.startsWith(_.last(nodeName.split('/')), 'chassis');
             return Promise.all([
-                self._getDataByDN(nodeName, true),
-                isChassis ? new Promise.resolve() : self._getDataByDN(nodeName + '/board')
+                self._getCatalogByDN(nodeName, nodeId, true),
+                isChassis ?
+                new Promise.resolve() : self._getCatalogByDN(nodeName + '/board', nodeId)
             ])
             .spread(function(nodeResult, boardResult) {
                 if(boardResult && nodeResult.board) {
                     // Get more details under rn="board" as hardware info like memory,
                     // disk, cpu are under rn="board"
                     nodeResult.board.children = boardResult;
-                    return self._extendBoardCatalog(boardResult)
+                    return self._extendBoardCatalog(boardResult, nodeId)
                     .then(function() {
                         return nodeResult;
                     });

lib/utils/job-utils/ucs-tool.js

@@ -46,23 +46,6 @@ function ucsToolFactory(
      * @param data the POST/PUT/PATCH data to write to the HTTP client
      */
 
-    /**
-     * @function setup
-     * @description return new ucs tool for provided node Id.
-     */
-    UcsTool.prototype.setup = function(nodeId) {
-        var self = this;
-        if (!nodeId) {
-            return Promise.resolve();
-        }
-
-        return waterline.obms.findByNode(nodeId, 'ucs-obm-service', true)
-            .then(function(obm) {
-                if (!obm) { throw new Errors.NotFoundError('Failed to find UCS settings'); }
-                self.settings = obm.config;
-            });
-    };
-
     UcsTool.prototype.clientRequest = function(path, method, data) {
         var self = this;
         var setups = {};