From f3cf38020e2240897194a3a2130f4c99f080065b Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Thu, 24 Nov 2016 18:17:13 +0530
Subject: [PATCH 01/18] Bots Summary UI changes, added icons for status in
 audit trail page, added icons to differentiate task & blueprint in audit
 trail page.

---
 client/cat3/main.html                         |   2 +-
 client/cat3/src/factory/workzoneServices.js   |  14 --
 client/cat3/src/partials/global.scss          |   4 +-
 .../sections/dashboard/bots/bots.scss         | 133 +++++++++---------
 .../bots/controller/audittrailCtrl.js         |  20 ++-
 .../dashboard/bots/controller/botLogsCtrl.js  |  23 +--
 .../dashboard/bots/controller/libraryCtrl.js  |  42 ++++--
 .../sections/dashboard/bots/view/library.html |  79 +++++------
 .../workzone/orchestration/orchestration.scss |   7 +
 .../orchestration/popups/newTask.html         |   4 +-
 10 files changed, 177 insertions(+), 151 deletions(-)

diff --git a/client/cat3/main.html b/client/cat3/main.html
index 747bfcd47..cbae61cdf 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -67,7 +67,7 @@
 			            </span>
 					</div>
 				</div>
-				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
+				<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10 no-padding">
 					<ul>
 						<li ng-cloak ng-repeat="item in breadcrumbData">{{item}} {{$last ? "" : " &raquo; "}}</li>
 					</ul>
diff --git a/client/cat3/src/factory/workzoneServices.js b/client/cat3/src/factory/workzoneServices.js
index 1c84093ff..58226abef 100644
--- a/client/cat3/src/factory/workzoneServices.js
+++ b/client/cat3/src/factory/workzoneServices.js
@@ -542,20 +542,6 @@
 				getBotCategoryList:function () {
 					var url ='/config-data/category-type';
 					return $http.get(fullUrl(url),Auth.getHeaderObject());
-				},
-				deleteBotTask: function (taskId) {
-					return $http({
-						method: "delete",
-						url: fullUrl('/tasks/serviceDelivery/' + taskId),
-						async: false
-					});
-				},
-				deleteBotBP: function (blueprintId) {
-					return $http({
-						method: "delete",
-						url: fullUrl('/blueprints/serviceDelivery/' + blueprintId),
-						async: false
-					});
 				}
 			};
 			return serviceInterface;
diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
index a511abba0..fa856dad7 100644
--- a/client/cat3/src/partials/global.scss
+++ b/client/cat3/src/partials/global.scss
@@ -107,8 +107,8 @@ $imagePath : "../../../../../../cat3/images";
 }
 
 #breadcrumb-nav {
-    padding-top: 6px;
-    padding-left: 60px;
+    padding-top: 5px;
+    padding-left: 8px;
 }
 
 #breadcrumb-block {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
index 48bfd70e6..4f74426cb 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
@@ -21,98 +21,99 @@
 }
 
 #botLibraryPage {
-  .summary-container {
-    width: 100%;
-    margin: 15px 0 0 0px;
+  .page-name {
+      font-size: 18px;
+      margin: 5px 0 5px 10px;
   }
 
-  .panel-heading {
-    font-weight: bold;
+  .borderTop {
+      border-top: 1px dashed #ddd;
   }
 
-  .col-md-4ths {
-    width: 25%;
-    float: left;
+  .btn-xs {
+      padding: 1px 5px;
+      font-size: 12px;
   }
 
-  .col-md-4ths {
-    position: relative;
-    min-height: 1px;
-    padding-right: 10px;
-    padding-left: 10px;
-    color: #fff;
+  .refresh-btn {
+    margin: 2px 10px 0 0;
   }
 
-  .small-box {
-    border-radius: 2px;
-    position: relative;
-    display: block;
-    margin-bottom: 15px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+  .summary-container {
+    width: 100%;
+    background-color: #ecf0f5;
   }
 
-  .bg-aqua {
-    background-color: #00c0ef !important;
+  .info-box {
+    display: block;
+    min-height: 90px;
+    background: #fff;
+    width: 100%;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+    border-radius: 2px;
+    margin: 15px 0;
   }
 
-  .small-box .icon {
-    -webkit-transition: all 0.3s linear;
-    -o-transition: all 0.3s linear;
-    transition: all 0.3s linear;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    z-index: 0;
-    font-size: 90px;
-    color: rgba(0, 0, 0, 0.15);
+  .ion {
+    display: inline-block;
+    font-family: "Ionicons";
+    speak: none;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    text-rendering: auto;
+    line-height: 1;
+    -webkit-font-smoothing: antialiased;
   }
 
-  .small-box h3 {
-    font-size: 38px;
-    font-weight: bold;
-    margin: 0 0 10px 0;
-    white-space: nowrap;
-    padding: 0;
-    text-align: left;
+  .info-box-content {
+    padding: 5px 10px;
+    margin-left: 90px;
   }
 
+  .info-box-text {
+    text-transform: uppercase;
+  }
 
-  .small-box p {
+  .info-box-text {
+    display: block;
     font-size: 13px;
-    text-align: left;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
-  .small-box > .inner {
-    padding: 10px;
+  .info-box-number {
+    display: block;
+    font-weight: bold;
+    font-size: 20px;
   }
 
-  .small-box > .small-box-footer {
-    position: relative;
-    text-align: center;
-    padding: 3px 0;
-    color: #fff;
-    color: rgba(255, 255, 255, 0.8);
+  .info-box-icon {
+    border-top-left-radius: 2px;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 2px;
     display: block;
-    z-index: 10;
-    background: rgba(0, 0, 0, 0.1);
-    text-decoration: none;
-    cursor: pointer;
-    height: 27px;
+    float: left;
+    height: 90px;
+    width: 90px;
+    text-align: center;
+    font-size: 45px;
+    line-height: 90px;
+    background: rgba(0,0,0,0.2);
+  }
+
+  .bg-aqua {
+    background-color: #00c0ef !important;
   }
 
-  .small-box .icon {
-    -webkit-transition: all 0.3s linear;
-    -o-transition: all 0.3s linear;
-    transition: all 0.3s linear;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    z-index: 0;
-    font-size: 90px;
-    color: rgba(0, 0, 0, 0.15);
+  .bg-green {
+    background-color: #00a65a !important;
   }
 
-  .small-box .icon {
-    color: rgba(0, 0, 0, 0.15) !important;
+  .bg-red {
+    background-color: #dd4b39 !important;
   }
 }
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
index ec93f489d..1877a1e9c 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
@@ -8,8 +8,10 @@
 (function (angular) {
     "use strict";
     angular.module('dashboard.bots')
-    .controller('audittrailCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
-    function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
+    .controller('audittrailCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
+    function ($scope, $rootScope, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
+        var treeNames = ['Bots','Audit Trail'];
+        $rootScope.$emit('treeNameUpdate', treeNames);
         var audit=this;
         audit.gridOptions={
             gridOption:{
@@ -24,6 +26,10 @@
                 { name: 'End Time',field:'endedOn',
                     cellTemplate:'<span title="{{row.entity.endedOn  | timestampToLocaleTime}}">{{row.entity.endedOn  | timestampToLocaleTime}}</span>', cellTooltip: true},
                 { name: 'BOT Type',displayName: 'BOT Type',field:'auditTrailConfig.type'},
+                { name:'Task Type',field:'auditTrailConfig.executionType' ,cellTemplate:'<img src="images/orchestration/chef.png" ng-show="row.entity.auditTrailConfig.executionType==\'chef\'" alt="row.entity.taskType" title="Chef" class="task-type-img" />'+
+                    '<img src="images/orchestration/jenkins.png" ng-show="row.entity.auditTrailConfig.executionType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
+                    '<img src="images/orchestration/script.jpg" ng-show="row.entity.auditTrailConfig.executionType==\'script\'" alt="row.entity.auditTrailConfig.executionType" title="Script" class="task-type-img" />'+
+                    '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.action==\'BOTs Blueprint Execution\'" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
                 { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
                 { name: 'Status',field:'status',
                   cellTemplate:'<img class="bot-status-icon" src="images/instance-states/aws-started.png" ng-show="row.entity.status === \'success\'" title="{{row.entity.status}}">' +
@@ -64,10 +70,12 @@
 
         audit.init =function(){
             audit.gridOptions.data=[];
-            var url = '/audit-trail?filterBy=auditType:BOTs';
-            $http.get(url).then(function (data) {
-                angular.forEach(data,function () {
-                    audit.gridOptions.data=data.data.auditTrails;
+            var param={
+                url:'/audit-trail?filterBy=auditType:BOTs'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                angular.forEach(response,function () {
+                    audit.gridOptions.data=response.auditTrails;
                 });
             });
         };
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
index 7802b2c20..fc621101e 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
@@ -8,7 +8,7 @@
 (function (angular) {
     "use strict";
     angular.module('library.bots',[])
-    .controller('botLogsCtrl',['$scope', '$rootScope', '$http', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, $http, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
+    .controller('botLogsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', '$timeout', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, $timeout) {
         $scope.botName = items.auditTrailConfig.name;
         $scope.nodeIds = items.auditTrailConfig.nodeIds;
         $scope.taskType = items.auditTrailConfig.executionType;
@@ -34,9 +34,11 @@
         };
         $scope.instanceChange =function(){
             $scope.botLogs=[];
-            var url = '/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs';
-            $http.get(url).then(function (result) {
-                $scope.botLogs = result.data;
+            var param={
+                url:'/audit-trail/' + $scope.selectedInstance.actionLogId + '/logs'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                $scope.botLogs = response;
                 $scope.isBotLogsLoading = false;
             });
         };
@@ -52,7 +54,6 @@
                 for (var l = 0; l < _jobInstances.length; l++) {
                     if ($scope.nodeIdsWithActionLog[k].nodeId === _jobInstances[l]._id) {
                         $scope.nodeIdsWithActionLog[k].uiNodeName = _jobInstances[l].name;
-                        console.log($scope.nodeIdsWithActionLog[k].uiNodeName);
                     }
                 }
             }
@@ -64,13 +65,15 @@
             console.log(error);
         });
         if($scope.taskType === 'jenkins') {
-            var url = '/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output';
-            $http.get(url).then(function (result) {
-                if (result.data) {
-                    $scope.jenkinsLogs = helper.formatLogs(result.data.output);
+            var param={
+                url:'/jenkins/' + $scope.jenkinsActionLogId + '/jobs/testmail/builds/' + $scope.jenkinsBuildNumber + '/output'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                if (response.data) {
+                    $scope.jenkinsLogs = helper.formatLogs(response.data.output);
                     $scope.isBotLogsLoading = false;
                 } else {
-                    $scope.jenkinsLogs = helper.formatLogs(result.output);
+                    $scope.jenkinsLogs = helper.formatLogs(response.output);
                     $scope.isBotLogsLoading = false;
                 }
             });
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 7465e3e7f..b7277d751 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -8,7 +8,7 @@
 (function (angular) {
     "use strict";
     angular.module('dashboard.bots')
-    .controller('libraryCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils) {
+    .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils) {
         var treeNames = ['Bots','Library'];
         $rootScope.$emit('treeNameUpdate', treeNames);
         var lib=this;
@@ -37,7 +37,7 @@
             ],
             data:[]
         };
-        var gridBottomSpace = 210;
+        var gridBottomSpace = 190;
         $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace;
         $scope.launchInstance = function(launch){
             if(launch.launcType === 'task'){
@@ -49,7 +49,7 @@
         $scope.botLogs = function(bot){
             genSevs.botHistory(bot);
         };
-        $scope.deleteBotTask = function(bot) {
+        $scope.deleteBotTask = function(task) {
             var modalOptions = {
                 closeButtonText: 'Cancel',
                 actionButtonText: 'Delete',
@@ -58,7 +58,10 @@
                 bodyText: 'Are you sure you want to delete this bot?'
             };
             confirmbox.showModal({}, modalOptions).then(function() {
-                workzoneServices.deleteBotTask(bot._id).then(function(response) {
+                var param={
+                    url:'/tasks/serviceDelivery/' + task._id
+                };
+                genSevs.promiseDelete(param).then(function (response) {
                     if (response) {
                         toastr.success('Successfully deleted');
                         lib.init();
@@ -68,7 +71,7 @@
                 });
             });
         };
-        $scope.deleteBotBP = function(bot) {
+        $scope.deleteBotBP = function(blueprint) {
             var modalOptions = {
                 closeButtonText: 'Cancel',
                 actionButtonText: 'Delete',
@@ -77,7 +80,10 @@
                 bodyText: 'Are you sure you want to delete this bot?'
             };
             confirmbox.showModal({}, modalOptions).then(function() {
-                workzoneServices.deleteBotBP(bot._id).then(function(response) {
+                var param={
+                    url:'/blueprints/serviceDelivery/' + blueprint._id
+                };
+                genSevs.promiseDelete(param).then(function (response) {
                     if (response) {
                         toastr.success('Successfully deleted');
                         lib.init();
@@ -90,20 +96,37 @@
         $rootScope.$on('BOTS_LIBRARY_REFRESH', function() {
             lib.init();
         });
-        lib.summary = function() {
+        $scope.RefreshBotsLibrary = function() {
+            lib.init();
+        };
+        /*$scope.showBotsRunning = function() {
             $scope.botSummary=[];
             var url = '/audit-trail/bot-summary';
             $http.get(url).then(function (response) {
                 $scope.botSummary = response.data;
-                console.log($scope.botSummary);
             });
         }
+        $scope.showFailedBots = function() {
+            $scope.botSummary=[];
+            var url = '/audit-trail/bot-summary';
+            $http.get(url).then(function (response) {
+                $scope.botSummary = response.data;
+            });
+        }*/
+        lib.summary = function() {
+            $scope.botSummary=[];
+            var param={
+                url:'/audit-trail/bot-summary'
+            };
+            genSevs.promiseGet(param).then(function (response) {
+                $scope.botSummary = response;
+            });
+        };
         lib.summary();
         lib.init =function(){
             lib.gridOptions.data=[];
             var param={
                 url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true'
-                //url:'src/partials/sections/dashboard/bots/data/bp.json'
             };
             genSevs.promiseGet(param).then(function (result) {
                 angular.forEach(result,function (val) {
@@ -113,7 +136,6 @@
             });
             var param2={
                url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true'
-               // url:'src/partials/sections/dashboard/bots/data/t.json'
             };
             genSevs.promiseGet(param2).then(function (resultTask) {
                 angular.forEach(resultTask,function (val) {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
index 526c3be29..ac5b989c3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -1,58 +1,57 @@
 <link rel='stylesheet' href='catalyst/partials/sections/dashboard/bots/bots.css'>
 
 <div id="botLibraryPage">
+	<div class="page-name">
+		BOTs Library&nbsp;
+		<button type="button" title="Refresh" class="btn btn-xs btn-primary pull-right refresh-btn" ng-click="RefreshBotsLibrary();">
+			<i class="fa fa-refresh" style="color: #fff"></i>
+		</button>
+    </div>
+    <div class="borderTop"></div>
 	<div class="container summary-container">
 		<div class="panel-group text-center">
-			<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
-				<div class="small-box bg-aqua">
-					<div class="inner">
-						<h3 id="totalProviders">{{botSummary.totalNoOfBots}}</h3>
-						<p>Total <br>Number of BOTs</p>
+			<div class="col-md-3 col-sm-6 col-xs-12">
+				<div class="info-box">
+					<span class="info-box-icon bg-aqua">
+						<i class="fa fa-th" style="color: #fff"></i>
+					</span>
+					<div class="info-box-content">
+					  <span class="info-box-text">Total Number of BOTs</span>
+					  <span class="info-box-number">{{botSummary.totalNoOfBots}}</span>
 					</div>
-					<div class="icon">
-						<i class="fa fa-th" style="color: rgba(0, 0, 0, 0.15)"></i>
-					</div>
-                    <span class="small-box-footer managedUnmanagedCSS">
-                    </span>
 				</div>
 			</div>
-			<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
-				<div class="small-box bg-aqua">
-					<div class="inner">
-						<h3 id="totalProviders">{{botSummary.totalNoOfRunningBots}}</h3>
-						<p>Total <br>Number of BOTs running</p>
-					</div>
-					<div class="icon">
-						<i class="fa fa-laptop" style="color: rgba(0, 0, 0, 0.15)"></i>
+			<div class="col-md-3 col-sm-6 col-xs-12">
+				<div class="info-box" ng-click="showBotsRunning()">
+					<span class="info-box-icon bg-green">
+						<i class="fa fa-laptop" style="color: #fff"></i>
+					</span>
+					<div class="info-box-content">
+					  <span class="info-box-text">Number of BOTs running</span>
+					  <span class="info-box-number">{{botSummary.totalNoOfRunningBots}}</span>
 					</div>
-                    <span class="small-box-footer managedUnmanagedCSS">
-                    </span>
 				</div>
 			</div>
-			<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
-				<div class="small-box bg-aqua">
-					<div class="inner">
-						<h3 id="totalProviders">{{botSummary.totalSavedTimeForBots}} mins</h3>
-						<p>Total <br>Time saved</p>
+			<div class="col-md-3 col-sm-6 col-xs-12">
+				<div class="info-box">
+					<span class="info-box-icon bg-yellow">
+						<i class="fa fa-cube" style="color: #fff"></i>
+					</span>
+					<div class="info-box-content">
+					  <span class="info-box-text">Total Time saved</span>
+					  <span class="info-box-number">{{botSummary.totalSavedTimeForBots}} mins</span>
 					</div>
-					<div class="icon">
-						<i class="fa fa-cube" style="color: rgba(0, 0, 0, 0.15)"></i>
-					</div>
-                    <span class="small-box-footer managedUnmanagedCSS">
-                    </span>
 				</div>
 			</div>
-			<div class="col-md-4ths infrastructureClass" data-text="Total Number of Providers">
-				<div class="small-box bg-aqua">
-					<div class="inner">
-						<h3 id="totalProviders">{{botSummary.totalNoOfFailedBots}}</h3>
-						<p>Total <br>Number of failed runs</p>
-					</div>
-					<div class="icon">
-						<i class="fa fa-external-link" style="color: rgba(0, 0, 0, 0.15)"></i>
+			<div class="col-md-3 col-sm-6 col-xs-12">
+				<div class="info-box" ng-click="showFailedBots()">
+					<span class="info-box-icon bg-red">
+						<i class="fa fa-external-link" style="color: #fff"></i>
+					</span>
+					<div class="info-box-content">
+					  <span class="info-box-text">Number of failed runs</span>
+					  <span class="info-box-number">{{botSummary.totalNoOfFailedBots}}</span>
 					</div>
-                    <span class="small-box-footer managedUnmanagedCSS">
-                    </span>
 				</div>
 			</div>
 		</div>
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
index 5d6abad7e..e4e5f05e9 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss
@@ -208,6 +208,13 @@ $imagePath : "../../../../../../images";
 		padding: 12px 0;
 	}
 
+	.jenkins-job-links {
+		max-width: 225px;
+	    text-overflow: ellipsis;
+	    overflow: hidden;
+	    height: 18px;
+	}
+
 	.chef-details-top {
 		width: 100%;
 		min-height: 184px;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
index 92a85d5a5..419ad7d90 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
@@ -320,7 +320,7 @@ <h5>Jenkins</h5>
 															</thead>
 															<tbody id="jobListSave">
 															<tr ng-repeat="jobLink in jobResultURL">
-																<td>{{jobLink}}</td>
+																<td title="{{jobLink}}"><div class="jenkins-job-links">{{jobLink}}</div></td>
 																<td><button type="button" ng-click="removeJobLink(jobLink);"><i class="fa fa-trash-o"></i></button></td>
 																</td>
 															</tr>
@@ -535,4 +535,4 @@ <h5>Script Details</h5>
 			</div>
 		</div>
 	</form>
-</div>
+</div>
\ No newline at end of file

From dcfb1d9b57c865a833b1070e1f8824c52bb0fc70 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Thu, 24 Nov 2016 18:39:30 +0530
Subject: [PATCH 02/18] QA Bugs fixed and enhancements

---
 .../cat3/src/partials/sections/card/card.scss |   8 +-
 .../controllers/addDockerTemplateCtrl.js      |   2 +-
 .../design/controllers/blueprintCreateCtrl.js |   2 +-
 .../design/controllers/blueprintListCtrl.js   |  23 ++-
 .../design/controllers/createCompositeCtrl.js |   3 +
 .../sections/dashboard/design/design.html     |   2 +-
 .../sections/dashboard/design/design.scss     | 142 +++---------------
 .../design/view/blueprintCreate.html          |   3 +-
 .../design/view/createComposite.html          |  16 +-
 .../dashboard/design/view/designListView.html |  16 +-
 .../workzone/blueprint/blueprint.scss         |   4 +
 .../blueprint/popups/blueprintInfo.html       |   2 +-
 .../popups/blueprintLaunchParamsCtrl.js       |   2 +-
 13 files changed, 63 insertions(+), 162 deletions(-)

diff --git a/client/cat3/src/partials/sections/card/card.scss b/client/cat3/src/partials/sections/card/card.scss
index 356ac5121..8328ff74d 100644
--- a/client/cat3/src/partials/sections/card/card.scss
+++ b/client/cat3/src/partials/sections/card/card.scss
@@ -350,12 +350,12 @@ $imagePath : "/cat3/images";
 
 	.bp-version-dropdown-wrapper {
 		height: 40px;
-		margin: 4px 0 0 19px;
+		margin: 4px 0 0 36px;
 	}
 
 	.bp-version-dropdown-wrapper-docker {
 		height: 31px;
-		margin: -3px 0 0 19px;
+		margin: -3px 0 0 36px;
 	}
 
 	.btnicons {
@@ -392,11 +392,11 @@ $imagePath : "/cat3/images";
     }
 
 	.blueprint-buttons {
-		margin: 0 0 0 32px;
+		margin: 0 0 0 45px;
 	}
 
 	.blueprint-buttons-docker {
-		margin: 5px 0 0 32px;
+		margin: 5px 0 0 45px;
 	}
 
 	.bp-version-dropdown {
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
index 5397a2c88..ab34f6454 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js
@@ -14,7 +14,7 @@
                     var dockerTemplates = $scope.dockerTemplateList;
                     for(var j=0;j<dockerTemplates.length;j++){
                         if(dockerTemplates[j]._id === $scope.dockerTemplateForTag){
-                            $scope.dockerTemplateName = dockerTemplates[j].dockercontainerpaths.replace(/\//g, "$$$");
+                            $scope.dockerTemplateName = dockerTemplates[j].dockercontainerpaths;
                             $scope.dockerTemplateTypeName = dockerTemplates[j].templatename;
                             $scope.dockerLaunchParameters = ' --name ' + dockerTemplates[j].templatename;
                             if(dockerTemplates[j].dockerreponame !== ''){
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
index 790e3135c..d4910138c 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
@@ -710,6 +710,7 @@
                         providerId:blueprintCreation.newEnt.providers,
                         region:blueprintCreation.newEnt.region,
                         templateType:$state.params.templateObj.templatetype,
+                        domainNameCheck:blueprintCreation.newEnt.domainCheck,
                         name:blueprintCreation.newEnt.blueprintName
                     };
                     if($scope.bpTypeName === 'OSImage'){
@@ -720,7 +721,6 @@
 
                     if($scope.bpTypeName === 'OSImage' || $scope.bpTypeName === 'SoftwareStack') {
                         if($scope.providerType === 'AWS'){
-                            blueprintCreateJSON.domainNameCheck = blueprintCreation.newEnt.domainCheck
                             blueprintCreateJSON.blueprintType = 'instance_launch';
                             blueprintCreateJSON.instanceCount = blueprintCreation.newEnt.instanceCount;    
                         } else if($scope.providerType === 'AZURE'){
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
index 9f900971f..24f8534fc 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
@@ -28,10 +28,10 @@
                         angular.forEach(pbList.blueprintList.list.data, function(val){
                             if(val.templateType === 'docker'){
                                 var dockerOptions = [
-                                    { name:'Name',minWidth:150,field:'name'},
-                                    { name:'Docker Path',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpaths'},
-                                    { name:'Docker Path Title',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpathstitle'},
-                                    { name:'Docker RepoTag',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockerrepotags'}, 
+                                    { name:'Name',minWidth:150,field:'name',cellTooltip: true},
+                                    { name:'Docker Path',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpaths',cellTooltip: true},
+                                    { name:'Docker Path Title',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockercontainerpathstitle',cellTooltip: true},
+                                    { name:'Docker RepoTag',minWidth:150,field:'blueprintConfig.dockerCompose[0].dockerrepotags',cellTooltip: true}, 
                                     { name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
@@ -40,15 +40,14 @@
                                 bpcolumnDefs = dockerOptions;
                             } else if(val.templateType === 'chef' || val.templateType === 'ami'){
                                 var bpOptions = [
-                                    { name:'Name',minWidth:150,field:'name' },
-                                    { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS'},
-                                    { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId'},
+                                    { name:'Name',minWidth:150,field:'name',cellTooltip: true },
+                                    { name:'InstanceOs',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceOS',cellTooltip: true},
+                                    { name:'vpcId',minWidth:150,field:'blueprintConfig.cloudProviderData.vpcId',cellTooltip: true},
                                     { name:'Region',minWidth:150,field:'blueprintConfig.cloudProviderData.region',visible: false},
                                     { name:'Template Type',minWidth:150,cellTemplate:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
                                     { name:'Instance Type',minWidth:150,field:'blueprintConfig.cloudProviderData.instanceType'},
-                                    { name:'Keypair',minWidth:150,field:'blueprintConfig.cloudProviderData.keyPairId',visible: false},
                                     { name:'Subnet',minWidth:150,field:'blueprintConfig.cloudProviderData.subnetId',visible: false},
-                                    { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]'},
+                                    { name:'Security Group',width:150,field:'blueprintConfig.cloudProviderData.securityGroupIds[0]',cellTooltip: true},
                                     { name:'Action',minWidth:200,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
@@ -57,7 +56,7 @@
                                 bpcolumnDefs = bpOptions;
                             } else if(val.templateType === 'cft') {
                                 var cftOptions = [
-                                    { name:'Name',minWidth:150,field:'name' },
+                                    { name:'Name',minWidth:150,field:'name',cellTooltip: true },
                                     { name:'Cloud Provider',minWidth:150,field:'blueprintConfig.cloudProviderType'},
                                     { name:'Region',minWidth:150,field:'blueprintConfig.region'},
                                     { name:'Template Type',minWidth:150,cellTemplate:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
@@ -69,9 +68,9 @@
                                 bpcolumnDefs = cftOptions;
                             } else if(val.templateType === 'arm') {
                                 var cftOptions = [
-                                    { name:'Name',minWidth:150,field:'name' },
+                                    { name:'Name',minWidth:150,field:'name',cellTooltip: true },
                                     { name:'Infra Manager Type',minWidth:150,field:'blueprintConfig.infraMangerType'},
-                                    { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup'},
+                                    { name:'Resource Group',minWidth:150,field:'blueprintConfig.resourceGroup',cellTooltip: true},
                                     { name:'Template Type',minWidth:150,cellTemplate:'<div>{{grid.appScope.getTemplate(row.entity.templateType)}}</div>'},
                                     { name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
index d16febcab..c70f46bb9 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
@@ -10,6 +10,7 @@
             createCBP.compositeBPType='chef';
             $scope.chefrunlist,$scope.cookbookAttributes = [];
             createCBP.onSubmit =false;
+            $scope.compositeEnabled = true;
             createCBP.newEnt={
                 bpName:''
             };
@@ -65,6 +66,7 @@
             };
             $scope.compositeSave =function () {
                 createCBP.onSubmit =true;
+                $scope.compositeEnabled = false;
                 if(!createCBP.newEnt.bpName  || !createCBP.SelectedBPList.length > 0){
                     return true;
                 }
@@ -94,6 +96,7 @@
                 gencSers.promisePost(params).then(function () {
                     toastr.success('Successfully Created.');
                     $state.go('dashboard.design.list',{providerName:$state.params.providerName,templateObj:$state.params.templateObj});
+                    $scope.compositeEnabled = true;
                 });
             };
             createCBP.createList();
diff --git a/client/cat3/src/partials/sections/dashboard/design/design.html b/client/cat3/src/partials/sections/dashboard/design/design.html
index 2823d9978..b0b0ea747 100644
--- a/client/cat3/src/partials/sections/dashboard/design/design.html
+++ b/client/cat3/src/partials/sections/dashboard/design/design.html
@@ -79,7 +79,7 @@
 				<li ng-if="state.params.templateObj.templatetypename !== 'Composite'" ng-class="{'active':state.current.name === 'dashboard.design.add'}" ui-sref="dashboard.design.add({providerName:state.params.providerName,templateObj:state.params.templateObj})"><a style="font-weight:600" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> New</a></li>
 				<li ng-if="state.params.templateObj.templatetypename === 'Composite'" ng-class="{'active':state.current.name === 'dashboard.design.compositeNew'}" ui-sref="dashboard.design.compositeNew({providerName:state.params.providerName,templateObj:state.params.templateObj})"><a style="font-weight:600" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> New</a></li>
 				<li class="form-group pull-right filter-btn" style="padding: 8px;" >
-					<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
+					<button type="button" title="Filter" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
 						<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
 					</button>
 				</li>
diff --git a/client/cat3/src/partials/sections/dashboard/design/design.scss b/client/cat3/src/partials/sections/dashboard/design/design.scss
index 18c3297ea..a748de6be 100755
--- a/client/cat3/src/partials/sections/dashboard/design/design.scss
+++ b/client/cat3/src/partials/sections/dashboard/design/design.scss
@@ -169,9 +169,6 @@ label {
 .activeLi{
     background: #E2E2E2 !important;
 }
-.bpListComp :hover{
-    cursor:move !important;
-}
 .badge :hover{
     cursor: pointer !important;
 }
@@ -284,127 +281,6 @@ label {
     }
 }
 
-
-
-#crumbs{
-    margin: auto;
-    width: 100%;
-}
-.stp{
-    font-size: 25px;
-}
-#crumbs ul {
-    list-style: none; display: block;
-
-}
-#crumbs ul li {
-    background: rgb(242, 242, 242); margin: 0px 20px; display: inline-block;
-    margin-bottom: 5px;
-}
-#crumbs ul li div {
-    margin: 0px 10px 0px 0px;    text-align: left; color: rgb(0, 0, 0); font-size: 12px; text-decoration: none; float: left; display: block; position: relative;
-}
-#crumbs ul li div br {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul li div  {
-    padding: 0px 0 0 7px;
-    font-size: 14px;
-    font-weight: 600;
-    width: 102%;
-}
-#crumbs ul li div::after {
-    top: 0px;
-    right: -34px;
-    border-top-color: transparent;
-    border-bottom-color: transparent;
-    border-left-color: rgb(242, 242, 242);
-    border-top-width: 22px;
-    border-bottom-width: 20px;
-    border-left-width: 24px;
-    border-top-style: solid;
-    border-bottom-style: solid;
-    border-left-style: solid;
-    position: absolute;
-    z-index: 1;
-    content: "";
-}
-#crumbs ul .active div::after{
-    border-top-width: 18px !important;
-    border-bottom-width: 32px !important;
-}
-#crumbs ul li div::before {
-    left: 0px; top: 0px; position: absolute; content: "";
-}
-#crumbs ul li:hover {
-    background: rgb(0, 158, 224); color: rgb(255, 255, 255);
-}
-#crumbs ul li div:hover::after {
-    border-left-color: rgb(0, 158, 224);
-}
-
-
-#crumbs ul li.finished {
-    background: #5cb85c;
-}
-#crumbs ul li.finished {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul li.finished div {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul li.finished div::after {
-    border-left-color: #5cb85c;
-}
-#crumbs ul li.finished:hover {
-    background: #40BAF1;
-}
-#crumbs ul li.finished:hover div::after {
-    border-left-color: #40BAF1;
-}
-ul.simple-list > li.finished::before {
-    color: rgb(255, 255, 255);
-}
-
-
-
-#crumbs ul li.selected {
-    background: #40BAF1;
-}
-#crumbs ul li.selected {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul li.selected div {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul li.selected div::after {
-    border-left-color: #40BAF1;
-}
-
-ul.simple-list > li:hover::before {
-    color: rgb(255, 255, 255);
-}
-ul.simple-list > li.selected::before {
-    color: rgb(255, 255, 255);
-}
-ul.simple-list {
-    padding: 0px; list-style-type: none; counter-reset: li-counter;
-}
-ul.simple-list > li {
-    margin-bottom: 20px; position: relative; min-height: 3em;
-}
-ul.simple-list > li:hover::before {
-    color: rgb(255, 255, 255);
-}
-ul.simple-list > li::after {
-    height: 0px; clear: both; display: block; visibility: hidden; content: "";
-}
-#crumbs ul.simple-list > li:hover div {
-    color: rgb(255, 255, 255);
-}
-#crumbs ul.simple-list > li:hover div::after {
-
-}
 .disabled{
     cursor:not-allowed !important;
     box-shadow: none;
@@ -454,3 +330,21 @@ fieldset#compBlueprint legend {
     margin-left: 10px;
     width: 98%;
 }
+
+.listPageView {
+    height: 450px;
+    overflow-y:auto;
+}
+
+.bpCardDetails {
+    width: 160px; 
+    padding: 0px;
+    position: relative; 
+    float: left;
+    margin-bottom: 5px;
+    margin-right: 8px;
+}
+
+.layersClassComposite {
+    margin-left: 10px;
+}
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
index a9b966b47..2616b32ca 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html
@@ -32,7 +32,8 @@
                   <div class="col-sm-2 col-lg-2 col-md-2 blueprintTemplate blueprintTemplateSelected" ng-show="templateSelected.templatetypename !== 'Docker'">
                      <ul class="list-unstyled system-prop" style="text-align:center;">
                         <li ng-if="templateSelected.templatetypename === 'SoftwareStack' || templateSelected.templatetypename === 'CloudFormation' || templateSelected.templatetypename === 'ARMTemplate'">
-                           <img style="height:40px;width:auto;" alt="templateLogo" ng-src="{{logo}}">
+                           <img style="height:40px;width:auto;" ng-if="templateSelected.templatesicon_filePath" alt="templateLogo" ng-src="{{filePath}}">
+                           <img style="height:40px;width:auto;" ng-if="!templateSelected.templatesicon_filePath" ng-src="{{logo}}">
                         </li>
                         <li ng-if="templateSelected.osType">
                            <img style="height:40px;width:auto;" alt="OSImage" ng-src="{{osImageLogo}}">
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html
index 0916798ee..ccfcc7f56 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/createComposite.html
@@ -37,8 +37,8 @@
                         <span class="red" ng-if=" createCBP.ExBlueprintList.length === 0 && createCBP.SelectedBPList.length === 0">No Data Found!</span>
                         <ul class="list-group" ui-sortable>
                            <li class="list-group-item" ng-repeat="bp in createCBP.ExBlueprintList | filter :searchText">
-                              <span class="badge cat-btn-update" ng-click="createCBP.addBP(createCBP.ExBlueprintList.indexOf(bp))" ><i class="fa fa-arrow-right white fa-2" aria-hidden="true"></i></span>
-                              <span class="badge cat-btn-update" ng-click="createCBP.selectBpInfo($event,bp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
+                              <span class="pull-right btn btn-xs cat-btn-update bpvicon" ng-click="createCBP.addBP(createCBP.ExBlueprintList.indexOf(bp))" ><i class="fa fa-arrow-right white fa-2" aria-hidden="true"></i></span>
+                              <span class="pull-right btn btn-xs cat-btn-update bpvicon" ng-click="createCBP.selectBpInfo($event,bp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
                               <img src="./images/rsz_layers.png" alt="{{bp.name}}"> &nbsp;{{bp.name}}
                            </li>
                         </ul>
@@ -59,10 +59,10 @@
                               dnd-moved="createCBP.SelectedBPList.splice($index, 1)"
                               dnd-effect-allowed="move"
                               dnd-selected="models.selected = selectedp"  ng-class=" {'activeLi':createCBP.selectBlueprintId === selectedp._id}">
-                              <span class="badge cat-btn-update" ng-click="createCBP.editSelectBpInfo($event,selectedp)" ><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
-                              <span class="badge cat-btn-update" ng-click="createCBP.selectBpInfo($event,selectedp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
-                              <span class="badge cat-btn-update" ng-click="createCBP.deSelect($event,createCBP.SelectedBPList.indexOf(selectedp))" ><i class="fa fa-arrow-left fa-2 white" aria-hidden="true"></i></span>
-                              <span class="badge pull-left" >{{(+createCBP.SelectedBPList.indexOf(selectedp)) +1}}</span><img src="./images/rsz_layers.png"  alt="{{selectedp.name}}"> &nbsp;{{selectedp.name}}
+                              <span class="pull-right btn btn-xs cat-btn-update bpvicon" ng-click="createCBP.editSelectBpInfo($event,selectedp)" ><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
+                              <span class="pull-right btn btn-xs cat-btn-update bpvicon" ng-click="createCBP.selectBpInfo($event,selectedp)" ><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>
+                              <span class="pull-right btn btn-xs cat-btn-update bpvicon" ng-click="createCBP.deSelect($event,createCBP.SelectedBPList.indexOf(selectedp))" ><i class="fa fa-arrow-left fa-2 white" aria-hidden="true"></i></span>
+                              <span class="badge pull-left" >{{(+createCBP.SelectedBPList.indexOf(selectedp)) +1}}</span><img class="layersClassComposite" src="./images/rsz_layers.png"  alt="{{selectedp.name}}"> &nbsp;{{selectedp.name}}
                            </li>
                         </ul>
                      </div>
@@ -106,7 +106,7 @@
                                  <tr class="runlistRow" ng-repeat="val in chefrunlist">
                                     <td>{{val.value}}</td>
                                     <td>
-                                       <span title="Edit Attributes" class="badge cat-btn-update" ng-click="updateCookbook()"><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
+                                       <span title="Edit Attributes" class="btn btn-xs cat-btn-update bpvicon" ng-click="updateCookbook()"><i class="fa fa-pencil-square-o fa-2 white" aria-hidden="true"></i></span>
                                     </td>
                                  </tr>
                               </tbody>
@@ -123,5 +123,5 @@
 </form>
 <div class="pager">
    <button class="btn  cat-btn-update" ng-click="previous(stpLen)" ng-disabled="!previousEnabled">Previous</button>
-   <button class="btn  cat-btn-update" ng-disabled="compositeBlueprintCreation.$invalid" ng-click="compositeSave()">Save</button>
+   <button class="btn  cat-btn-update" ng-disabled="compositeBlueprintCreation.$invalid" ng-click="compositeEnabled && compositeSave()">Save</button>
 </div>
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
index 38f656b00..5b5726135 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
@@ -5,18 +5,18 @@
     </div>
     <div class="col-lg-4 col-md-4 pull-right" >
         <button ng-show="state.params.templateObj.templatetypename !== 'Composite'" type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="bpList.viewTypeList = !bpList.viewTypeList">
-           <sapn ng-if="bpList.viewTypeList === false ">&nbsp;<i class="fa fa-list fa-2 white" aria-hidden="true"></i>&nbsp;</sapn>
-            <sapn ng-if="bpList.viewTypeList === true">&nbsp;<i class="fa fa-th-large white" aria-hidden="true"></i>&nbsp;</sapn>
+           <sapn title="Table View" ng-if="bpList.viewTypeList === false ">&nbsp;<i class="fa fa-list fa-2 white" aria-hidden="true"></i>&nbsp;</sapn>
+            <sapn title="Card View" ng-if="bpList.viewTypeList === true">&nbsp;<i class="fa fa-th-large white" aria-hidden="true"></i>&nbsp;</sapn>
         </button>
-        <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="refreshCurrentPageBp()">&nbsp;<i class="fa fa-refresh fa-2 white" aria-hidden="true"></i>&nbsp;</button>
-        <button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-if="bpList.selectedCards.length > 0 && bpList.viewTypeList === false" ng-click="bpList.copyBp(bpList.selectedCards)" ><i class="fa fa-clone fa-2 white" aria-hidden="true"></i>&nbsp;Copy</button>
+        <button type="button" title="Refresh" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="refreshCurrentPageBp()">&nbsp;<i class="fa fa-refresh fa-2 white" aria-hidden="true"></i>&nbsp;</button>
+        <button type="button" title="Copy" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-if="bpList.selectedCards.length > 0 && bpList.viewTypeList === false" ng-click="bpList.copyBp(bpList.selectedCards)" ><i class="fa fa-clone fa-2 white" aria-hidden="true"></i>&nbsp;Copy</button>
     </div>
 </div>
 <div class="col-lg-12">
     <br>
     <div ng-if="bpList.pager.totalRecords <= 0" class="alert alert-info text-center"> No Data Found!</div>
-    <div ng-show="state.params.templateObj.templatetypename === 'Composite'">
-        <div ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false " style="width: 160px; margin: auto; padding: 0px;position: relative; float: left;">
+    <div class="listPageView" ng-show="state.params.templateObj.templatetypename === 'Composite'">
+        <div class="bpCardDetails" ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false ">
             <div class="anm" style="background: #FFF; position: absolute; z-index: 1;width: 100%; bottom: 0px;margin: 0 8px;"></div>
             <div class="productdiv4" id="{{blueprint._id}}" >
             <div class="productdiv1 cardimage" ng-class="{'selected' :bpList[blueprint._id] === true }" >
@@ -37,8 +37,8 @@
     </div>
 
     <div ng-show="state.params.templateObj.templatetypename !== 'Composite'">
-        <div ng-show="bpList.pager.totalRecords > 0 && bpList.viewTypeList === false">
-            <div ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false " style="width: 160px; margin: auto; padding: 0px;position: relative; float: left;">
+        <div class="listPageView" ng-show="bpList.pager.totalRecords > 0 && bpList.viewTypeList === false">
+            <div class="bpCardDetails" ng-repeat="blueprint in bpList.blueprintList.card" ng-init="bpList[blueprint._id]= false ">
             <div class="anm" style="background: #FFF; position: absolute; z-index: 1;width: 100%; bottom: 0px;margin: 0 8px;"></div>
             <div class="productdiv4" id="{{blueprint._id}}" >
                 <div class="productdiv1 cardimage" ng-class="{'selected' :bpList[blueprint._id] === true }" >
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
index 2eaccb24e..3b62220a4 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/blueprint.scss
@@ -46,6 +46,10 @@
 		overflow-y: auto;
 	}
 
+	.titleName {
+		word-wrap: break-word;
+	}
+
 	.td-padding {
 			padding-left: 18px;
 			padding-top:16px;
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
index 1e24c6147..21b542d0d 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintInfo.html
@@ -1,7 +1,7 @@
 <div id='blueprintInfoPage'>
 	<div class="modal-header">
 		<span class="close" ng-click="cancel()">×</span>
-		<h4 class="modal-title"> Blueprint Information - {{blueprintInfo.name}}</h4>
+		<h4 class="modal-title titleName"> Blueprint Information - {{blueprintInfo.name}}</h4>
 	</div>
 
 	<div class="modal-body">
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
index d7db20466..b9fd89e7e 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchParamsCtrl.js
@@ -70,7 +70,7 @@
 					};
 					workzoneServices.launchCompsiteBlueprint(compBlue).success(function() {
                         toastr.success('Successfully launched composite blueprint');
-                        return false;
+                        $modalInstance.close(compBlue);
 					}).error(function(data) {
                         toastr.error(data.message, 'Error');
 					});

From 0b5330f0a4fbd5137ab09b876c57e51df3c6ca59 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Thu, 24 Nov 2016 18:43:40 +0530
Subject: [PATCH 03/18] Added saved time as NA for executions which are failed.

---
 .../popups/orchestrationHistoryCtrl.js        | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
index a9597fd4d..bc3987c21 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationHistoryCtrl.js
@@ -20,11 +20,10 @@
 				$scope.taskHistoryChefGridOptions.columnDefs = [
 				{ name:'Start Time',field:'timestampStarted',cellTemplate:'<span title="{{row.entity.timestampStarted  | timestampToLocaleTime}}">{{row.entity.timestampStarted  | timestampToLocaleTime}}</span>', sort:{ direction: 'desc'}, cellTooltip: true},
 				{ name:'End Time',field:'timestampEnded',cellTemplate:'<span title="{{row.entity.timestampEnded  | timestampToLocaleTime}}">{{row.entity.timestampEnded  | timestampToLocaleTime}}</span>', cellTooltip: true},
-				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success" title="NA">NA</span>', cellTooltip: true},
+				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>'},
 				{ name:'Manual Time',cellTemplate:'<span title="10 mins">10 mins</span>', cellTooltip: true},
-				{ name:'Saved Time',cellTemplate:'<span>{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success" title="NA">NA</span>', cellTooltip: true},
+				{ name:'Saved Time',cellTemplate:'<span ng-if="row.entity.status == \'success\'">{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
+					'<span ng-if="row.entity.status !== \'success\'" title="NA">NA</span>', cellTooltip: true},
 				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status}}">{{row.entity.status}}</div>', cellTooltip: true},
 				{ name:'Message', field: 'message', 
 				  cellTemplate:'<span title="{{row.entity.message}}">{{row.entity.message}}</span>'},
@@ -84,11 +83,10 @@
 				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status.toUpperCase()}}">{{row.entity.status.toUpperCase()}}</div>'},
 				{ name:'Start Time',field:'timestampStarted',cellTemplate:'<span title="{{row.entity.timestampStarted  | timestampToLocaleTime}}">{{row.entity.timestampStarted  | timestampToLocaleTime}}</span>',cellTooltip: true},
 				{ name:'End Time',field:'timestampEnded',cellTemplate:'<span title="{{row.entity.timestampEnded  | timestampToLocaleTime}}">{{row.entity.timestampEnded  | timestampToLocaleTime}}</span>',cellTooltip: true},
-				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success title="NA">NA</span>', cellTooltip: true},
+				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>'},
 				{ name:'Manual Time',cellTemplate:'<span title="10 mins">10 mins</span>', cellTooltip: true},
-				{ name:'Saved Time',cellTemplate:'<span>{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success" title="NA">NA</span>', cellTooltip: true}
+				{ name:'Saved Time',cellTemplate:'<span ng-if="row.entity.status === \'success\'">{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
+					'<span ng-if="row.entity.status !== \'success\'" title="NA">NA</span>', cellTooltip: true}
 				];
 			};
 			angular.extend($scope, {
@@ -212,11 +210,10 @@
 				$scope.taskHistoryScriptGridOptions.columnDefs = [
 				{ name:'Start Time',field:'timestampStarted',cellTemplate:'<span title="{{row.entity.timestampStarted  | timestampToLocaleTime}}">{{row.entity.timestampStarted  | timestampToLocaleTime}}</span>', sort:{ direction: 'desc'}, cellTooltip: true},
 				{ name:'End Time',field:'timestampEnded',cellTemplate:'<span title="{{row.entity.timestampEnded  | timestampToLocaleTime}}">{{row.entity.timestampEnded  | timestampToLocaleTime}}</span>', cellTooltip: true},
-				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success" title="NA">NA</span>', cellTooltip: true},
+				{ name:'Execution Time',cellTemplate:'<span>{{grid.appScope.getExecutionTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>'},
 				{ name:'Manual Time',cellTemplate:'<span title="10 mins">10 mins</span>', cellTooltip: true},
-				{ name:'Saved Time',cellTemplate:'<span>{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
-					'<span ng-if="row.entity.status === success" title="NA">NA</span>', cellTooltip: true},
+				{ name:'Saved Time',cellTemplate:'<span ng-if="row.entity.status === \'success\'">{{grid.appScope.getSavedTime(row.entity.timestampEnded,row.entity.timestampStarted)}} mins</span>' +
+					'<span ng-if="row.entity.status !== \'success\'" title="NA">NA</span>', cellTooltip: true},
 				{ name:'Status',field:'status',cellTemplate:'<div class="{{row.entity.status}}">{{row.entity.status}}</div>', cellTooltip: true},
 				{ name:'Message', field: 'message', 
 				  cellTemplate:'<span title="{{row.entity.message}}">{{row.entity.message}}</span>'},

From 597b997ae604d5f3d655f066a1b9914a80176b0b Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Thu, 24 Nov 2016 18:47:20 +0530
Subject: [PATCH 04/18] Changed delete button color in design

---
 .../dashboard/design/controllers/blueprintListCtrl.js     | 8 ++++----
 .../sections/dashboard/design/view/designListView.html    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
index 24f8534fc..63e1a58ad 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js
@@ -35,7 +35,7 @@
                                     { name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
-                                    '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
+                                    '&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
                                 ];
                                 bpcolumnDefs = dockerOptions;
                             } else if(val.templateType === 'chef' || val.templateType === 'ami'){
@@ -51,7 +51,7 @@
                                     { name:'Action',minWidth:200,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
-                                    '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
+                                    '&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
                                 ];
                                 bpcolumnDefs = bpOptions;
                             } else if(val.templateType === 'cft') {
@@ -63,7 +63,7 @@
                                     { name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
-                                    '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
+                                    '&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
                                 ];
                                 bpcolumnDefs = cftOptions;
                             } else if(val.templateType === 'arm') {
@@ -75,7 +75,7 @@
                                     { name:'Action',minWidth:150,cellTemplate:'<span class="btn btn-xs cat-btn-update bpvicon" title="Clone" ng-click="grid.appScope.copyBp(row.entity._id)"><i class="fa fa-clone fa-2 white" aria-hidden="true"></i></span> ' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="grid.appScope.blueprintInfo($event,row.entity,null);"><i class="fa fa-info fa-2 white" aria-hidden="true"></i></span>' +
                                     '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Launch"  ng-click="grid.appScope.launchInstance($event,row.entity);"><i class="fa fa-location-arrow fa-2 white" aria-hidden="true"></i></span>' +
-                                    '&nbsp; <span class="btn btn-xs cat-btn-update bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
+                                    '&nbsp; <span class="btn btn-xs btn-danger bpvicon" title="Delete"  ng-click="grid.appScope.deleteBp($event,row.entity,null);"><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></span>'}
                                 ];
                                 bpcolumnDefs = cftOptions;
                             }
diff --git a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
index 5b5726135..7a1ca48fc 100755
--- a/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
+++ b/client/cat3/src/partials/sections/dashboard/design/view/designListView.html
@@ -28,7 +28,7 @@
                     <hr class="blue-hr"/>
                     <button class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="bpList.launchInstance($event,blueprint);"><i class="fa fa-location-arrow fa-2 white"></i></button>
                     <button class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="bpList.blueprintInfo($event,blueprint,'composite')"><i class="fa fa-info fa-2 white"></i></button>
-                    <button class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="bpList.deleteBp($event,blueprint,'composite')" ><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></button>
+                    <button class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="bpList.deleteBp($event,blueprint,'composite')" ><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></button>
                 </ul>
 
             </div>
@@ -50,7 +50,7 @@
                         <li class='btns-group'>
                         <button class="btn btn-xs cat-btn-update bpvicon" title="Launch" ng-click="bpList.launchInstance($event,blueprint);"><i class="fa fa-location-arrow fa-2 white"></i></button>
                         <button class="btn btn-xs cat-btn-update bpvicon" title="Info" ng-click="bpList.blueprintInfo($event,blueprint,null)"><i class="fa fa-info fa-2 white"></i></button>
-                        <button class="btn btn-xs cat-btn-update bpvicon" title="Delete" ng-click="bpList.deleteBp($event,blueprint,null)" ><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></button>
+                        <button class="btn btn-xs btn-danger bpvicon" title="Delete" ng-click="bpList.deleteBp($event,blueprint,null)" ><i class="fa fa-trash-o fa-2 white" aria-hidden="true"></i></button>
                         </li>
                     </ul>
 

From 7f4407ecdeacd3e9e5285ffc37d18219037fd817 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Thu, 24 Nov 2016 19:05:14 +0530
Subject: [PATCH 05/18] UI fixes in New Task Page.

---
 .../workzone/orchestration/popups/newTask.html      | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
index 419ad7d90..502f64228 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
+++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html
@@ -283,7 +283,7 @@ <h5>Jenkins</h5>
 													<label class="lable-align">No</label>
 												</div>
 											</div>
-											<div class="col-lg-1 col-md-1">
+											<div class="col-lg-1 col-md-1 no-padding">
 												<i class="fa fa-question-circle" title="This feature fetches the entire Jenkins job history for the particular job"></i>
 											</div>
 										</td>
@@ -296,9 +296,6 @@ <h5>Jenkins</h5>
 													</span>
 												<input type="text" disabled="" class="jenkinsJobURL form-control" ng-model="jobUrl">
 											</div>
-											<div class="col-lg-1 col-md-1">
-												<!--<img style="width:16px;height:16px;margin-top:8px;" id="helpImage" tabindex="50" class="hidden" data-toggle="popover" data-placement="left" data-content="This is the URL for a particular JOB selected by the User available in the Jenkins Server" src="img/help.png" data-original-title="" title="" />-->
-											</div>
 										</td>
 									</tr>
 									<tr>
@@ -306,9 +303,9 @@ <h5>Jenkins</h5>
 										</td>
 										<td>
 											<div class="col-lg-11 col-md-11 col-sm-11 col-xs-11 jobTable">
-														<span class="pull-right">
-															<i class="fa fa-plus-circle cursor" title="Add Job Links" ng-click="openAddJobLink('new');"></i>
-														</span>
+												<span class="pull-right">
+													<i class="fa fa-plus-circle cursor" title="Add Job Links" ng-click="openAddJobLink('new');"></i>
+												</span>
 												<div id="dbNameTable_wrapper" class="dataTables_wrapper no-footer">
 													<div id="tableJobList_wrapper" class="dataTables_wrapper no-footer">
 														<table class="table table-bordered">
@@ -329,7 +326,7 @@ <h5>Jenkins</h5>
 													</div>
 												</div>
 											</div>
-											<div class="col-lg-1 col-md-1">
+											<div class="col-lg-1 col-md-1 no-padding">
 												<i class="fa fa-question-circle" title="This is a URL pattern for the job result or job output"></i>
 											</div>
 										</td>

From ec0a81b1e168a23ca8596d31d92e50700496e066 Mon Sep 17 00:00:00 2001
From: srikanthv02 <srikanthv02@gmail.com>
Date: Fri, 25 Nov 2016 10:54:54 +0530
Subject: [PATCH 06/18] After copy of blueprint

---
 .../sections/dashboard/design/services/blueprintListServices.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
index 6d6d6be13..a88be966f 100755
--- a/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
+++ b/client/cat3/src/partials/sections/dashboard/design/services/blueprintListServices.js
@@ -86,6 +86,7 @@
                     };
                     genericServices.promisePost(params).then(function () {
                         toastr.success('Successfully copied.');
+                        $rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
                     });
                 });
             };

From cd54f06fa3cfcff5b3e45af381486a0856ddabba Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 25 Nov 2016 12:16:07 +0530
Subject: [PATCH 07/18] CAT-2528 and CAT-2529 Fixed

---
 .../sections/dashboard/bots/controller/libraryCtrl.js  |  4 ++--
 server/app/services/auditTrailService.js               |  4 ++--
 server/app/services/instanceService.js                 | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 7465e3e7f..6649f9925 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -102,7 +102,7 @@
         lib.init =function(){
             lib.gridOptions.data=[];
             var param={
-                url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true'
+                url:'/blueprints?serviceDeliveryCheck=true'
                 //url:'src/partials/sections/dashboard/bots/data/bp.json'
             };
             genSevs.promiseGet(param).then(function (result) {
@@ -112,7 +112,7 @@
                 });
             });
             var param2={
-               url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true'
+               url:'/tasks?serviceDeliveryCheck=true'
                // url:'src/partials/sections/dashboard/bots/data/t.json'
             };
             genSevs.promiseGet(param2).then(function (resultTask) {
diff --git a/server/app/services/auditTrailService.js b/server/app/services/auditTrailService.js
index 887147c3d..6d0210da4 100644
--- a/server/app/services/auditTrailService.js
+++ b/server/app/services/auditTrailService.js
@@ -180,10 +180,10 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
             tasks = require('_pr/model/classes/tasks/tasks.js');
             async.parallel({
                 botsTask:function(callback){
-                    tasks.getTasksServiceDeliveryCheck('true',callback);
+                    tasks.getAllServiceDeliveryTask('true',callback);
                 },
                 botsBlueprint:function(callback){
-                    blueprints.getBlueprintsServiceDeliveryCheck('true',callback);
+                    blueprints.getAllServiceDeliveryBlueprint('true',callback);
                 }
             },function(err,results){
                 if(err){
diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 7ec69d85f..fe7a59a4d 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -1509,7 +1509,15 @@ function updateScheduler(instanceScheduler, callback) {
 function generateCronPattern(cronInterval,startDate,endDate,callback){
     var startIntervalList =[],stopIntervalList=[],count = 0;
     if(cronInterval.length === 0){
-        return cronInterval;
+        var scheduler= {
+            instanceStartScheduler: startIntervalList,
+            instanceStopScheduler: stopIntervalList,
+            schedulerStartOn: Date.parse(startDate),
+            schedulerEndOn: Date.parse(endDate),
+            isScheduled: false
+        }
+        callback(null,scheduler);
+        return;
     }else{
         for(var i = 0; i < cronInterval.length; i++){
             (function(interval){

From 933d29ef5d9a5fb15686823a779f1332ab828cf9 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Fri, 25 Nov 2016 12:28:20 +0530
Subject: [PATCH 08/18] Library UI changes.

---
 .../sections/dashboard/bots/bots.scss         |  3 +-
 .../dashboard/bots/controller/libraryCtrl.js  | 38 ++++++++++++-------
 .../sections/dashboard/bots/view/library.html |  8 ++--
 3 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
index 4f74426cb..49d4ceed2 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
@@ -41,13 +41,12 @@
 
   .summary-container {
     width: 100%;
-    background-color: #ecf0f5;
   }
 
   .info-box {
     display: block;
     min-height: 90px;
-    background: #fff;
+    background: #ecf0f5;
     width: 100%;
     box-shadow: 0 1px 1px rgba(0,0,0,0.1);
     border-radius: 2px;
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index b7277d751..861581a4b 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -30,6 +30,8 @@
                 { name: 'description',field:'shortDesc'},
                 { name: 'BOT History',displayName: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
                         '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
+                        { name: 'BOT Info',displayName: 'BOT Info',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
+                        '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-info white"></i></span>'},
                 { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
                     '<span class="btn btn-danger control-panel-button" title="Delete Task" ng-show="row.entity.taskType" ng-click="grid.appScope.deleteBotTask(row.entity);"><i class="fa fa-trash-o white"></i></span>' + 
                     '<span class="btn btn-danger control-panel-button" title="Delete Blueprint" ng-show="row.entity.blueprintType" ng-click="grid.appScope.deleteBotBP(row.entity);"><i class="fa fa-trash-o white"></i></span>'
@@ -99,20 +101,30 @@
         $scope.RefreshBotsLibrary = function() {
             lib.init();
         };
-        /*$scope.showBotsRunning = function() {
-            $scope.botSummary=[];
-            var url = '/audit-trail/bot-summary';
-            $http.get(url).then(function (response) {
-                $scope.botSummary = response.data;
+        $scope.showBotsRunning = function() {
+            lib.gridOptions.data=[];
+            var param={
+                url:'/tasks?serviceDeliveryCheck=true&actionStatus=running'
+            };
+            genSevs.promiseGet(param).then(function (result) {
+                angular.forEach(result,function (val) {
+                    lib.gridOptions.data.push(val);
+                });
             });
-        }
+            lib.summary();
+        };
         $scope.showFailedBots = function() {
-            $scope.botSummary=[];
-            var url = '/audit-trail/bot-summary';
-            $http.get(url).then(function (response) {
-                $scope.botSummary = response.data;
+            lib.gridOptions.data=[];
+            var param={
+                url:'/tasks?serviceDeliveryCheck=true&actionStatus=failed'
+            };
+            genSevs.promiseGet(param).then(function (result) {
+                angular.forEach(result,function (val) {
+                    lib.gridOptions.data.push(val);
+                });
             });
-        }*/
+            lib.summary();
+        };
         lib.summary = function() {
             $scope.botSummary=[];
             var param={
@@ -126,7 +138,7 @@
         lib.init =function(){
             lib.gridOptions.data=[];
             var param={
-                url:'/blueprints/serviceDelivery/?serviceDeliveryCheck=true'
+                url:'/blueprints?serviceDeliveryCheck=true'
             };
             genSevs.promiseGet(param).then(function (result) {
                 angular.forEach(result,function (val) {
@@ -135,7 +147,7 @@
                 });
             });
             var param2={
-               url:'/tasks/serviceDelivery/?serviceDeliveryCheck=true'
+               url:'/tasks?serviceDeliveryCheck=true'
             };
             genSevs.promiseGet(param2).then(function (resultTask) {
                 angular.forEach(resultTask,function (val) {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
index ac5b989c3..4ca8dfc22 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -13,7 +13,7 @@
 			<div class="col-md-3 col-sm-6 col-xs-12">
 				<div class="info-box">
 					<span class="info-box-icon bg-aqua">
-						<i class="fa fa-th" style="color: #fff"></i>
+						<i class="fa fa-th" style="color: #ecf0f5"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Total Number of BOTs</span>
@@ -24,7 +24,7 @@
 			<div class="col-md-3 col-sm-6 col-xs-12">
 				<div class="info-box" ng-click="showBotsRunning()">
 					<span class="info-box-icon bg-green">
-						<i class="fa fa-laptop" style="color: #fff"></i>
+						<i class="fa fa-laptop" style="color: #ecf0f5"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Number of BOTs running</span>
@@ -35,7 +35,7 @@
 			<div class="col-md-3 col-sm-6 col-xs-12">
 				<div class="info-box">
 					<span class="info-box-icon bg-yellow">
-						<i class="fa fa-cube" style="color: #fff"></i>
+						<i class="fa fa-cube" style="color: #ecf0f5"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Total Time saved</span>
@@ -46,7 +46,7 @@
 			<div class="col-md-3 col-sm-6 col-xs-12">
 				<div class="info-box" ng-click="showFailedBots()">
 					<span class="info-box-icon bg-red">
-						<i class="fa fa-external-link" style="color: #fff"></i>
+						<i class="fa fa-external-link" style="color: #ecf0f5"></i>
 					</span>
 					<div class="info-box-content">
 					  <span class="info-box-text">Number of failed runs</span>

From b3da8f44ef2a3f12a2c4bbf2a573ff4129ebb167 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Fri, 25 Nov 2016 15:06:47 +0530
Subject: [PATCH 09/18] Bots summary selecteion related UI changes.

---
 .../sections/dashboard/bots/bots.scss         | 24 +++++--------------
 .../dashboard/bots/controller/libraryCtrl.js  | 10 ++++++++
 .../sections/dashboard/bots/view/library.html |  6 ++---
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
index 49d4ceed2..e4177a055 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss
+++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss
@@ -43,29 +43,21 @@
     width: 100%;
   }
 
+  .selected {
+    border: 2px solid #000;
+    height: 94px !important;
+    margin-top: 13px !important;
+  }
+
   .info-box {
     display: block;
     min-height: 90px;
     background: #ecf0f5;
     width: 100%;
     box-shadow: 0 1px 1px rgba(0,0,0,0.1);
-    border-radius: 2px;
     margin: 15px 0;
   }
 
-  .ion {
-    display: inline-block;
-    font-family: "Ionicons";
-    speak: none;
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    text-transform: none;
-    text-rendering: auto;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
-  }
-
   .info-box-content {
     padding: 5px 10px;
     margin-left: 90px;
@@ -90,10 +82,6 @@
   }
 
   .info-box-icon {
-    border-top-left-radius: 2px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 2px;
     display: block;
     float: left;
     height: 90px;
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 861581a4b..deac6d5d6 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -12,6 +12,7 @@
         var treeNames = ['Bots','Library'];
         $rootScope.$emit('treeNameUpdate', treeNames);
         var lib=this;
+        $scope.totalBotsSelected = true;
         lib.gridOptions={
             gridOption:{
                 paginationPageSizes: [10, 25, 50, 75],
@@ -99,9 +100,15 @@
             lib.init();
         });
         $scope.RefreshBotsLibrary = function() {
+            $scope.totalBotsSelected = true;
+            $scope.runningBotsselected = false;
+            $scope.failedBotsselected = false;
             lib.init();
         };
         $scope.showBotsRunning = function() {
+            $scope.runningBotsselected = true;
+            $scope.totalBotsSelected = false;
+            $scope.failedBotsselected = false;
             lib.gridOptions.data=[];
             var param={
                 url:'/tasks?serviceDeliveryCheck=true&actionStatus=running'
@@ -114,6 +121,9 @@
             lib.summary();
         };
         $scope.showFailedBots = function() {
+            $scope.failedBotsselected = true;
+            $scope.runningBotsselected = false;
+            $scope.totalBotsSelected = false;
             lib.gridOptions.data=[];
             var param={
                 url:'/tasks?serviceDeliveryCheck=true&actionStatus=failed'
diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
index 4ca8dfc22..460bf2417 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html
+++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html
@@ -11,7 +11,7 @@
 	<div class="container summary-container">
 		<div class="panel-group text-center">
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box">
+				<div class="info-box cursor" ng-click="RefreshBotsLibrary()" ng-class="{'selected':totalBotsSelected === true}">
 					<span class="info-box-icon bg-aqua">
 						<i class="fa fa-th" style="color: #ecf0f5"></i>
 					</span>
@@ -22,7 +22,7 @@
 				</div>
 			</div>
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box" ng-click="showBotsRunning()">
+				<div class="info-box cursor" ng-click="showBotsRunning()" ng-class="{'selected':runningBotsselected === true}">
 					<span class="info-box-icon bg-green">
 						<i class="fa fa-laptop" style="color: #ecf0f5"></i>
 					</span>
@@ -44,7 +44,7 @@
 				</div>
 			</div>
 			<div class="col-md-3 col-sm-6 col-xs-12">
-				<div class="info-box" ng-click="showFailedBots()">
+				<div class="info-box cursor" ng-click="showFailedBots()" ng-class="{'selected':failedBotsselected === true}">
 					<span class="info-box-icon bg-red">
 						<i class="fa fa-external-link" style="color: #ecf0f5"></i>
 					</span>

From 0acc6e0c4ff7495f9ad5a8fb1869938fda0a0b71 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Fri, 25 Nov 2016 15:12:12 +0530
Subject: [PATCH 10/18] removed unused code

---
 .../partials/sections/dashboard/bots/controller/libraryCtrl.js  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index deac6d5d6..dd78cb560 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -31,8 +31,6 @@
                 { name: 'description',field:'shortDesc'},
                 { name: 'BOT History',displayName: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
                         '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
-                        { name: 'BOT Info',displayName: 'BOT Info',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
-                        '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-info white"></i></span>'},
                 { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
                     '<span class="btn btn-danger control-panel-button" title="Delete Task" ng-show="row.entity.taskType" ng-click="grid.appScope.deleteBotTask(row.entity);"><i class="fa fa-trash-o white"></i></span>' + 
                     '<span class="btn btn-danger control-panel-button" title="Delete Blueprint" ng-show="row.entity.blueprintType" ng-click="grid.appScope.deleteBotBP(row.entity);"><i class="fa fa-trash-o white"></i></span>'

From bc01d5c60889e378bfaab2c00e3016979d94c6d9 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 25 Nov 2016 15:53:46 +0530
Subject: [PATCH 11/18] Task Scheduler Implementation

---
 server/app/model/classes/tasks/tasks.js | 92 ++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 1 deletion(-)

diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index 26f2032ed..c0eeff3c5 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -130,7 +130,97 @@ var taskSchema = new Schema({
         type: String,
         required: true,
         trim: true
-    }
+    },
+    isTaskScheduled:{
+        type: Boolean,
+        required: false,
+        default:false
+    },
+    startTaskScheduler:{
+        startOn: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        endOn: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        cronPatten: {
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronRepeat: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        cronTime:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronDays:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronMonth:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronYear:{
+            type: String,
+            required: false,
+            trim: true
+        }
+    },
+    stopTaskScheduler:{
+        startOn: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        endOn: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        cronPatten: {
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronRepeat: {
+            type: Number,
+            required: false,
+            trim: true
+        },
+        cronTime:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronDays:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronMonth:{
+            type: String,
+            required: false,
+            trim: true
+        },
+        cronYear:{
+            type: String,
+            required: false,
+            trim: true
+        }
+    },
+    cronJobIds:[String]
 });
 taskSchema.plugin(mongoosePaginate);
 

From 88e846853bf284f0376dcf7a7d2c73ca4a968f88 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 25 Nov 2016 16:14:01 +0530
Subject: [PATCH 12/18] Task Scheduler Implementation

---
 server/app/model/classes/tasks/tasks.js | 10 +++++-----
 server/app/services/taskService.js      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index c0eeff3c5..b28800879 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -194,28 +194,28 @@ var taskSchema = new Schema({
             required: false,
             trim: true
         },
-        cronRepeat: {
+        cronFrequency: {
             type: Number,
             required: false,
             trim: true
         },
         cronTime:{
-            type: String,
+            type: [String],
             required: false,
             trim: true
         },
         cronDays:{
-            type: String,
+            type: [String],
             required: false,
             trim: true
         },
         cronMonth:{
-            type: String,
+            type: [String],
             required: false,
             trim: true
         },
         cronYear:{
-            type: String,
+            type: [String],
             required: false,
             trim: true
         }
diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js
index 04b0f49a9..b0d377646 100644
--- a/server/app/services/taskService.js
+++ b/server/app/services/taskService.js
@@ -62,7 +62,7 @@ taskService.getAllServiceDeliveryTask = function getAllServiceDeliveryTask(query
                 var results = [];
                 if (auditTrailList.length > 0) {
                     for (var i = 0; i < auditTrailList.length; i++) {
-                        if (taskIds.indexOf(auditTrailList[i].auditId) > -1) {
+                        if (taskIds.indexOf(auditTrailList[i].auditId) < 0) {
                             results.push(auditTrailList[i].auditId);
                             taskIds.push(auditTrailList[i].auditId);
                         } else {

From b4f93cd0e61af06a013677be28850a63b010adb6 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 25 Nov 2016 16:50:44 +0530
Subject: [PATCH 13/18] Task Scheduler Implementation

---
 server/app/lib/utils/apiUtil.js               | 54 ++++++++++---------
 server/app/model/classes/tasks/tasks.js       | 49 +++--------------
 .../app/routes/v1.0/routes_organizations.js   |  3 ++
 server/app/routes/v1.0/routes_tasks.js        |  3 ++
 server/app/services/blueprintService.js       |  2 +-
 5 files changed, 43 insertions(+), 68 deletions(-)

diff --git a/server/app/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js
index 0cda9be8c..0ac9e89cd 100644
--- a/server/app/lib/utils/apiUtil.js
+++ b/server/app/lib/utils/apiUtil.js
@@ -32,58 +32,64 @@ var ApiUtil = function() {
         }
         return errObj;
     }
-    this.createCronJobPattern= function(scheduler,startOn){
-        scheduler.repeatEvery = parseInt(scheduler.repeatEvery);
-        if(scheduler.repeats ==='Minutes'){
-            scheduler.pattern = '*/'+scheduler.repeatEvery+' * * * *';
-        }else if(scheduler.repeats ==='Hourly'){
-            scheduler.pattern = '0 */'+scheduler.repeatEvery+' * * *';
-        }else if(scheduler.repeats ==='Daily'){
-            var startOn = Date.parse(startOn);
+    this.createCronJobPattern= function(scheduler){
+        scheduler.cronRepeatEvery = parseInt(scheduler.cronRepeatEvery);
+        if(scheduler.cronFrequency ==='Minutes'){
+            scheduler.pattern = '*/'+scheduler.cronRepeatEvery+' * * * *';
+        }else if(scheduler.cronFrequency ==='Hourly'){
+            scheduler.pattern = '0 */'+scheduler.cronRepeatEvery+' * * *';
+        }else if(scheduler.cronFrequency ==='Daily'){
+            var startOn = Date.parse(scheduler.cronStartOn);
             var startHours= startOn.getHours();
             var startMinutes= startOn.getMinutes();
-            scheduler.pattern = startMinutes+' '+startHours+' */'+scheduler.repeatEvery+' * *';
-        }else if(scheduler.repeats ==='Weekly') {
-            var startOn = Date.parse(startOn);
+            scheduler.pattern = startMinutes+' '+startHours+' */'+scheduler.cronRepeatEvery+' * *';
+        }else if(scheduler.cronFrequency ==='Weekly') {
+            var startOn = Date.parse(scheduler.cronStartOn);
             var startDay= startOn.getDay();
             var startHours= startOn.getHours();
             var startMinutes= startOn.getMinutes();
-            if(scheduler.repeatEvery === 2) {
+            if(scheduler.cronRepeatEvery === 2) {
                 scheduler.pattern = startMinutes+' '+startHours+' 8-14 * ' + startDay;
-            }else if(scheduler.repeatEvery === 3) {
+            }else if(scheduler.cronRepeatEvery === 3) {
                 scheduler.pattern = startMinutes+' '+startHours+' 15-21 * ' + startDay;
-            }else if(scheduler.repeatEvery === 4) {
+            }else if(scheduler.cronRepeatEvery === 4) {
                 scheduler.pattern = startMinutes+' '+startHours+' 22-28 * ' + startDay;
             }else{
                 scheduler.pattern = startMinutes+' '+startHours+' * * ' + startDay;
             }
         }
-        if(scheduler.repeats ==='Monthly') {
-            var startOn = Date.parse(startOn);
+        if(scheduler.cronFrequency ==='Monthly') {
+            var startOn = Date.parse(scheduler.cronStartOn);
             var startDate= startOn.getDate();
             var startMonth= startOn.getMonth();
             var startDay= startOn.getDay();
             var startHours= startOn.getHours();
             var startMinutes= startOn.getMinutes();
-            if(scheduler.repeatEvery === 1) {
+            if(scheduler.cronRepeatEvery === 1) {
                 scheduler.pattern = startMinutes+' '+startHours+' '+startDate+' * *';
             }else{
-                scheduler.pattern = startMinutes+' '+startHours+' '+startDate+' */'+scheduler.repeatEvery+' *';
+                scheduler.pattern = startMinutes+' '+startHours+' '+startDate+' */'+scheduler.cronRepeatEvery+' *';
             }
         }
-        if(scheduler.repeats ==='Yearly') {
-            var startOn = Date.parse(startOn);
+        if(scheduler.cronFrequency ==='Yearly') {
+            var startOn = Date.parse(scheduler.cronStartOn);
             var startDate= startOn.getDate();
             var startYear= startOn.getFullYear();
             var startMonth= startOn.getMonth();
             var startHours= startOn.getHours();
             var startMinutes= startOn.getMinutes();
-            scheduler.pattern ='0 '+startMinutes+' '+startHours+' '+startDate+' '+startMonth+' ? '+startYear/scheduler.repeatEvery;
+            scheduler.pattern ='0 '+startMinutes+' '+startHours+' '+startDate+' '+startMonth+' ? '+startYear/scheduler.cronRepeatEvery;
         }
         var cronScheduler = {
-            "repeats": scheduler.repeats,
-            "repeatEvery": scheduler.repeatEvery,
-            "cronPattern":scheduler.pattern
+            "cronFrequency": scheduler.cronFrequency,
+            "cronRepeatEvery": scheduler.cronRepeatEvery,
+            "cronPattern":scheduler.pattern,
+            "cronStartOn":Date.parse(scheduler.cronStartOn),
+            "cronEndOn":Date.parse(scheduler.cronEndOn),
+            "cronTime":scheduler.cronTime,
+            "cronDays":scheduler.cronDays,
+            "cronMonths":scheduler.cronMonths,
+            "cronYears":scheduler.cronYears
         }
         return cronScheduler;
     }
diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index b28800879..79f0df943 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -136,7 +136,7 @@ var taskSchema = new Schema({
         required: false,
         default:false
     },
-    startTaskScheduler:{
+    taskScheduler:{
         startOn: {
             type: Number,
             required: false,
@@ -152,70 +152,33 @@ var taskSchema = new Schema({
             required: false,
             trim: true
         },
-        cronRepeat: {
+        cronRepeatEvery: {
             type: Number,
             required: false,
             trim: true
         },
-        cronTime:{
-            type: String,
-            required: false,
-            trim: true
-        },
-        cronDays:{
-            type: String,
-            required: false,
-            trim: true
-        },
-        cronMonth:{
-            type: String,
-            required: false,
-            trim: true
-        },
-        cronYear:{
-            type: String,
-            required: false,
-            trim: true
-        }
-    },
-    stopTaskScheduler:{
-        startOn: {
-            type: Number,
-            required: false,
-            trim: true
-        },
-        endOn: {
-            type: Number,
-            required: false,
-            trim: true
-        },
-        cronPatten: {
-            type: String,
-            required: false,
-            trim: true
-        },
         cronFrequency: {
             type: Number,
             required: false,
             trim: true
         },
         cronTime:{
-            type: [String],
+            type: String,
             required: false,
             trim: true
         },
         cronDays:{
-            type: [String],
+            type: String,
             required: false,
             trim: true
         },
         cronMonth:{
-            type: [String],
+            type: String,
             required: false,
             trim: true
         },
         cronYear:{
-            type: [String],
+            type: String,
             required: false,
             trim: true
         }
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
index 7e81e4253..a6633178a 100755
--- a/server/app/routes/v1.0/routes_organizations.js
+++ b/server/app/routes/v1.0/routes_organizations.js
@@ -974,6 +974,9 @@ module.exports.setRoutes = function(app, sessionVerification) {
             taskData.orgName = project[0].orgname;
             taskData.bgName = project[0].productgroupname;
             taskData.projectName = project[0].projectname;
+            if(req.body.taskScheduler  && req.body.taskScheduler !== null) {
+                taskData.taskScheduler = apiUtil.createCronJobPattern(req.body.taskScheduler);
+            }
             configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) {
                 if (err) {
                     res.status(500).send("Failed to fetch ENV: ", err);
diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js
index 3f704cf46..bd971bcb1 100755
--- a/server/app/routes/v1.0/routes_tasks.js
+++ b/server/app/routes/v1.0/routes_tasks.js
@@ -515,6 +515,9 @@ module.exports.setRoutes = function(app, sessionVerification) {
 
     app.post('/tasks/:taskId/update', function(req, res) {
         var taskData = req.body.taskData;
+        if(taskData.taskScheduler  && taskData.taskScheduler !== null) {
+            taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler);
+        }
         if (taskData.taskType === 'script') {
             Tasks.getTaskById(req.params.taskId, function(err, scriptTask) {
                 if (err) {
diff --git a/server/app/services/blueprintService.js b/server/app/services/blueprintService.js
index 32a290b27..80c2b8df3 100644
--- a/server/app/services/blueprintService.js
+++ b/server/app/services/blueprintService.js
@@ -87,7 +87,7 @@ blueprintService.getAllServiceDeliveryBlueprint = function getAllServiceDelivery
                 var results = [];
                 if (auditTrailList.length > 0) {
                     for (var i = 0; i < auditTrailList.length; i++) {
-                        if (taskIds.indexOf(auditTrailList[i].auditId) > -1) {
+                        if (blueprintIds.indexOf(auditTrailList[i].auditId) < 0) {
                             results.push(auditTrailList[i].auditId);
                             blueprintIds.push(auditTrailList[i].auditId);
                         } else {

From a446bd5a213385be24e4bcf8b3a84b035933bd8f Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Fri, 25 Nov 2016 17:32:55 +0530
Subject: [PATCH 14/18] Resolved JShint errors.

---
 .../analytics/controller/capacityCtrl.js      |  2 +-
 .../bots/controller/audittrailCtrl.js         |  2 +-
 .../dashboard/bots/controller/botLogsCtrl.js  |  3 +-
 .../bots/controller/editParamsCtrl.js         |  1 -
 .../sections/dashboard/design/aDesignCtrl.js  |  4 +--
 .../design/controllers/blueprintCreateCtrl.js | 34 +++++++++----------
 .../design/controllers/createCompositeCtrl.js |  2 +-
 .../orchestrationUpdateChefRunlistCtrl.js     | 12 +++----
 .../popups/controller/scheduleCtrl.js         |  4 +--
 .../blueprint/popups/blueprintLaunchCtrl.js   |  2 --
 .../workzone/instance/instanceCtrl.js         |  1 -
 .../instance/manage/controlPanelCtrl.js       |  4 +--
 12 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
index bf87b50fa..bbc80f290 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js
@@ -165,7 +165,7 @@
                             capaCtr.capaGridOptions.columnDefs.push({
                                 name: keyChild,
                                 field: 'capacity.AWS.services.' + keyChild
-                            })
+                            });
                             angular.forEach(result.splitUpCapacities[viewType], function (valBar) {
                                 var chVal = '';
                                 if (valBar.capacity.AWS.services[keyChild]) {
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
index 1877a1e9c..2237353a2 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
@@ -57,7 +57,7 @@
                 keyboard: false,
                 resolve: {
                     items: function() {
-                        return hist
+                        return hist;
                     }
                 }
             });
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
index fc621101e..57d1ca9f3 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botLogsCtrl.js
@@ -47,7 +47,6 @@
         var requestObj = {
             "instanceIds": nodeIds
         };
-        var bluePrintJob = false;
         workzoneServices.postRetrieveDetailsForInstanceNames(requestObj).then(function (response) {
             var _jobInstances = response.data;
             for (var k = 0; k < $scope.nodeIdsWithActionLog.length; k++) {
@@ -81,6 +80,6 @@
 
         $scope.cancel = function() {
             $modalInstance.dismiss('cancel');
-        }
+        };
     }]);
 })(angular);
\ No newline at end of file
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
index 8d8895967..1454f81c4 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js
@@ -70,7 +70,6 @@
         $scope.jenkinsparams = items.taskConfig.parameterized;
         $scope.scriptparams = items.taskConfig.scriptDetails;
         $scope.parameters=[''];
-        var taskData={};
         var cookbookAttributes = [];
         var scriptParams = [];
         var choiceParam = {};
diff --git a/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js b/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
index a167a9146..8ff45cb85 100644
--- a/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/aDesignCtrl.js
@@ -56,7 +56,7 @@
 						return deferred.promise;
 					}]
 				}
-			})
+			});
 		}]).filter('inArray',['$filter', function($filter){
 			return function(list, arrayFilter, element){
 				if(arrayFilter){
@@ -126,7 +126,7 @@
                 $rootScope.$emit('BP_BLUEPRINTS_REFRESH_CURRENT');
                 return genericServices.promiseGet(params);
             }
-		}
+		};
 		design.providersList();
 		return design;
 	}]);
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
index d4910138c..37e580897 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js
@@ -113,7 +113,7 @@
                 blueprintCreation.getImages();
             } else {
                 blueprintCreation.templateListing();
-            };
+            }
 
             blueprintCreation.getOperatingSytems = function(){
                 $scope.isOSLoading = true;
@@ -155,13 +155,13 @@
             blueprintCreation.changeImageOS = function(){
                 blueprintCreation.newEnt.providers = null;
                 blueprintCreation.providerListing = [];
-                blueprintCreation.newEnt.images = null
+                blueprintCreation.newEnt.images = null;
                 blueprintCreation.imageListing = [];
                 blueprintCreation.instanceType = [];
                 blueprintCreation.regionListing = null;
                 blueprintCreation.keyPairListing = [];
                 blueprintCreation.regionListingAzure = [];
-                blueprintCreation.newEnt.vpcId = null
+                blueprintCreation.newEnt.vpcId = null;
                 blueprintCreation.vpcListing = [];
                 blueprintCreation.subnetListing = [];
                 blueprintCreation.newEnt.subnetId = null;
@@ -273,7 +273,7 @@
                             }
                         }
                     }
-                };
+                }
             };
 
             blueprintCreation.postSubnets = function() {
@@ -389,14 +389,14 @@
                     bpCreateSer.getRepoList(bpCreate.serverRepos[bpCreate.newEnt.nexusDockerServer].rowid).then(function (repositoryResult) {
                         $scope.isLoadingNexus = false;
                         blueprintCreation.repositoryOptions = repositoryResult.data[0].repositories.docker;
-                        if(blueprintCreation.repositoryOptions.length == 0){
+                        if(blueprintCreation.repositoryOptions.length === 0){
                             blueprintCreation.errorMsg= {
                                 text: "Repository is not defined",
                                 type: "warning",
                                 repository:true,
                                 role:"tooltip",
                                 positions:"bottom"
-                            }
+                            };
                         }
                     });
                 }
@@ -460,9 +460,9 @@
 
             blueprintCreation.getRepositoryDetails = function() {
                 if(bpCreate.newEnt.nexusDockerRepo.configType === 'nexus') {
-
+                    console.log('nexus');
                 }
-            }
+            };
 
             blueprintCreation.selectServer = function() {
                 if(blueprintCreation.newEnt.nexusDockerRepo) {
@@ -483,8 +483,8 @@
             blueprintCreation.getRegionLists = function() {
                 bpCreateSer.getRegionLists().then(function(data){
                     blueprintCreation.getRegionLists = data;
-                })
-            } 
+                });
+            }; 
 
             blueprintCreation.getTemplateParameters = function() {
                 $scope.cftTemplate = $scope.templateSelected;
@@ -508,13 +508,13 @@
 
             blueprintCreation.hideVMEvals = function() {
                 $scope.isVMEvalsVisible = false;
-            }
+            };
 
             blueprintCreation.checkForResource = function() {
                 if(blueprintCreation.newEnt.armModelResources !==null){
                     $scope.isVMEvalsVisible = true;
                 } 
-            }
+            };
             
             blueprintCreation.getResourceGroups = function() {
                 $scope.isResourceGroupLoading = true;
@@ -546,7 +546,7 @@
 
             $scope.updateCookbook = function() {
                 genericServices.editRunlist($scope.chefrunlist,$scope.cookbookAttributes);
-            }
+            };
 
             $rootScope.$on('WZ_ORCHESTRATION_REFRESH_CURRENT', function(event,reqParams) {
                 $scope.chefrunlist = reqParams.list;
@@ -764,7 +764,7 @@
                                 "repoName": blueprintCreation.repositoryOptions[blueprintCreation.newEnt.repositoryInd].name,
                                 "artifactId": blueprintCreation.newEnt.artifact,
                                 "groupId": blueprintCreation.newEnt.groupId
-                            }
+                            };
                             blueprintCreateJSON.nexus = nexus;
                         }else{
                             var docker = {
@@ -792,7 +792,7 @@
                             var parameterObj = {
                                 ParameterKey: key,
                                 ParameterValue: value.Default
-                            }
+                            };
                             cftParameters.push(parameterObj);
                             blueprintCreateJSON.cftStackParameters = cftParameters;
                         });
@@ -817,7 +817,7 @@
                                 ParameterKey: key,
                                 ParameterValue: value.value
                                 //type: value.type
-                            }
+                            };
                             cftParameters.push(parameterObj);
                             blueprintCreateJSON.cftStackParameters = cftParameters;
                         });
@@ -830,7 +830,7 @@
                                 username: blueprintCreation.getAzureVMDetails[i].username,
                                 password: blueprintCreation.getAzureVMDetails[i].password
                                 //runlist:[]
-                            }
+                            };
                             blueprintCreateJSON.cftInstances = instanceObj;
                             
                         }
diff --git a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
index c70f46bb9..2b4d766b4 100755
--- a/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/design/controllers/createCompositeCtrl.js
@@ -74,7 +74,7 @@
                     createCBP.newEnt.org =$rootScope.organNewEnt.org.rowid;
                     createCBP.newEnt.buss=$rootScope.organNewEnt.buss.rowid;
                     createCBP.newEnt.proj=$rootScope.organNewEnt.proj.rowId;
-                };
+                }
                 $scope.blueprintList = [];
                 angular.forEach(createCBP.SelectedBPList, function(val){
                     var blueprintObj={
diff --git a/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js b/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
index efc8e99d0..f9f9b6488 100644
--- a/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/popups/controller/orchestrationUpdateChefRunlistCtrl.js
@@ -19,7 +19,7 @@
 			$scope.allCBAttributes = [];
 			$scope.editRunListAttributes = [];
 			
-			$scope.getCookBookListForOrg = function(getCookBooks) {
+			$scope.getCookBookListForOrg = function() {
 				var p = workzoneEnvironment.getEnvParams();
 				genericServices.getTreeNew().then(function (orgs) {
 					$scope.organObject=orgs;
@@ -33,7 +33,7 @@
 				} else {
 					param = {
 						url: '/organizations/' + $scope.organObject[0].orgid + '/chefRunlist'
-					}
+					};
 				}
             	genericServices.promiseGet(param).then(function (result) {
                		$scope.getCookBooks = result;
@@ -41,11 +41,11 @@
                		if(p){
                			params = {
                				url: '/d4dMasters/org/' + p.org + '/templateType/SoftwareStack/templates'
-               			}
+               			};
                		}else {
                			params = {
                				url: '/d4dMasters/org/' + $scope.organObject[0].orgid + '/templateType/SoftwareStack/templates'
-               			}
+               			};
                		}
 	            	genericServices.promiseGet(params).then(function (result) {
 	               		$scope.getTemplates = result;
@@ -78,11 +78,11 @@
 					$scope.isOrchestrationUpdateChefRunLoading = false;
 					$scope.init();
 				});
-			}
+			};
 			$scope.getCookBookListForOrg();
 			function registerUpdateEvent(obj) {
 				obj.addListUpdateListener('updateList', $scope.updateAttributeList);
-			};
+			}
 
 			$scope.init = function () {
 				$timeout(function () {
diff --git a/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
index 443a19070..369cb178c 100644
--- a/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/popups/controller/scheduleCtrl.js
@@ -27,7 +27,7 @@
                     sch.interval[i].days.splice(sch.interval[i].days.indexOf(d),1);
                 }
                 if(sch.interval[i].days.length >0){
-                    sch.interval[i].daySelect=1
+                    sch.interval[i].daySelect=1;
                 } else{
                     sch.interval[i].daySelect='';
                 }
@@ -44,7 +44,7 @@
                 var params={
                     url:'/instances/'+sch.instanceIds[0]
                     //url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
-                }
+                };
                 genericServices.promiseGet(params).then(function (result) {
                     sch.isScheduled=result.isScheduled;
                     sch.schedulerStartOn=moment(result.schedulerStartOn).format('MM/DD/YYYY');
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
index ee04b891a..140d5f3e9 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/blueprint/popups/blueprintLaunchCtrl.js
@@ -136,8 +136,6 @@
 					$scope.launchResponse = {error:message};
 					$scope.launchMessage = messageHelper.launchMessage();
 				});
-			} else {
-				
 			}
 		}
 	]);
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
index a13dc1d31..7c8f1210f 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instanceCtrl.js
@@ -250,7 +250,6 @@
                                 so that it gets replaced with instanceIP*/
                                 helper.setHostToIp(result.data.instances);
                                 $scope.tabData = $scope.instanceList;
-                                console.log($scope.instanceList);
                                 if ($scope.totalCards > $scope.paginationParams.pageSize) {
                                     $scope.cardsAvailable = true;
                                 } else {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
index 755cfba78..caabfde42 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/manage/controlPanelCtrl.js
@@ -77,7 +77,7 @@
 		var params={
 			url:'/instances/'+cpInstance._id
 			//url:'src/partials/sections/dashboard/workzone/data/oneIns.json'
-		}
+		};
 		genericServices.promiseGet(params).then(function (result) {
 			$scope.schedule={
 				instanceIds:[cpInstance._id],
@@ -98,7 +98,7 @@
 				$scope.schedule.interval[i].days.splice($scope.schedule.interval[i].days.indexOf(d),1);
 			}
 			if($scope.schedule.interval[i].days.length >0){
-				$scope.schedule.interval[i].daySelect=1
+				$scope.schedule.interval[i].daySelect=1;
 			} else{
 				$scope.schedule.interval[i].daySelect='';
 			}

From 888f073dc117626962d22f20e13ec74adb951340 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 25 Nov 2016 17:36:47 +0530
Subject: [PATCH 15/18] Task Scheduler Implementation

---
 server/app/app.js                             |  1 +
 .../catalyst-scheduler/catalystScheduler.js   | 31 ++++++++
 server/app/model/classes/tasks/tasks.js       | 56 +++++++++++++-
 .../app/routes/v1.0/routes_organizations.js   | 16 ++++
 server/app/routes/v1.0/routes_tasks.js        | 16 ++++
 server/app/services/schedulerService.js       | 77 +++++++++++++++----
 6 files changed, 178 insertions(+), 19 deletions(-)

diff --git a/server/app/app.js b/server/app/app.js
index a90e04667..e7206945c 100755
--- a/server/app/app.js
+++ b/server/app/app.js
@@ -217,6 +217,7 @@ io.sockets.on('connection', function(socket) {
 var cronTabManager = require('_pr/cronjobs');
 cronTabManager.start();
 catalystSync.executeScheduledInstances();
+catalystSync.executeScheduledTasks();
 server.listen(app.get('port'), function() {
     logger.debug('Express server listening on port ' + app.get('port'));
 });
\ No newline at end of file
diff --git a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js
index 62371da42..24fc17c34 100644
--- a/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js
+++ b/server/app/cronjobs/catalyst-scheduler/catalystScheduler.js
@@ -1,5 +1,6 @@
 var logger = require('_pr/logger')(module);
 var instancesDao = require('_pr/model/classes/instance/instance');
+var taskDao = require('_pr/model/classes/tasks/tasks.js');
 var schedulerService = require('_pr/services/schedulerService');
 var async = require('async');
 
@@ -33,4 +34,34 @@ catalystSync.executeScheduledInstances = function executeScheduledInstances() {
             return;
         }
     });
+}
+
+catalystSync.executeScheduledTasks = function executeScheduledTasks() {
+    taskDao.getScheduledTasks(function(err, tasks) {
+        if (err) {
+            logger.error("Failed to fetch tasks: ", err);
+            return;
+        }
+        if (tasks && tasks.length) {
+            var resultList =[];
+            for (var i = 0; i < tasks.length; i++) {
+                (function(task) {
+                    resultList.push(function(callback){schedulerService.executeSchedulerForTasks(task,callback);});
+                    if(resultList.length === tasks.length){
+                        async.parallel(resultList,function(err,results){
+                            if(err){
+                                logger.error(err);
+                                return;
+                            }
+                            logger.debug("Task Scheduler Completed");
+                            return;
+                        })
+                    }
+                })(tasks[i]);
+            }
+        }else{
+            logger.debug("There is no scheduled Task right now.");
+            return;
+        }
+    });
 }
\ No newline at end of file
diff --git a/server/app/model/classes/tasks/tasks.js b/server/app/model/classes/tasks/tasks.js
index 79f0df943..2aedacc02 100755
--- a/server/app/model/classes/tasks/tasks.js
+++ b/server/app/model/classes/tasks/tasks.js
@@ -137,12 +137,12 @@ var taskSchema = new Schema({
         default:false
     },
     taskScheduler:{
-        startOn: {
+        cronStartOn: {
             type: Number,
             required: false,
             trim: true
         },
-        endOn: {
+        cronEndOn: {
             type: Number,
             required: false,
             trim: true
@@ -183,7 +183,11 @@ var taskSchema = new Schema({
             trim: true
         }
     },
-    cronJobIds:[String]
+    cronJobId:{
+        type: String,
+        required: false,
+        trim: true
+    }
 });
 taskSchema.plugin(mongoosePaginate);
 
@@ -908,6 +912,52 @@ taskSchema.statics.updateTaskConfig = function updateTaskConfig(taskId, taskConf
 
     });
 };
+taskSchema.statics.getScheduledTasks = function getScheduledTasks(callback) {
+    Tasks.find({
+        isTaskScheduled: true
+    }, function (err, tasks) {
+        if (err) {
+            logger.error(err);
+            return callback(err, null);
+        }
+        return callback(null, tasks);
+    })
+}
+
+taskSchema.statics.updateCronJobIdByTaskId = function updateCronJobIdByTaskId(taskId, cronJobId, callback) {
+    Tasks.update({
+        "_id": new ObjectId(taskId),
+    }, {
+        $set: {
+            cronJobId: cronJobId
+        }
+    }, {
+        upsert: false
+    }, function (err, data) {
+        if (err) {
+            callback(err, null);
+            return;
+        }
+        callback(null, data);
+    });
+};
+taskSchema.statics.updateTaskScheduler = function updateTaskScheduler(taskId, callback) {
+    Tasks.update({
+        "_id": new ObjectId(taskId),
+    }, {
+        $set: {
+            isTaskScheduled: false
+        }
+    }, {
+        upsert: false
+    }, function (err, data) {
+        if (err) {
+            callback(err, null);
+            return;
+        }
+        callback(null, data);
+    });
+};
 
 function filterScriptTaskData(data,callback){
     var taskList = [];
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
index a6633178a..ec38f02f0 100755
--- a/server/app/routes/v1.0/routes_organizations.js
+++ b/server/app/routes/v1.0/routes_organizations.js
@@ -49,6 +49,7 @@ var Docker = require('_pr/model/docker.js');
 var orgValidator = require('_pr/validators/organizationValidator');
 var validate = require('express-validation');
 var taskService = require('_pr/services/taskService');
+var schedulerService = require('_pr/services/schedulerService');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var compositeBlueprintModel = require('_pr/model/composite-blueprints/composite-blueprints.js');
 var Cryptography = require('_pr/lib/utils/cryptography');
@@ -976,6 +977,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
             taskData.projectName = project[0].projectname;
             if(req.body.taskScheduler  && req.body.taskScheduler !== null) {
                 taskData.taskScheduler = apiUtil.createCronJobPattern(req.body.taskScheduler);
+                taskData.isTaskScheduled = true;
             }
             configmgmtDao.getEnvNameFromEnvId(req.params.envId, function(err, envName) {
                 if (err) {
@@ -997,6 +999,13 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                     res.status(500).send("Failed to create task: ", err);
                                     return;
                                 }
+                                if(task.isTaskScheduled === true){
+                                    schedulerService.executeSchedulerForTasks(task,function(err,data){
+                                        if(err){
+                                            logger.error("Error in executing task scheduler");
+                                        }
+                                    })
+                                };
                                 res.send(task);
                                 logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments);
                             });
@@ -1009,6 +1018,13 @@ module.exports.setRoutes = function(app, sessionVerification) {
                             res.status(500).send("Failed to create task: ", err);
                             return;
                         }
+                        if(task.isTaskScheduled === true){
+                            schedulerService.executeSchedulerForTasks(task,function(err,data){
+                                if(err){
+                                    logger.error("Error in executing task scheduler");
+                                }
+                            })
+                        };
                         res.send(task);
                         logger.debug("Exit post() for /organizations/%s/businessGroups/%s/projects/%s/environments/%s/tasks", req.params.orgId, req.params.bgId, req.params.projectId, req.params.environments);
                     });
diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js
index bd971bcb1..69b76cd2b 100755
--- a/server/app/routes/v1.0/routes_tasks.js
+++ b/server/app/routes/v1.0/routes_tasks.js
@@ -27,6 +27,7 @@ var taskService = require('_pr/services/taskService.js')
 var async = require('async');
 var apiUtil = require('_pr/lib/utils/apiUtil.js');
 var Cryptography = require('_pr/lib/utils/cryptography');
+var schedulerService = require('_pr/services/schedulerService');
 
 
 
@@ -517,6 +518,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
         var taskData = req.body.taskData;
         if(taskData.taskScheduler  && taskData.taskScheduler !== null) {
             taskData.taskScheduler = apiUtil.createCronJobPattern(taskData.taskScheduler);
+            taskData.isTaskScheduled = true;
         }
         if (taskData.taskType === 'script') {
             Tasks.getTaskById(req.params.taskId, function(err, scriptTask) {
@@ -539,6 +541,13 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                 return;
                             }
                             if (updateCount) {
+                                if(taskData.isTaskScheduled === true){
+                                    schedulerService.executeSchedulerForTasks(task,function(err,data){
+                                        if(err){
+                                            logger.error("Error in executing task scheduler");
+                                        }
+                                    })
+                                };
                                 res.send({
                                     updateCount: updateCount
                                 });
@@ -557,6 +566,13 @@ module.exports.setRoutes = function(app, sessionVerification) {
                     return;
                 }
                 if (updateCount) {
+                    if(taskData.isTaskScheduled === true){
+                        schedulerService.executeSchedulerForTasks(task,function(err,data){
+                            if(err){
+                                logger.error("Error in executing task scheduler");
+                            }
+                        })
+                    };
                     res.send({
                         updateCount: updateCount
                     });
diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js
index bcb640344..c1a582748 100644
--- a/server/app/services/schedulerService.js
+++ b/server/app/services/schedulerService.js
@@ -21,6 +21,7 @@ const errorType = 'schedulerService';
 var schedulerService = module.exports = {};
 var cronTab = require('node-crontab');
 var instancesDao = require('_pr/model/classes/instance/instance');
+var taskDao = require('_pr/model/classes/tasks/tasks.js');
 var async = require('async');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var logsDao = require('_pr/model/dao/logsdao.js');
@@ -36,8 +37,10 @@ var azureProvider = require('_pr/model/classes/masters/cloudprovider/azureCloudP
 var azureCloud = require('_pr/lib/azure');
 var fs = require('fs');
 var providerService = require('_pr/services/providerService.js');
+var taskService = require('_pr/services/taskService.js');
 var gcpProviderModel = require('_pr/model/v2.0/providers/gcp-providers');
 var GCP = require('_pr/lib/gcp.js');
+var crontab = require('node-crontab');
 
 schedulerService.executeSchedulerForInstances = function executeSchedulerForInstances(instance,callback) {
     logger.debug("Instance Scheduler is started for Instance. "+instance.platformId);
@@ -96,6 +99,47 @@ schedulerService.executeSchedulerForInstances = function executeSchedulerForInst
     })
 }
 
+schedulerService.executeSchedulerForTasks = function executeSchedulerForTasks(task,callback) {
+    logger.debug("Task Scheduler is started for Task. "+task.name);
+    var currentDate = new Date();
+    if(currentDate >= task.taskScheduler.cronEndOn){
+        crontab.cancelJob(task.cronJobId);
+        taskDao.updateTaskScheduler(task._id,function(err, updatedData) {
+            if (err) {
+                logger.error("Failed to update Task Scheduler: ", err);
+                callback(err,null);
+                return;
+            }
+            logger.debug("Scheduler is ended on for Task. "+task.name);
+            callback(null,updatedData);
+            return;
+        });
+    }else{
+        var schedulerService = require('_pr/services/schedulerService');
+        var cronJobId = cronTab.scheduleJob(task.taskScheduler.cronPattern, function () {
+            taskDao.updateCronJobIdByTaskId(task._id,cronJobId,function(err,data){
+                if(err){
+                    logger.error("Error in updating cron job Ids. "+err);
+                }
+            })
+            taskService.executeTask(task._id, "superadmin", "", "", "","","",function(err, historyData) {
+                if (err === 404) {
+                    logger.error("Task not found.", err);
+                    callback(err,null);
+                    return;
+                } else if (err) {
+                    logger.error("Failed to execute task.", err);
+                    callback(err,null);
+                    return;
+                }
+                logger.debug("Task Execution Success: ", task.name);
+                callback(null,historyData);
+                return;
+            });
+        });
+    }
+}
+
 schedulerService.startStopInstance= function startStopInstance(instanceId,catUser,action,callback){
     logger.debug(action+ " is Starting");
     async.waterfall([
@@ -142,6 +186,23 @@ schedulerService.startStopInstance= function startStopInstance(instanceId,catUse
     })
 }
 
+function createCronJob(cronPattern,instanceId,catUser,action,callback){
+    var schedulerService = require('_pr/services/schedulerService');
+    var cronJobId = cronTab.scheduleJob(cronPattern, function () {
+        instancesDao.updateCronJobIdByInstanceId(instanceId,cronJobId,function(err,data){
+            if(err){
+                logger.error("Error in updating cron job Ids. "+err);
+            }
+        })
+        schedulerService.startStopInstance(instanceId, catUser, action, function (err, data) {
+            if (err) {
+                callback(err, null);
+            }
+            callback(null, cronJobId);
+        });
+    });
+}
+
 function startStopManagedInstance(instance,catUser,action,callback){
     var actionStartLog = '',actionCompleteLog='',actionFailedLog='',vmWareAction='',instanceState='',actionLog = null;
     var timestampStarted = new Date().getTime();
@@ -634,21 +695,5 @@ function checkSuccessInstanceAction(logReferenceIds,instanceState,instanceLog,ac
     });
 }
 
-function createCronJob(cronPattern,instanceId,catUser,action,callback){
-    var schedulerService = require('_pr/services/schedulerService');
-    var cronJobId = cronTab.scheduleJob(cronPattern, function () {
-        instancesDao.updateCronJobIdByInstanceId(instanceId,cronJobId,function(err,data){
-            if(err){
-                logger.error("Error in updating cron job Ids. "+err);
-            }
-        })
-        schedulerService.startStopInstance(instanceId, catUser, action, function (err, data) {
-            if (err) {
-                callback(err, null);
-            }
-            callback(null, cronJobId);
-        });
-    });
-}
 
 

From 1b4022f5d8d1a4f4715c3750b4cc61a3502cb512 Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Fri, 25 Nov 2016 17:43:28 +0530
Subject: [PATCH 16/18] resolved jshint error

---
 .../cat3/src/partials/sections/dashboard/genericServices.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/genericServices.js b/client/cat3/src/partials/sections/dashboard/genericServices.js
index 754495528..bf52eb924 100644
--- a/client/cat3/src/partials/sections/dashboard/genericServices.js
+++ b/client/cat3/src/partials/sections/dashboard/genericServices.js
@@ -275,8 +275,8 @@
                             }
                         }
                     })
-                    .result.then(function(selectedItem) {
-                    //$scope.selected = selectedItem;
+                    .result.then(function() {
+                    
                     }, function() {
 
                     });

From ce50617c7291364271e3a7732a920b13790aff8a Mon Sep 17 00:00:00 2001
From: Udesh <udesh.kumar@relevancelab.com>
Date: Mon, 28 Nov 2016 11:41:58 +0530
Subject: [PATCH 17/18] sensu client install for chef import

---
 server/app/lib/utils/masterUtil.js            |  26 +-
 .../aws-blueprint/aws-blueprint.js            |  17 +-
 server/app/model/d4dmasters/configmgmt.js     |  16 +-
 server/app/routes/v1.0/routes_chef.js         | 321 ++++++++++--------
 .../app/routes/v1.0/routes_organizations.js   |  20 +-
 .../app/routes/v1.0/routes_providercommon.js  |   2 +-
 6 files changed, 217 insertions(+), 185 deletions(-)

diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js
index 80fe80a97..e9452c8e6 100755
--- a/server/app/lib/utils/masterUtil.js
+++ b/server/app/lib/utils/masterUtil.js
@@ -1794,15 +1794,15 @@ var MasterUtil = function () {
                         if (chefmgmt[0].monitorId) {
                             monitorsModel.getById(chefmgmt[0].monitorId, function (err, monitor) {
                                 if (err || !monitor) {
-                                     chefmgmt[0].monitor = null;
+                                    chefmgmt[0].monitor = null;
                                 } else {
-                                     chefmgmt[0].monitor = monitor;
+                                    chefmgmt[0].monitor = monitor;
                                 }
                                 callback(null, chefmgmt[0]);
                             });
-                        }else{
+                        } else {
                             callback(null, chefmgmt[0]);
-                        }                        
+                        }
                     } else {
                         callback(null, null);
                     }
@@ -2236,6 +2236,24 @@ var MasterUtil = function () {
             return callback(null, templates);
         });
     };
+
+    //return cookbook attributes object for sensu-client
+    this.getSensuCookbookAttributes = function (monitorDetails, instanceId) {
+        var cryptoConfig = appConfig.cryptoSettings;
+        var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+        var decryptedPassword = cryptography.decryptText(monitorDetails.parameters.transportProtocolParameters.password, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
+
+        var sensuAttributes = {
+            'rabbitmq_host': monitorDetails.parameters.transportProtocolParameters.host,
+            'rabbitmq_port': monitorDetails.parameters.transportProtocolParameters.port,
+            'rabbitmq_username': monitorDetails.parameters.transportProtocolParameters.user,
+            'rabbitmq_password': decryptedPassword,
+            'rabbitmq_vhostname': monitorDetails.parameters.transportProtocolParameters.vhost,
+            'instance-id': instanceId
+        };
+        logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
+        return sensuAttributes;
+    };
 }
 
 module.exports = new MasterUtil();
\ No newline at end of file
diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
index 8fcd80b06..d34716c80 100755
--- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
@@ -556,22 +556,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
                                                 var sensuCookBook = 'recipe[sensu-client]';
                                                 if (runlist.indexOf(sensuCookBook) === -1 && monitor && monitor.parameters.transportProtocol === 'rabbitmq') {
                                                     runlist.unshift(sensuCookBook);
-
-                                                    var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-                                                    var decryptedPassword = cryptography.decryptText(monitor.parameters.transportProtocolParameters.password, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
-
-                                                    var sensuAttributes = {
-                                                        'rabbitmq_host': monitor.parameters.transportProtocolParameters.host,
-                                                        'rabbitmq_port': monitor.parameters.transportProtocolParameters.port,
-                                                        'rabbitmq_username': monitor.parameters.transportProtocolParameters.user,
-                                                        'rabbitmq_password': decryptedPassword,
-                                                        'rabbitmq_vhostname': monitor.parameters.transportProtocolParameters.vhost,
-                                                        'instance-id': instance.platformId
-                                                    };
-
-                                                    logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
-                                                    jsonAttributes['sensu-client'] = sensuAttributes;
-
+                                                    jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(monitor,instance.platformId);
                                                 }
 
                                                 //logger.debug("runlist: ", JSON.stringify(runlist));
diff --git a/server/app/model/d4dmasters/configmgmt.js b/server/app/model/d4dmasters/configmgmt.js
index d316e391e..2ae034284 100755
--- a/server/app/model/d4dmasters/configmgmt.js
+++ b/server/app/model/d4dmasters/configmgmt.js
@@ -254,7 +254,7 @@ function Configmgmt() {
     };
 
     this.getChefServerDetails = function(rowid, callback) {
-        var that = this;
+        var $this = this;
         this.getDBModelFromID("10", function(err, dbtype) {
             if (err) {
                 logger.debug("Hit and error getChefServerDetails.getDBModelFromID:" + err);
@@ -262,7 +262,7 @@ function Configmgmt() {
             }
             if (dbtype) {
                 logger.debug("Master Type: " + dbtype + ' rowid : ' + rowid);
-                that.getRowids(function(err, rowidlist) {
+                $this.getRowids(function(err, rowidlist) {
                     eval('d4dModelNew.' + dbtype).findOne({
                         rowid: rowid
                     }, function(err, d4dMasterJson) {
@@ -288,7 +288,7 @@ function Configmgmt() {
                                 if (keys[i].indexOf("login") >= 0)
                                     loginname = outJson[k] + "/";
                                 if (keys[i].indexOf("orgname_rowid") >= 0) {
-                                    liveorgname = that.convertRowIDToValue(outJson[k], rowidlist);
+                                    liveorgname = $this.convertRowIDToValue(outJson[k], rowidlist);
                                     orgname = outJson[k] + "/";
                                 }
                             }
@@ -312,7 +312,9 @@ function Configmgmt() {
                                     }
                                 }
                             }
-                            callback(null, JSON.parse('{' + configmgmt + '}'));
+                            configmgmt = JSON.parse('{' + configmgmt + '}');
+                            logger.debug("configmgmt---------->>>" + JSON.stringify(configmgmt));
+                            callback(null, configmgmt);
                             return;
                         } else {
                             callback(err, null);
@@ -325,7 +327,7 @@ function Configmgmt() {
     };
 
     this.getPuppetServerDetails = function(rowid, callback) {
-        var that = this;
+        var $this = this;
         this.getDBModelFromID("25", function(err, dbtype) {
             if (err) {
                 logger.debug("Hit and error getChefServerDetails.getDBModelFromID:" + err);
@@ -333,7 +335,7 @@ function Configmgmt() {
             }
             if (dbtype) {
                 logger.debug("Master Type: " + dbtype + ' rowid : ' + rowid);
-                that.getRowids(function(err, rowidlist) {
+                $this.getRowids(function(err, rowidlist) {
                     eval('d4dModelNew.' + dbtype).findOne({
                         rowid: rowid
                     }, function(err, d4dMasterJson) {
@@ -359,7 +361,7 @@ function Configmgmt() {
                                 if (keys[i].indexOf("login") >= 0)
                                     loginname = outJson[k] + "/";
                                 if (keys[i].indexOf("orgname_rowid") >= 0) {
-                                    liveorgname = that.convertRowIDToValue(outJson[k], rowidlist);
+                                    liveorgname = $this.convertRowIDToValue(outJson[k], rowidlist);
                                     orgname = outJson[k] + "/";
                                 }
                             }
diff --git a/server/app/routes/v1.0/routes_chef.js b/server/app/routes/v1.0/routes_chef.js
index 6ba19b57c..1f5090b39 100755
--- a/server/app/routes/v1.0/routes_chef.js
+++ b/server/app/routes/v1.0/routes_chef.js
@@ -1,12 +1,12 @@
 /*
  Copyright [2016] [Relevance Lab]
-
+ 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
-
+ 
  http://www.apache.org/licenses/LICENSE-2.0
-
+ 
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,14 +38,15 @@ var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var async = require('async');
 var apiUtil = require('_pr/lib/utils/apiUtil.js');
 var SSHExec = require('_pr/lib/utils/sshexec');
+var MasterUtils = require('_pr/lib/utils/masterUtil.js');
 
 
-module.exports.setRoutes = function(app, verificationFunc) {
+module.exports.setRoutes = function (app, verificationFunc) {
 
     app.all('/chef/*', verificationFunc);
 
-    app.get('/chef/servers/:serverId/nodes', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.get('/chef/servers/:serverId/nodes', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 logger.debug(err);
                 res.status(500).send(errorResponses.db.error);
@@ -62,12 +63,12 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getNodesList(function(err, nodeList) {
+            chef.getNodesList(function (err, nodeList) {
                 if (err) {
                     res.status(500).send(errorResponses.chef.connectionError);
                     return;
                 } else {
-                    instancesDao.getInstancesFilterByChefServerIdAndNodeNames(req.params.serverId, nodeList, function(err, instances) {
+                    instancesDao.getInstancesFilterByChefServerIdAndNodeNames(req.params.serverId, nodeList, function (err, instances) {
                         if (err) {
                             res.status(500).send(errorResponses.chef.connectionError);
                             return;
@@ -75,7 +76,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         if (instances && instances.length) {
                             for (var i = 0; i < instances.length; i++) {
                                 var index = nodeList.indexOf(instances[i].chef.chefNodeName);
-                                if (index !== -1) {}
+                                if (index !== -1) {
+                                }
                             }
                             res.send(nodeList);
                         } else {
@@ -90,17 +92,17 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
 
-    app.get('/chef/justtesting/:mastername/:fieldname/:comparedfieldname/:comparedfieldvalue', function(req, res) {
+    app.get('/chef/justtesting/:mastername/:fieldname/:comparedfieldname/:comparedfieldvalue', function (req, res) {
         logger.debug('test', req.params.mastername, ' ' + req.params.fieldname, ' ' + req.params.comparedfieldname);
-        configmgmtDao.getListFilteredNew(req.params.mastername, req.params.fieldname, req.params.comparedfieldname, req.params.comparedfieldvalue, function(err, outd) {
+        configmgmtDao.getListFilteredNew(req.params.mastername, req.params.fieldname, req.params.comparedfieldname, req.params.comparedfieldvalue, function (err, outd) {
             if (!err)
                 res.send(outd);
             else
                 res.send(err);
         });
     });
-    app.get('/chef/servers/:serverId/environments', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.get('/chef/servers/:serverId/environments', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 logger.debug(err);
                 res.status(500).send(errorResponses.db.error);
@@ -117,7 +119,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getEnvironmentsList(function(err, environmentsList) {
+            chef.getEnvironmentsList(function (err, environmentsList) {
                 if (err) {
                     res.status(500).send(errorResponses.chef.connectionError);
                     return;
@@ -129,8 +131,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get('/chef/servers/:serverId/nodes/:nodeName', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.get('/chef/servers/:serverId/nodes/:nodeName', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 logger.debug(err);
                 res.send(500);
@@ -148,7 +150,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getNode(req.params.nodeName, function(err, nodeData) {
+            chef.getNode(req.params.nodeName, function (err, nodeData) {
                 if (err) {
                     logger.debug(err)
                     res.send(500);
@@ -162,7 +164,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
 
-    app.post('/chef/servers/:serverId/sync/nodes', function(req, res) {
+    app.post('/chef/servers/:serverId/sync/nodes', function (req, res) {
         var taskStatusObj = null;
         var chef = null;
         var reqBody = req.body;
@@ -179,7 +181,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
             res.send(400);
             return;
         }
-        var insertNodeInMongo = function(node, callback) {
+        var insertNodeInMongo = function (node, chefDetail, callback) {
             var platformId = '';
             if (!node.automatic) {
                 node.automatic = {};
@@ -236,7 +238,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 if (reqBody.credentials && reqBody.credentials.pemFileData) {
                     credentials = reqBody.credentials;
                     credentials.pemFileLocation = appConfig.tempDir + uuid.v4();
-                    fileIo.writeFile(credentials.pemFileLocation, reqBody.credentials.pemFileData, null, function(err) {
+                    fileIo.writeFile(credentials.pemFileLocation, reqBody.credentials.pemFileData, null, function (err) {
                         if (err) {
                             logger.debug('unable to create pem file ', err);
                             callback(err, null);
@@ -248,7 +250,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 } else {
                     if (!reqBody.credentials) {
                         var tempPemFileLocation = appConfig.tempDir + uuid.v4();
-                        fileIo.copyFile(appConfig.aws.pemFileLocation + appConfig.aws.pemFile, tempPemFileLocation, function() {
+                        fileIo.copyFile(appConfig.aws.pemFileLocation + appConfig.aws.pemFile, tempPemFileLocation, function () {
                             if (err) {
                                 logger.debug('unable to copy pem file ', err);
                                 callback(err, null);
@@ -265,7 +267,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                     }
                 }
             }
-            getCredentialsFromReq(function(err, credentials) {
+            getCredentialsFromReq(function (err, credentials) {
                 if (err) {
                     logger.debug("unable to get credetials from request ", err);
                     callback(err, null);
@@ -283,20 +285,22 @@ module.exports.setRoutes = function(app, verificationFunc) {
                                 message: "Failed to get env name from env id"
                             }, null);
                             return;
-                        };
+                        }
+                        ;
                         if (!envName) {
                             callback({
                                 "message": "Unable to find environment name from environment id"
                             });
                             return;
-                        };
+                        }
+                        ;
                         var nodeDetails = {
-                            nodeIp : nodeIp,
-                            nodeOs:hardwareData.os,
-                            nodeName:node.name,
-                            nodeEnv:envName
+                            nodeIp: nodeIp,
+                            nodeOs: hardwareData.os,
+                            nodeName: node.name,
+                            nodeEnv: envName
                         }
-                        checkNodeCredentials(credentials,nodeDetails,function(err,credentialStatus) {
+                        checkNodeCredentials(credentials, nodeDetails, function (err, credentialStatus) {
                             if (err) {
                                 logger.debug("Invalid Credentials  ", err);
                                 callback(err, null);
@@ -340,6 +344,34 @@ module.exports.setRoutes = function(app, verificationFunc) {
                                     }
                                     instance.id = data._id;
                                     instance._id = data._id;
+                                    
+                                    //install sensu client if monitoring server configured
+                                    if (chefDetail.monitor && chefDetail.monitor.parameters.transportProtocol === 'rabbitmq') {
+                                        var sensuCookBook = 'recipe[sensu-client]';
+                                        var runlist = [];
+                                        var jsonAttributes = {};
+                                        runlist.push(sensuCookBook);
+                                        jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(chefDetail.monitor,instance.platformId);
+                                        
+                                        runOptions = {
+                                            privateKey: credentials.pemFileLocation,
+                                            username: credentials.username,
+                                            host: instance.instanceIP,
+                                            instanceOS: instance.hardware.os,
+                                            port: 22,
+                                            runlist: runlist,
+                                            overrideRunlist: false,
+                                            jsonAttributes: JSON.stringify(jsonAttributes)
+                                        };
+                                        chef.runClient(runOptions, function (err, retCode) {
+                                            logger.debug("knife ret code", retCode);
+                                        });
+
+                                    }
+
+
+
+
                                     var timestampStarted = new Date().getTime();
                                     var actionLog = instancesDao.insertBootstrapActionLogForChef(instance.id, [], req.session.user.cn, timestampStarted);
                                     var logsReferenceIds = [instance.id, actionLog._id];
@@ -371,12 +403,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
                                         providerType: "",
                                         action: "Imported From ChefServer",
                                         logs: [{
-                                            err: false,
-                                            log: "Node Imported",
-                                            timestamp: new Date().getTime()
-                                        }]
+                                                err: false,
+                                                log: "Node Imported",
+                                                timestamp: new Date().getTime()
+                                            }]
                                     };
-                                    instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
+
+                                    instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
                                         if (err) {
                                             logger.error("Failed to create or update instanceLog: ", err);
                                         }
@@ -418,9 +451,10 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 logger.debug('setting task status');
                 taskstatus.updateTaskStatus(status);
             }
-        };
+        }
+        ;
         function importNodes(nodeList, chefDetail) {
-            taskStatusModule.getTaskStatus(null, function(err, obj) {
+            taskStatusModule.getTaskStatus(null, function (err, obj) {
                 if (err) {
                     res.send(500);
                     return;
@@ -428,24 +462,24 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 taskstatus = obj;
                 for (var i = 0; i < nodeList.length; i++) {
 
-                    (function(nodeName) {
-                        chef.getNode(nodeName, function(err, node) {
+                    (function (nodeName) {
+                        chef.getNode(nodeName, function (err, node) {
                             if (err) {
                                 logger.debug(err);
                                 updateTaskStatusNode(nodeName, "Unable to import node " + nodeName, true, count);
                                 return;
                             } else {
                                 var envObj = {
-                                    projectname:reqBody.projectName,
-                                    projectname_rowid:projectId,
-                                    orgname:reqBody.orgName,
-                                    orgname_rowid:orgId,
-                                    configname:chefDetail.configname,
-                                    configname_rowid:chefDetail.rowid,
-                                    environmentname:node.chef_environment,
-                                    id:'3'
+                                    projectname: reqBody.projectName,
+                                    projectname_rowid: projectId,
+                                    orgname: reqBody.orgName,
+                                    orgname_rowid: orgId,
+                                    configname: chefDetail.configname,
+                                    configname_rowid: chefDetail.rowid,
+                                    environmentname: node.chef_environment,
+                                    id: '3'
                                 };
-                                environmentsDao.createEnv(envObj, function(err, data) {
+                                environmentsDao.createEnv(envObj, function (err, data) {
                                     if (err) {
                                         logger.debug(err, 'occured in creating environment in mongo');
                                         updateTaskStatusNode(node.name, "Unable to import node : " + node.name, true, count);
@@ -463,14 +497,14 @@ module.exports.setRoutes = function(app, verificationFunc) {
                                         nodeIp = node.automatic.cloud.public_ipv4;
                                     }
 
-                                    instancesDao.getInstanceByOrgAndNodeNameOrIP(orgId, node.name, nodeIp, function(err, instances) {
+                                    instancesDao.getInstanceByOrgAndNodeNameOrIP(orgId, node.name, nodeIp, function (err, instances) {
                                         if (err) {
                                             logger.debug('Unable to fetch instance', err);
                                             updateTaskStatusNode(node.name, "Unable to import node : " + node.name, true, count);
                                             return;
                                         }
                                         if (instances.length) {
-                                            configmgmtDao.getOrgBgProjEnvNameFromIds(instances[0].orgId, instances[0].bgId, instances[0].projectId, instances[0].envId, function(err, names) {
+                                            configmgmtDao.getOrgBgProjEnvNameFromIds(instances[0].orgId, instances[0].bgId, instances[0].projectId, instances[0].envId, function (err, names) {
                                                 if (err) {
                                                     updateTaskStatusNode(node.name, "Unable to import node : " + node.name, true, count);
                                                     return;
@@ -485,18 +519,18 @@ module.exports.setRoutes = function(app, verificationFunc) {
                                             openport = 5985;
                                         }
                                         logger.debug('checking port for node with ip : ' + nodeIp);
-                                        waitForPort(nodeIp, openport, function(err) {
+                                        waitForPort(nodeIp, openport, function (err) {
                                             if (err) {
                                                 logger.debug(err);
                                                 updateTaskStatusNode(node.name, "Unable to ssh/winrm into node " + node.name + ". Cannot import this node.", true, count);
                                                 return;
                                             }
-                                            insertNodeInMongo(node, function(err, nodeData) {
+                                            insertNodeInMongo(node, chefDetail, function (err, nodeData) {
                                                 if (err) {
-                                                    if(err.message){
+                                                    if (err.message) {
                                                         updateTaskStatusNode(nodeName, "The username or password/pemfile you entered is incorrect.", true, count);
                                                         return;
-                                                    }else {
+                                                    } else {
                                                         updateTaskStatusNode(nodeName, "Unknown error occured while importing " + node.name + ". Cannot import this node.", true, count);
                                                         return;
                                                     }
@@ -520,7 +554,10 @@ module.exports.setRoutes = function(app, verificationFunc) {
             });
 
         }
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        MasterUtils.getCongifMgmtsById(req.params.serverId, function (err, chefDetails) {
+            logger.debug("chefDetails---------->>>" + JSON.stringify(chefDetails));
+            logger.debug("reqBody.selectedNodes---------->>>" + JSON.stringify(reqBody.selectedNodes));
+
             if (err) {
                 res.send(500);
                 return;
@@ -534,16 +571,21 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefUserName: chefDetails.loginname,
                 chefUserPemFile: chefDetails.userpemfile,
                 chefValidationPemFile: chefDetails.validatorpemfile,
-                hostedChefUrl: chefDetails.url,
+                hostedChefUrl: chefDetails.url
             });
             if (reqBody.selectedNodes.length) {
+//                res.sendStatus(400);
+
                 importNodes(reqBody.selectedNodes, chefDetails);
+
             } else {
                 res.send(400);
                 return;
             }
+
         });
-        function checkNodeCredentials(credentials,nodeDetail,callback) {
+
+        function checkNodeCredentials(credentials, nodeDetail, callback) {
             if (nodeDetail.nodeOs !== 'windows') {
                 var sshOptions = {
                     username: credentials.username,
@@ -578,8 +620,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
         }
     });
 
-    app.post('/chef/environments/create/:serverId', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.post('/chef/environments/create/:serverId', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -595,7 +637,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.createEnvironment(req.body.envName, function(err, envName) {
+            chef.createEnvironment(req.body.envName, function (err, envName) {
                 if (err) {
                     res.status(500).send("Error to create Env on chef.");
                     return;
@@ -612,8 +654,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get('/chef/servers/:serverId/cookbooks', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.get('/chef/servers/:serverId/cookbooks', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -630,7 +672,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 hostedChefUrl: chefDetails.url,
             });
 
-            chef.getCookbooksList(function(err, cookbooks) {
+            chef.getCookbooksList(function (err, cookbooks) {
                 logger.debug(err);
                 if (err) {
                     res.send(500);
@@ -646,8 +688,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
     });
 
-    app.get('/chef/servers/:serverId/cookbooks/:cookbookName', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.get('/chef/servers/:serverId/cookbooks/:cookbookName', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -663,7 +705,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getCookbook(req.params.cookbookName, function(err, cookbooks) {
+            chef.getCookbook(req.params.cookbookName, function (err, cookbooks) {
                 logger.debug(err);
                 if (err) {
                     res.send(500);
@@ -676,9 +718,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get('/chef/servers/:serverId/cookbooks/:cookbookName/download', function(req, res) {
+    app.get('/chef/servers/:serverId/cookbooks/:cookbookName/download', function (req, res) {
 
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -695,7 +737,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 hostedChefUrl: chefDetails.url,
             });
 
-            chef.downloadCookbook(req.params.cookbookName, function(err, cookbooks) {
+            chef.downloadCookbook(req.params.cookbookName, function (err, cookbooks) {
                 logger.debug(err);
                 if (err) {
                     res.send(500);
@@ -711,7 +753,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
     });
 
-    app.post('/chef/servers/:serverId/attributes', function(req, res) {
+    app.post('/chef/servers/:serverId/attributes', function (req, res) {
 
         if (!((req.body.cookbooks && req.body.cookbooks.length) || (req.body.roles && req.body.roles.length))) {
             res.status(400).send({
@@ -720,7 +762,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
             return;
         }
 
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -737,7 +779,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 hostedChefUrl: chefDetails.url,
             });
             if (req.body.cookbooks && req.body.cookbooks.length) {
-                chef.getCookbookAttributes(req.body.cookbooks, function(err, attributesList) {
+                chef.getCookbookAttributes(req.body.cookbooks, function (err, attributesList) {
                     if (err) {
                         res.send(500);
                         return;
@@ -758,9 +800,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
     });
 
-    app.get('/chef/servers/:serverId/receipeforcookbooks/:cookbookName', function(req, res) {
+    app.get('/chef/servers/:serverId/receipeforcookbooks/:cookbookName', function (req, res) {
 
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -777,7 +819,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 hostedChefUrl: chefDetails.url,
             });
 
-            chef.getReceipesForCookbook(req.params.cookbookName, function(err, cookbooks) {
+            chef.getReceipesForCookbook(req.params.cookbookName, function (err, cookbooks) {
                 logger.debug(err);
                 if (err) {
                     res.send(500);
@@ -794,9 +836,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
 
-    app.get('/chef/servers/:serverId', function(req, res) {
+    app.get('/chef/servers/:serverId', function (req, res) {
         logger.debug(req.params.serverId);
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -819,8 +861,8 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
 
-    app.post('/chef/servers/:serverId/nodes/:nodeName/updateEnv', function(req, res) {
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+    app.post('/chef/servers/:serverId/nodes/:nodeName/updateEnv', function (req, res) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 logger.debug(err);
                 res.status(500).send(errorResponses.chef.corruptChefData);
@@ -837,21 +879,21 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.updateNodeEnvironment(req.params.nodeName, req.body.envName, function(err, success) {
+            chef.updateNodeEnvironment(req.params.nodeName, req.body.envName, function (err, success) {
                 if (err) {
                     res.send(500);
                     return;
-                }else if (success) {
-                        chefDao.updateChefNodeEnv(req.params.nodeName,req.body.envName,function(err,data){
-                            if(err){
-                                res.send(500);
-                                return;
-                            }else{
-                                res.send(200);
-                                return;
-                            }
-                        })
-                }else {
+                } else if (success) {
+                    chefDao.updateChefNodeEnv(req.params.nodeName, req.body.envName, function (err, data) {
+                        if (err) {
+                            res.send(500);
+                            return;
+                        } else {
+                            res.send(200);
+                            return;
+                        }
+                    })
+                } else {
                     res.send(500);
                     return;
                 }
@@ -859,9 +901,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get('/chef/servers/:serverId/cookbooks/:cookbookName/metadata', function(req, res) {
+    app.get('/chef/servers/:serverId/cookbooks/:cookbookName/metadata', function (req, res) {
 
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -877,7 +919,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getCookbook(req.params.cookbookName, function(err, cookbooks) {
+            chef.getCookbook(req.params.cookbookName, function (err, cookbooks) {
                 logger.debug(err);
                 if (err) {
                     res.send(500);
@@ -895,13 +937,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
 
     // Create new Data Bag.
-    app.post("/chef/servers/:serverId/databag/create", function(req, res) {
+    app.post("/chef/servers/:serverId/databag/create", function (req, res) {
         logger.debug("Enter /chef/../databag/create");
         var loggedInUser = req.session.user;
-        masterUtil.hasPermission("databag", "create", loggedInUser, function(err, isPermitted) {
+        masterUtil.hasPermission("databag", "create", loggedInUser, function (err, isPermitted) {
             logger.debug("Got permission to create DataBag: ", isPermitted);
             if (isPermitted) {
-                configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+                configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
                     if (err) {
                         res.send(500);
                         return;
@@ -917,7 +959,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         chefValidationPemFile: chefDetails.validatorpemfile,
                         hostedChefUrl: chefDetails.url,
                     });
-                    chef.createDataBag(req.body.name, function(err, dataBag) {
+                    chef.createDataBag(req.body.name, function (err, dataBag) {
                         if (err) {
                             logger.debug("Exit /chef/../databag/create");
                             res.status(500).send("Failed to create Data Bag on Chef.");
@@ -946,9 +988,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     // List all Data Bags.
-    app.get("/chef/servers/:serverId/databag/list", function(req, res) {
+    app.get("/chef/servers/:serverId/databag/list", function (req, res) {
         logger.debug("Enter /chef/../databag/list");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -964,7 +1006,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getDataBags(function(err, dataBags) {
+            chef.getDataBags(function (err, dataBags) {
                 if (err) {
                     logger.debug("Exit /chef/../databag/list");
                     res.status(500).send("Failed to get Data Bag from Chef.");
@@ -978,13 +1020,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     // Delete a particular Data Bag.
-    app.delete("/chef/servers/:serverId/databag/:dataBagName/delete", function(req, res) {
+    app.delete("/chef/servers/:serverId/databag/:dataBagName/delete", function (req, res) {
         logger.debug("Enter /chef/../databag/../delete");
         var loggedInUser = req.session.user;
-        masterUtil.hasPermission("databag", "delete", loggedInUser, function(err, isPermitted) {
+        masterUtil.hasPermission("databag", "delete", loggedInUser, function (err, isPermitted) {
             if (isPermitted) {
                 logger.debug("Got permission to remove DataBag: ", isPermitted);
-                configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+                configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
                     if (err) {
                         res.send(500);
                         return;
@@ -1000,7 +1042,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         chefValidationPemFile: chefDetails.validatorpemfile,
                         hostedChefUrl: chefDetails.url,
                     });
-                    chef.deleteDataBag(req.params.dataBagName, function(err, statusCode) {
+                    chef.deleteDataBag(req.params.dataBagName, function (err, statusCode) {
                         if (err) {
                             logger.debug("Exit /chef/../databag/../delete");
                             res.status(500).send("Failed to delete Data Bag on Chef.");
@@ -1026,13 +1068,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
 
     // Create new Data Bag Item.
-    app.post("/chef/servers/:serverId/databag/:dataBagName/item/create", function(req, res) {
+    app.post("/chef/servers/:serverId/databag/:dataBagName/item/create", function (req, res) {
         logger.debug("Enter /chef/../databag/../item/create");
         var loggedInUser = req.session.user;
-        masterUtil.hasPermission("databag", "create", loggedInUser, function(err, isPermitted) {
+        masterUtil.hasPermission("databag", "create", loggedInUser, function (err, isPermitted) {
             if (isPermitted) {
                 logger.debug("Got permission to create DataBagItem: ", isPermitted);
-                configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+                configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
                     if (err) {
                         res.status(500).send("Error to get chef detail.");
                         return;
@@ -1070,7 +1112,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         res.status(500).send("Invalid Json for Data Bag item.");
                         return;
                     }
-                    chef.createDataBagItem(req, dataBagItem, function(err, dataBagItem) {
+                    chef.createDataBagItem(req, dataBagItem, function (err, dataBagItem) {
                         if (err) {
                             logger.debug("Exit /chef/../databag/../item/create");
                             res.status(500).send("Failed to create Data Bag Item on Chef.");
@@ -1102,9 +1144,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
 
     // List all Data Bag Items for a Data Bag.
-    app.get("/chef/servers/:serverId/databag/:dataBagName/item/list", function(req, res) {
+    app.get("/chef/servers/:serverId/databag/:dataBagName/item/list", function (req, res) {
         logger.debug("Enter /chef/../databag/item/list");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -1120,7 +1162,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getDataBagItems(req.params.dataBagName, function(err, dataBagItems) {
+            chef.getDataBagItems(req.params.dataBagName, function (err, dataBagItems) {
                 if (err) {
                     logger.debug("Exit /chef/../databag/item/list");
                     res.status(500).send("Failed to get Data Bag from Chef.");
@@ -1143,13 +1185,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
 
 
     // Update a Data Bag Item.
-    app.post("/chef/servers/:serverId/databag/:dataBagName/item/:itemId/update", function(req, res) {
+    app.post("/chef/servers/:serverId/databag/:dataBagName/item/:itemId/update", function (req, res) {
         logger.debug("Enter /chef/../databag/../item/update");
         var loggedInUser = req.session.user;
-        masterUtil.hasPermission("databag", "modify", loggedInUser, function(err, isPermitted) {
+        masterUtil.hasPermission("databag", "modify", loggedInUser, function (err, isPermitted) {
             if (isPermitted) {
                 logger.debug("Got permission to update DataBagItem: ", isPermitted);
-                configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+                configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
                     if (err) {
                         res.send(500);
                         return;
@@ -1182,7 +1224,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         res.status(500).send("Invalid Json for Data Bag item.");
                         return;
                     }
-                    chef.updateDataBagItem(req, dataBagItem, function(err, dataBagItem) {
+                    chef.updateDataBagItem(req, dataBagItem, function (err, dataBagItem) {
                         if (err) {
                             logger.debug("Exit /chef/../databag/../item/update");
                             res.status(500).send("Failed to update Data Bag Item on Chef.");
@@ -1208,13 +1250,13 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     // Delete a Data Bag Item from a Data Bag.
-    app.delete("/chef/servers/:serverId/databag/:dataBagName/item/:itemName/delete", function(req, res) {
+    app.delete("/chef/servers/:serverId/databag/:dataBagName/item/:itemName/delete", function (req, res) {
         logger.debug("Enter /chef/../databag/../item/delete");
         var loggedInUser = req.session.user;
-        masterUtil.hasPermission("databag", "delete", loggedInUser, function(err, isPermitted) {
+        masterUtil.hasPermission("databag", "delete", loggedInUser, function (err, isPermitted) {
             if (isPermitted) {
                 logger.debug("Got permission to remove DataBagItem: ", isPermitted);
-                configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+                configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
                     if (err) {
                         res.send(500);
                         return;
@@ -1230,7 +1272,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                         chefValidationPemFile: chefDetails.validatorpemfile,
                         hostedChefUrl: chefDetails.url,
                     });
-                    chef.deleteDataBagItem(req.params.dataBagName, req.params.itemName, function(err, dataBagItem) {
+                    chef.deleteDataBagItem(req.params.dataBagName, req.params.itemName, function (err, dataBagItem) {
                         if (err) {
                             logger.debug("Exit /chef/../databag/../item/delete");
                             res.status(500).send("Failed to delete Data Bag Item on Chef.");
@@ -1251,9 +1293,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     // Find a Data Bag Item by Id from a Data Bag.
-    app.get("/chef/servers/:serverId/databag/:dataBagName/item/:itemId/find", function(req, res) {
+    app.get("/chef/servers/:serverId/databag/:dataBagName/item/:itemId/find", function (req, res) {
         logger.debug("Enter /chef/../databag/../item/find");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -1269,7 +1311,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.getDataBagItemById(req.params.dataBagName, req.params.itemId, function(err, dataBagItem) {
+            chef.getDataBagItemById(req.params.dataBagName, req.params.itemId, function (err, dataBagItem) {
                 if (err) {
                     logger.debug("Exit /chef/../databag/../item/find");
                     res.status(500).send("Failed to find Data Bag Item on Chef.");
@@ -1283,9 +1325,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
     });
 
     // Delete env from chef.
-    app.delete("/chef/servers/:serverId/environments/:envName", function(req, res) {
+    app.delete("/chef/servers/:serverId/environments/:envName", function (req, res) {
         logger.debug("Enter /chef/../environments");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -1301,7 +1343,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.deleteEnvironment(req.params.envName, function(err, env) {
+            chef.deleteEnvironment(req.params.envName, function (err, env) {
                 if (err) {
                     logger.debug("Exit /chef/../environments ", err);
                     res.status(500).send("Failed to delete environments on Chef.");
@@ -1314,9 +1356,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.delete("/chef/servers/:serverId/environments/:envName", function(req, res) {
+    app.delete("/chef/servers/:serverId/environments/:envName", function (req, res) {
         logger.debug("Enter /chef/../environments");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -1332,7 +1374,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.deleteEnvironment(req.params.envName, function(err, env) {
+            chef.deleteEnvironment(req.params.envName, function (err, env) {
                 if (err) {
                     logger.debug("Exit /chef/../environments ", err);
                     res.status(500).send("Failed to delete environments on Chef.");
@@ -1345,9 +1387,9 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get("/chef/servers/:serverId/search/:index", function(req, res) {
+    app.get("/chef/servers/:serverId/search/:index", function (req, res) {
         logger.debug("Enter /chef/../environments");
-        configmgmtDao.getChefServerDetails(req.params.serverId, function(err, chefDetails) {
+        configmgmtDao.getChefServerDetails(req.params.serverId, function (err, chefDetails) {
             if (err) {
                 res.send(500);
                 return;
@@ -1363,7 +1405,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 chefValidationPemFile: chefDetails.validatorpemfile,
                 hostedChefUrl: chefDetails.url,
             });
-            chef.search(req.params.index, req.query.searchQuery, function(err, env) {
+            chef.search(req.params.index, req.query.searchQuery, function (err, env) {
                 if (err) {
                     res.status(500).send("Failed to to seacrh on chef.");
                     return;
@@ -1375,7 +1417,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
         });
     });
 
-    app.get("/chef/nodeList", function(req, res) {
+    app.get("/chef/nodeList", function (req, res) {
         var reqObj = {};
         async.waterfall(
             [
@@ -1387,7 +1429,7 @@ module.exports.setRoutes = function(app, verificationFunc) {
                     apiUtil.paginationRequest(reqData, 'chefNodes', next);
                 },
                 function (paginationReq, next) {
-                    paginationReq['searchColumns'] = ['chefNodeIp', 'chefNodeName',"chefNodePlatform"];
+                    paginationReq['searchColumns'] = ['chefNodeIp', 'chefNodeName', "chefNodePlatform"];
                     apiUtil.databaseUtil(paginationReq, next);
                 },
                 function (queryObj, next) {
@@ -1396,13 +1438,12 @@ module.exports.setRoutes = function(app, verificationFunc) {
                 function (nodes, next) {
                     apiUtil.changeResponseForJqueryPagination(nodes, reqObj, next);
                 },
-
             ], function (err, results) {
-                if (err){
-                    res.send(err);
-                }else{
-                    res.send(results);
-                }
-            });
+            if (err) {
+                res.send(err);
+            } else {
+                res.send(results);
+            }
+        });
     });
 };
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
index d82e70bbe..de819cd09 100755
--- a/server/app/routes/v1.0/routes_organizations.js
+++ b/server/app/routes/v1.0/routes_organizations.js
@@ -1645,24 +1645,10 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                             if (infraManagerDetails.monitor && infraManagerDetails.monitor.parameters.transportProtocol === 'rabbitmq') {
                                                                             var sensuCookBook = 'recipe[sensu-client]';
                                                                             var runlist = [];
-                                                                            var jsonAttributes = {};
-
-                                                                            var cryptoConfig = appConfig.cryptoSettings;
-                                                                            var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-                                                                            var decryptedPassword = cryptography.decryptText(infraManagerDetails.monitor.parameters.transportProtocolParameters.password, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
-
-                                                                            var sensuAttributes = {
-                                                                                'rabbitmq_host': infraManagerDetails.monitor.parameters.transportProtocolParameters.host,
-                                                                                'rabbitmq_port': infraManagerDetails.monitor.parameters.transportProtocolParameters.port,
-                                                                                'rabbitmq_username': infraManagerDetails.monitor.parameters.transportProtocolParameters.user,
-                                                                                'rabbitmq_password': decryptedPassword,
-                                                                                'rabbitmq_vhostname': infraManagerDetails.monitor.parameters.transportProtocolParameters.vhost,
-                                                                                'instance-id': instance.platformId
-                                                                            };
-
-                                                                            logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
+                                                                            var jsonAttributes = {};                                                                            
+
                                                                             runlist.push(sensuCookBook);
-                                                                            jsonAttributes['sensu-client'] = sensuAttributes;
+                                                                            jsonAttributes['sensu-client'] = masterUtil.getSensuCookbookAttributes(infraManagerDetails.monitor,instance.platformId);
 
                                                                             bootstarpOption['runlist'] = runlist;
                                                                             bootstarpOption['jsonAttributes'] = jsonAttributes;
diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js
index 081386118..ff9f7ba7f 100644
--- a/server/app/routes/v1.0/routes_providercommon.js
+++ b/server/app/routes/v1.0/routes_providercommon.js
@@ -587,7 +587,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) {
 
                                                                             logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
                                                                             runlist.push(sensuCookBook);
-                                                                            jsonAttributes['sensu-client'] = sensuAttributes;
+                                                                            jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(infraManagerDetails.monitor,instance.platformId);;
 
                                                                             bootstarpOption['runlist'] = runlist;
                                                                             bootstarpOption['jsonAttributes'] = jsonAttributes;

From 023de8feb8af31ef5f6d62b7027f7c7079c7f652 Mon Sep 17 00:00:00 2001
From: Udesh <udesh.kumar@relevancelab.com>
Date: Mon, 28 Nov 2016 14:24:09 +0530
Subject: [PATCH 18/18] provider import changes and bug fixes

---
 server/app/lib/utils/masterUtil.js            |   1 +
 .../aws-blueprint/aws-blueprint.js            |  14 +-
 .../masters/cloudprovider/awsCloudProvider.js | 570 +++++++++---------
 server/app/routes/v1.0/routes_provider.js     |  59 +-
 .../app/routes/v1.0/routes_providercommon.js  |  16 +-
 5 files changed, 344 insertions(+), 316 deletions(-)

diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js
index e9452c8e6..ca62ac48d 100755
--- a/server/app/lib/utils/masterUtil.js
+++ b/server/app/lib/utils/masterUtil.js
@@ -25,6 +25,7 @@ var permissionsetDao = require('../../model/dao/permissionsetsdao');
 var d4dModel = require('../../model/d4dmasters/d4dmastersmodel.js');
 var configmgmtDao = require('../../model/d4dmasters/configmgmt.js');
 var appConfig = require('_pr/config');
+var Cryptography = require('../utils/cryptography');
 var chefSettings = appConfig.chef;
 var AppDeploy = require('_pr/model/app-deploy/app-deploy');
 var async = require('async');
diff --git a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
index d34716c80..0857eb826 100755
--- a/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/instance-blueprint/aws-blueprint/aws-blueprint.js
@@ -532,19 +532,7 @@ AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
                                         launchParams.blueprintData.getCookBookAttributes(instance, repoData, function (err, jsonAttributes) {
 
                                             AWSProvider.getAWSProviderById(instance.providerId, function (err, aProvider) {
-                                                if (aProvider && aProvider.monitorId) {
-
-                                                    monitorsModel.getById(aProvider.monitorId, function (err, monitor) {
-                                                        if (monitor) {
-                                                            fnBootstrapInstance(monitor);
-                                                        } else {
-                                                            fnBootstrapInstance(null);
-                                                        }
-
-                                                    });
-                                                } else {
-                                                    fnBootstrapInstance(null);
-                                                }
+                                                fnBootstrapInstance(aProvider.monitor);
 
                                             });
                                             function fnBootstrapInstance(monitor) {
diff --git a/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js b/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
index 889f34531..4ac18309b 100644
--- a/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
+++ b/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
@@ -1,18 +1,18 @@
 /*
-Copyright [2016] [Relevance Lab]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
+ Copyright [2016] [Relevance Lab]
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
 
 
 // This file act as a Model which contains provider schema and dao methods.
@@ -23,300 +23,318 @@ var extend = require('mongoose-schema-extend');
 var ObjectId = require('mongoose').Types.ObjectId;
 var schemaValidator = require('../../../dao/schema-validator');
 var uniqueValidator = require('mongoose-unique-validator');
+var monitorsModel = require('_pr/model/monitors/monitors.js');
 
 var Schema = mongoose.Schema;
 
 
 var awsProviderSchema = new Schema({
-	id: {
-		type: Number,
-		required: true
-	},
-	providerName: {
-		type: String,
-		required: true,
-		trim: true
-	},
-	providerType: {
-		type: String,
-		required: true,
-		trim: true
-	},
-	accessKey: {
-		type: String,
-		required: false,
-		trim: true
-	},
-	secretKey: {
-		type: String,
-		required: false,
-		trim: true
-	},
-	isDefault: {
-		type: Boolean,
-		required: true,
-		trim: false,
-		default: false
-	},
-	orgId: {
-		type: [String],
-		required: true,
-		trim: true
-	},
-	s3BucketName:{
-		type: String,
-		required: false,
-		trim: true
-	},
-	lastBillUpdateTime: {
-		type: Number,
-		required: false
-	},
-	plannedCost: {
-		type: Number,
-		required:false,
-		default:0.0
-	},
-	monitorId: {
-		type: String,
-		required:false,
-		trim: true,
-		default: null
-	}
+    id: {
+        type: Number,
+        required: true
+    },
+    providerName: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    providerType: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    accessKey: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    secretKey: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    isDefault: {
+        type: Boolean,
+        required: true,
+        trim: false,
+        default: false
+    },
+    orgId: {
+        type: [String],
+        required: true,
+        trim: true
+    },
+    s3BucketName: {
+        type: String,
+        required: false,
+        trim: true
+    },
+    lastBillUpdateTime: {
+        type: Number,
+        required: false
+    },
+    plannedCost: {
+        type: Number,
+        required: false,
+        default: 0.0
+    },
+    monitorId: {
+        type: String,
+        required: false,
+        trim: true,
+        default: null
+    }
 });
-awsProviderSchema.path('plannedCost').get(function(num) {
-	return (num).toFixed(2);
+awsProviderSchema.path('plannedCost').get(function (num) {
+    return (num).toFixed(2);
 });
 
 // Static methods :-
 
 // creates a new Provider
-awsProviderSchema.statics.createNew = function(providerData, callback) {
-	logger.debug("Enter createNew");
-	var providerObj = providerData;
-	var that = this;
-	var provider = new that(providerObj);
-	provider.save(function(err, aProvider) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-		logger.debug("Exit createNew with provider present");
-		callback(null, aProvider);
-		return;
-	});
+awsProviderSchema.statics.createNew = function (providerData, callback) {
+    logger.debug("Enter createNew");
+    var providerObj = providerData;
+    var that = this;
+    var provider = new that(providerObj);
+    provider.save(function (err, aProvider) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+        logger.debug("Exit createNew with provider present");
+        callback(null, aProvider);
+        return;
+    });
 };
 
-awsProviderSchema.statics.getAWSProviders = function(callback) {
-	logger.debug("Enter getAWSProviders");
-	this.find(function(err, providers) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
+awsProviderSchema.statics.getAWSProviders = function (callback) {
+    logger.debug("Enter getAWSProviders");
+    this.find(function (err, providers) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
 
-		logger.debug("Exit getAWSProviders with providers present");
-		callback(null, providers);
-		return;
+        logger.debug("Exit getAWSProviders with providers present");
+        callback(null, providers);
+        return;
 
-	});
+    });
 };
 
-awsProviderSchema.statics.getAWSProvidersForOrg = function(orgList, callback) {
-	logger.debug("Enter getAWSProvidersForOrg");
-	var orgIds = [];
-	for (var x = 0; x < orgList.length; x++) {
-		orgIds.push(orgList[x].rowid);
-	}
-	logger.debug("org id: ", orgIds);
-	this.find({
-		orgId: {
-			$in: orgIds
-		}
-	}, function(err, providers) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-		if (providers.length) {
-			logger.debug("Exit getAWSProvidersForOrg with providers present");
-			callback(null, providers);
-			return;
-		} else {
-			logger.debug("Exit getAWSProvidersForOrg with no providers present");
-			callback(null, null);
-			return;
-		}
-
-	});
+awsProviderSchema.statics.getAWSProvidersForOrg = function (orgList, callback) {
+    logger.debug("Enter getAWSProvidersForOrg");
+    var orgIds = [];
+    for (var x = 0; x < orgList.length; x++) {
+        orgIds.push(orgList[x].rowid);
+    }
+    logger.debug("org id: ", orgIds);
+    this.find({
+        orgId: {
+            $in: orgIds
+        }
+    }, function (err, providers) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+        if (providers.length) {
+            logger.debug("Exit getAWSProvidersForOrg with providers present");
+            callback(null, providers);
+            return;
+        } else {
+            logger.debug("Exit getAWSProvidersForOrg with no providers present");
+            callback(null, null);
+            return;
+        }
+
+    });
 };
 
-awsProviderSchema.statics.getAWSProviderById = function(providerId, callback) {
-	logger.debug("Enter getAWSProviderById");
-	if (!providerId) {
-		process.nextTick(function() {
-			callback({
-				message: "Invalid provider Id"
-			});
-		});
-		return;
-	}
-	this.find({
-		"_id": new ObjectId(providerId)
-	}, function(err, aProvider) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-		if (aProvider.length) {
-			logger.debug("Exit getAWSProviderById with provider present");
-			callback(null, aProvider[0]);
-			return;
-		} else {
-			logger.debug("Exit getAWSProviderById with no provider present");
-			callback(null, null);
-			return;
-		}
-
-	});
+awsProviderSchema.statics.getAWSProviderById = function (providerId, callback) {
+    logger.debug("Enter getAWSProviderById");
+    if (!providerId) {
+        process.nextTick(function () {
+            callback({
+                message: "Invalid provider Id"
+            });
+        });
+        return;
+    }
+    this.find({
+        "_id": new ObjectId(providerId)
+    }, function (err, aProvider) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+        if (aProvider.length) {
+            logger.debug("Exit getAWSProviderById with provider present");
+            var providerDetails = aProvider[0].toObject();
+            var monitorId = providerDetails['monitorId'];
+            delete providerDetails['monitorId'];
+            if (providerDetails && monitorId) {
+                monitorsModel.getById(monitorId, function (err, monitor) {
+                    if (err || !monitor) {
+                        providerDetails.monitor = null;
+                    } else {
+                        providerDetails.monitor = monitor;
+                    }
+                    callback(null, providerDetails);
+                    return;
+                });
+            } else {
+                providerDetails.monitor = null;
+                callback(null, providerDetails);
+                return;
+            }
+
+        } else {
+            logger.debug("Exit getAWSProviderById with no provider present");
+            callback(null, null);
+            return;
+        }
+
+    });
 };
 
-awsProviderSchema.statics.getAWSProviderByName = function(providerName, orgId, callback) {
-	logger.debug("Enter getAWSProviderById");
-	this.find({
-		"providerName": providerName,
-		"orgId": orgId
-	}, function(err, aProvider) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-		if (aProvider.length) {
-			logger.debug("Exit getAWSProviderById with provider present");
-			callback(null, aProvider[0]);
-			return;
-		} else {
-			logger.debug("Exit getAWSProviderById with no provider present");
-			callback(null, null);
-			return;
-		}
-
-	});
+awsProviderSchema.statics.getAWSProviderByName = function (providerName, orgId, callback) {
+    logger.debug("Enter getAWSProviderById");
+    this.find({
+        "providerName": providerName,
+        "orgId": orgId
+    }, function (err, aProvider) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+        if (aProvider.length) {
+            logger.debug("Exit getAWSProviderById with provider present");
+            callback(null, aProvider[0]);
+            return;
+        } else {
+            logger.debug("Exit getAWSProviderById with no provider present");
+            callback(null, null);
+            return;
+        }
+
+    });
 };
 
-awsProviderSchema.statics.updateAWSProviderById = function(providerId, providerData, callback) {
-	logger.debug("Enter updateAWSProviderById");
-	this.update({
-		"_id": new ObjectId(providerId)
-	}, {
-		$set: {
-			id: providerData.id,
-			providerName: providerData.providerName,
-			accessKey: providerData.accessKey,
-			secretKey: providerData.secretKey,
-			s3BucketName: providerData.s3BucketName,
-			monitorId:providerData.monitorId,
-			plannedCost:providerData.plannedCost
-		}
-	}, {
-		upsert: false
-	}, function(err, updateCount) {
-		if (err) {
-			logger.debug("Exit updateAWSProviderById with no update.");
-			callback(err, null);
-			return;
-		}
-		logger.debug("Exit updateAWSProviderById with update success.");
-		callback(null, updateCount);
-		return;
-
-	});
+awsProviderSchema.statics.updateAWSProviderById = function (providerId, providerData, callback) {
+    logger.debug("Enter updateAWSProviderById");
+    this.update({
+        "_id": new ObjectId(providerId)
+    }, {
+        $set: {
+            id: providerData.id,
+            providerName: providerData.providerName,
+            accessKey: providerData.accessKey,
+            secretKey: providerData.secretKey,
+            s3BucketName: providerData.s3BucketName,
+            monitorId: providerData.monitorId,
+            plannedCost: providerData.plannedCost
+        }
+    }, {
+        upsert: false
+    }, function (err, updateCount) {
+        if (err) {
+            logger.debug("Exit updateAWSProviderById with no update.");
+            callback(err, null);
+            return;
+        }
+        logger.debug("Exit updateAWSProviderById with update success.");
+        callback(null, updateCount);
+        return;
+
+    });
 };
 
-awsProviderSchema.statics.updateLastBillUpdateTime = function(providerId, billUpdateTime, callback) {
-	console.log(providerId)
-	this.update({
-		"_id": new ObjectId(providerId)
-	}, {
-		$set: {
-			lastBillUpdateTime: billUpdateTime
-		}
-	}, {
-		upsert: false
-	}, function(err, updateCount) {
-		if (err) {
-			return callback(err, null);
-		}
-
-		return callback(null);
-	});
+awsProviderSchema.statics.updateLastBillUpdateTime = function (providerId, billUpdateTime, callback) {
+    console.log(providerId)
+    this.update({
+        "_id": new ObjectId(providerId)
+    }, {
+        $set: {
+            lastBillUpdateTime: billUpdateTime
+        }
+    }, {
+        upsert: false
+    }, function (err, updateCount) {
+        if (err) {
+            return callback(err, null);
+        }
+
+        return callback(null);
+    });
 };
 
-awsProviderSchema.statics.removeAWSProviderById = function(providerId, callback) {
-	logger.debug("Enter removeAWSProviderById");
-	this.remove({
-		"_id": new ObjectId(providerId)
-	}, function(err, deleteCount) {
-		if (err) {
-			logger.debug("Exit removeAWSProviderById with error.");
-			callback(err, null);
-			return;
-		}
-		logger.debug("Exit removeAWSProviderById with delete success.");
-		callback(null, deleteCount);
-		return;
-
-	});
+awsProviderSchema.statics.removeAWSProviderById = function (providerId, callback) {
+    logger.debug("Enter removeAWSProviderById");
+    this.remove({
+        "_id": new ObjectId(providerId)
+    }, function (err, deleteCount) {
+        if (err) {
+            logger.debug("Exit removeAWSProviderById with error.");
+            callback(err, null);
+            return;
+        }
+        logger.debug("Exit removeAWSProviderById with delete success.");
+        callback(null, deleteCount);
+        return;
+
+    });
 };
 
-awsProviderSchema.statics.getAWSProvidersByOrgId = function(orgId, callback) {
-	logger.debug("Enter getAWSProvidersByOrgId");
-	logger.debug("org id: ", orgId);
-	this.find({
-		orgId: orgId
-	}, function(err, providers) {
-		if (err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-		if (providers.length) {
-			logger.debug("Exit getAWSProvidersByOrgId with providers present");
-			callback(null, providers);
-			return;
-		} else {
-			logger.debug("Exit getAWSProvidersByOrgId with no providers present");
-			callback(null, []);
-			return;
-		}
-
-	});
+awsProviderSchema.statics.getAWSProvidersByOrgId = function (orgId, callback) {
+    logger.debug("Enter getAWSProvidersByOrgId");
+    logger.debug("org id: ", orgId);
+    this.find({
+        orgId: orgId
+    }, function (err, providers) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+        if (providers.length) {
+            logger.debug("Exit getAWSProvidersByOrgId with providers present");
+            callback(null, providers);
+            return;
+        } else {
+            logger.debug("Exit getAWSProvidersByOrgId with no providers present");
+            callback(null, []);
+            return;
+        }
+
+    });
 };
 
 awsProviderSchema.statics.hasDefault = function hasDefault(orgId, callback) {
-	logger.debug("organization id: ", orgId);
-	this.find({orgId: orgId, isDefault: true}).then(function (providers) {
-		if (providers.length) {
-			logger.debug("Default user present for organization ", orgId);
-			callback(null, true);
-			return;
-		} else {
-			logger.debug("Default user not present for organization ", orgId);
-			callback(null, false);
-			return;
-		}
-	}, function (error) {
-		if(err) {
-			logger.error(err);
-			callback(err, null);
-			return;
-		}
-	});
+    logger.debug("organization id: ", orgId);
+    this.find({orgId: orgId, isDefault: true}).then(function (providers) {
+        if (providers.length) {
+            logger.debug("Default user present for organization ", orgId);
+            callback(null, true);
+            return;
+        } else {
+            logger.debug("Default user not present for organization ", orgId);
+            callback(null, false);
+            return;
+        }
+    }, function (error) {
+        if (err) {
+            logger.error(err);
+            callback(err, null);
+            return;
+        }
+    });
 };
 
 
diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js
index e8d3ca2c5..070827b86 100644
--- a/server/app/routes/v1.0/routes_provider.js
+++ b/server/app/routes/v1.0/routes_provider.js
@@ -3717,29 +3717,48 @@ function trackSettingWizard(orgId, callback) {
 }
 
 function getMonitorDetail(data, callback) {
-    data = data.toObject();
-    if (data.monitorId) {
-        var monitorId = data.monitorId;
-        delete data.monitorId;
-        monitorsModel.getById(monitorId, function (err, monitor) {
-            if (err || !monitor) {
-                data.monitor = null;
-            } else {
-                data.monitor = {};
-                data.monitor['id'] = monitor._id;
-                data.monitor['name'] = monitor.name;
-                data.monitor['type'] = monitor.type;
-                if (monitor.type === 'sensu') {
-                    data.monitor['parameters'] = {};
-                    data.monitor['parameters']['url'] = monitor['parameters']['url'];
-                    data.monitor['parameters']['transportProtocol'] = monitor['parameters']['transportProtocol'];
+    if (data.monitor) {
+        var monitor = {};
+        monitor['id'] = data.monitor._id;
+        monitor['name'] = data.monitor.name;
+        monitor['type'] = data.monitor.type;
+        if (data.monitor.type === 'sensu') {
+            monitor['parameters'] = {};
+            monitor['parameters']['url'] = data.monitor['parameters']['url'];
+            monitor['parameters']['transportProtocol'] = data.monitor['parameters']['transportProtocol'];
+        }
+        data.monitor = monitor;
+        callback(data);
+        return;
+    } else if (data.monitorId) {
+        var data = data.toObject();
+        var monitorId = data['monitorId'];
+        delete data['monitorId'];
+        if (monitorId) {
+            monitorsModel.getById(monitorId, function (err, monitor) {
+                if (err || !monitor) {
+                    data.monitor = null;
+                } else {
+                    data.monitor = {};
+                    data.monitor['id'] = monitor._id;
+                    data.monitor['name'] = monitor.name;
+                    data.monitor['type'] = monitor.type;
+                    if (monitor.type === 'sensu') {
+                        data.monitor['parameters'] = {};
+                        data.monitor['parameters']['url'] = monitor['parameters']['url'];
+                        data.monitor['parameters']['transportProtocol'] = monitor['parameters']['transportProtocol'];
+                    }
                 }
-            }
+                callback(data);
+                return;
+            });
+        } else {
+            data.monitor = null;
             callback(data);
-        });
+            return;
+        }
     } else {
-        delete data['monitorId'];
-        data.monitor = null;
         callback(data);
+        return;
     }
 }
diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js
index ff9f7ba7f..fd4a40800 100644
--- a/server/app/routes/v1.0/routes_providercommon.js
+++ b/server/app/routes/v1.0/routes_providercommon.js
@@ -230,6 +230,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) {
                 });
                 return;
             }
+            logger.debug("provider--------------->", JSON.stringify(provider));
 
             configmgmtDao.getEnvNameFromEnvId(req.body.envId, function (err, envName) {
                 if (err) {
@@ -567,27 +568,28 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) {
                                                                         };
 
 
-                                                                        if (infraManagerDetails.monitor && infraManagerDetails.monitor.parameters.transportProtocol === 'rabbitmq') {
+                                                                        if (provider.monitor && provider.monitor.parameters.transportProtocol === 'rabbitmq') {
                                                                             var sensuCookBook = 'recipe[sensu-client]';
                                                                             var runlist = [];
                                                                             var jsonAttributes = {};
 
                                                                             var cryptoConfig = appConfig.cryptoSettings;
                                                                             var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-                                                                            var decryptedPassword = cryptography.decryptText(infraManagerDetails.monitor.parameters.transportProtocolParameters.password, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
+                                                                            var decryptedPassword = cryptography.decryptText(provider.monitor.parameters.transportProtocolParameters.password, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
 
                                                                             var sensuAttributes = {
-                                                                                'rabbitmq_host': infraManagerDetails.monitor.parameters.transportProtocolParameters.host,
-                                                                                'rabbitmq_port': infraManagerDetails.monitor.parameters.transportProtocolParameters.port,
-                                                                                'rabbitmq_username': infraManagerDetails.monitor.parameters.transportProtocolParameters.user,
+                                                                                'rabbitmq_host': provider.monitor.parameters.transportProtocolParameters.host,
+                                                                                'rabbitmq_port': provider.monitor.parameters.transportProtocolParameters.port,
+                                                                                'rabbitmq_username': provider.monitor.parameters.transportProtocolParameters.user,
                                                                                 'rabbitmq_password': decryptedPassword,
-                                                                                'rabbitmq_vhostname': infraManagerDetails.monitor.parameters.transportProtocolParameters.vhost,
+                                                                                'rabbitmq_vhostname': provider.monitor.parameters.transportProtocolParameters.vhost,
                                                                                 'instance-id': instance.platformId
                                                                             };
 
                                                                             logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
                                                                             runlist.push(sensuCookBook);
-                                                                            jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(infraManagerDetails.monitor,instance.platformId);;
+                                                                            jsonAttributes['sensu-client'] = MasterUtils.getSensuCookbookAttributes(provider.monitor, instance.platformId);
+                                                                            ;
 
                                                                             bootstarpOption['runlist'] = runlist;
                                                                             bootstarpOption['jsonAttributes'] = jsonAttributes;