diff --git a/client/htmls/private/ajax/Settings/CreateConfigManagement.html b/client/htmls/private/ajax/Settings/CreateConfigManagement.html
index c1433e5ad..68d797167 100755
--- a/client/htmls/private/ajax/Settings/CreateConfigManagement.html
+++ b/client/htmls/private/ajax/Settings/CreateConfigManagement.html
@@ -48,11 +48,6 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management  <sp
                                                 </select>
                                                 <span data-val-controltovalidate="domainname" id="MainContent_Req_domainname" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
                                              </div>
-                                          
-                                          <hr/>
-                                            <!-- <div class="col-lg-6 col-md-6 display:none" >
-                                                <input name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control" type="text"  cdata="catalyst" hidden>
-                                             </div> -->
                                              <input type="hidden" name="ctl00$MainContent$orgname" value="chef" id="configType" class="form-control"  cdata="catalyst">
                                           
                                              <div class="col-lg-6 col-md-6" id="frmconfigmanagement" style="margin-top:20px">
@@ -105,7 +100,13 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management  <sp
                                                    </label>
                                                 </div>
                                              </div>
-                                          
+                                             <div class="hidden col-lg-6 col-md-6 margintop20  monitoringCheck">
+                                              <input type="checkbox" name="updateMonitoringInfo" style="vertical-align: middle;" id="updateMonitoringInfo"/>
+                                              <label for="">Enable Monitoring:</label>
+                                              <select id="monitorId" name="monitorId" disabled class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
+                                                  <option value="">Select Monitor</option>
+                                              </select>
+                                            </div>
                                           
                                     </div>
                                     <!-- end widget content -->
@@ -152,9 +153,42 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management  <sp
    }
    function setfolderpath(){
        var folderpath = '/' + $('#loginname').val() + "/.chef/";
-    //   alert(folderpath);
        $('#folderpath').val(folderpath);
    }
+
+   $('select#orgname').change(function(e){
+        var orgValueSelect = $(this).val();
+        if(orgValueSelect !== ''){
+            $('#monitorId').attr('disabled','disabled');
+            $('input[name="updateMonitoringInfo"]').removeAttr('checked');
+            getMonitorValues();
+        } else {
+            $('.monitoringCheck').addClass('hidden');
+        }
+    });
+
+    function getMonitorValues(){
+        $('.monitoringCheck').removeClass('hidden');
+        $.get('../monitors',function(data){
+            var orgValue = $('select#orgname option:selected').attr('rowid');
+            var str = ' <option value="">Select Monitor</option>';
+            for(var i=0;i<data.length;i++){
+                if(orgValue === data[i].organization.id){
+                    str = str + '<option value="'+data[i]._id+'">'+data[i].name+'</option>';
+                }
+            }
+            $('#monitorId').html(str);
+        });
+    }
+
+    $('input[name="updateMonitoringInfo"]').change(function(e){
+        if(this.checked){
+            $('#monitorId').removeAttr('disabled').attr('cat-validation','required');
+        }  else {  
+            $('#monitorId').val('').attr('selected', true).change();
+            $('#monitorId').removeAttr('cat-validation').attr('disabled','disabled');;
+        }
+    });
    
    function isUserTypeSuperAdmin(){
     $.get('/d4dMasters/loggedInUser',function(data){
@@ -201,26 +235,39 @@ <h4 class="widget-margin" style="color:black;">New Configuration Management  <sp
 </script>
 <script>
    $(document).ready(function () {
+    var isEditActivateLocation = location.href.toString().split('?')[1]==="new"?false:true;
+    var rowid = url.substr(url.indexOf("?") + 1);
+    if(isEditActivateLocation){
+      $.get('/d4dMasters/readmasterjsonrecord/10'+ '/' + rowid,function(data){
+          if(data.monitor !== null){
+            $('.monitoringCheck').removeClass('hidden');
+            $("input[name='updateMonitoringInfo']").attr('checked', true);
+            $('#monitorId').removeClass('hidden');
+            $.get('../monitors',function(monitorData){
+                var orgValue = $('select#orgname option:selected').attr('rowid');
+                var str = '';
+                for(var i=0;i<monitorData.length;i++){
+                    if(orgValue === monitorData[i].organization.id){
+                        str = '<option value="'+monitorData[i]._id+'">'+monitorData[i].name+'</option>';
+                        $('#monitorId').append(str).removeAttr('disabled');
+                        $("#monitorId").val(data.monitor.id).attr('selected', true).change();
+                    }
+                }
+            });
+          } else {
+            getMonitorValues();
+          }
+      });
+    }
       $("#configname").focus();
        $('#myForm22').submit(function() {
 
-           // $(this).validate();
-   
-           // if($(this).valid){
-           //      /*alert('valid form submitted'); // for demo*/
-           //     
-           // }else{
-           //      alert('invalid valid form submitted'); // for demo
-           // }
-         //  alert('in 1');
-         var isEditActivate= location.href.toString().split('?')[1]==="new"?false:true;
-       //  var operationType='';
 
-if(isEditActivate){
-  $('#userpemfile').removeAttr('cat-validation');
-  $('#validatorpemfile').removeAttr('cat-validation');
-  $('#kniferbfile').removeAttr('cat-validation');
-}          
+  if(isEditActivateLocation){
+    $('#userpemfile').removeAttr('cat-validation');
+    $('#validatorpemfile').removeAttr('cat-validation');
+    $('#kniferbfile').removeAttr('cat-validation');
+  }          
  if(validateForm()) {setfolderpath(); saveform('10');};
            return false; // for demo
        });
diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html
index 810efca2f..9997da7bc 100755
--- a/client/htmls/private/ajax/Settings/CreateProviders.html
+++ b/client/htmls/private/ajax/Settings/CreateProviders.html
@@ -244,6 +244,14 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                                                                 <option value="">Select Organization</option>
                                                             </select>
                                                         </div>
+                                                        <div class="hidden col-lg-6 col-md-6 margintop20 foraws monitoringCheck">
+                                                            <input type="checkbox" name="updateMonitoringInfo" style="vertical-align: middle;" id="updateMonitoringInfo"/>
+                                                            <label for="">Enable Monitoring:</label>
+                                                            <select id="monitorId" unique="true" name="monitorId" disabled class="chooseOrganization width-100" style="vertical-align: central" cdata="catalyst" skiprowid="yes">
+                                                                <option value="">Select Monitor</option>
+                                                            </select>
+                                                        </div>
+                                                        <input type="hidden" id="hiddenMonitorValue"/>
                                                     </div>
                                                 </div>
                                                 <!-- end widget div -->
@@ -279,7 +287,42 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
 <!--Popup for selecting a cloud provider before proceeding-->
 <script type="text/javascript" src="js/jquery.form.js"></script>
 <script>
+    
+    $('select#orgId').change(function(e){
+        var orgValueSelect = $(this).val();
+        if(orgValueSelect !== ''){
+            $('#monitorId').attr('disabled','disabled');
+            $('input[name="updateMonitoringInfo"]').removeAttr('checked');
+            getMonitorValues();
+        } else {
+            $('.monitoringCheck').addClass('hidden');
+        }
+    });
+
+    function getMonitorValues(){
+        $('.monitoringCheck').removeClass('hidden');
+        $.get('../monitors',function(data){
+            var orgValue = $('select#orgId').val();
+            var str = ' <option value="">Select Monitor</option>';
+            for(var i=0;i<data.length;i++){
+                if(orgValue === data[i].organization.id){
+                    str = str + '<option value="'+data[i]._id+'">'+data[i].name+'</option>';
+                }
+            }
+            $('#monitorId').html(str);
+        });
+    }
 
+    $('input[name="updateMonitoringInfo"]').change(function(e){
+        if(this.checked){
+            $('#monitorId').removeAttr('disabled').attr('cat-validation','required');
+        }  else {
+            $('#hiddenMonitorValue').val('');  
+            $('#monitorId').val('').attr('selected', true).change();
+            $('#monitorId').removeAttr('cat-validation').attr('disabled','disabled');;
+        }
+    });
+    
     var UtilityMethods = {
         initTooltip: function() {
             var $tool = $("[rel=tooltip]");
@@ -478,7 +521,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                     str = str + '<option value="' + val[i].KeyName + '">' + val[i].KeyName + '</option>';
                 }
                 $region.parents('.addNewRegion').find('select.keyvalue').html(str).val('').select2().each(function() {
-                    console.log($(this).attr('answer'));
                     $(this).attr('answer') ? $(this).val($(this).attr('answer')).select2() : "";
                 });
                 $('#btnsubmit').removeAttr('disabled');
@@ -630,7 +672,27 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
             $('.aws-secret-info').hide();
             $('.secretInfo').removeAttr('cat-validation');
         }
-
+        if(data.monitor !== null){
+            $('.monitoringCheck').removeClass('hidden');
+            $('input[name="updateMonitoringInfo"]').attr('checked', true);
+            $('#monitorId').removeClass('hidden');
+            $.get('../monitors',function(monitorData){
+                var orgValue = $('select#orgId').val();
+                var str = '';
+                for(var i=0;i<monitorData.length;i++){
+                    if(orgValue === monitorData[i].organization.id){
+                        str = '<option value="'+monitorData[i]._id+'">'+monitorData[i].name+'</option>';
+                        $('#monitorId').append(str).removeAttr('disabled');
+                        $("#monitorId").val(data.monitor.id).attr('selected', true).change();
+                    }
+                }
+            });
+            var monitorHiddenValue = $('#monitorId').val();
+            $('#hiddenMonitorValue').val(monitorHiddenValue);
+        } else {
+            $('#hiddenMonitorValue').val('');
+            getMonitorValues();
+        }
         var parentList = $('.addNewRegion');
         $('select.region').on('change', checkForKeyPair);
         for (var i = 0; i < data.keyPairs.length; i++) {
@@ -716,7 +778,13 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
             beforeSubmit: function(arr, $form, options) {
                 if (location.toString().indexOf('?new') === -1) {
                     var orgValue = $('#orgId').val();
-                    arr.push({name:'orgId',value:orgValue,type:'select-one',required:false})
+                    arr.push({name:'orgId',value:orgValue,type:'select-one',required:false});
+                    var monitorValue = $('#hiddenMonitorValue').val();
+                    if(!monitorValue) {
+                        arr =  arr.concat({name:'monitorId',value:monitorValue,type:'select-one',required:false});
+                    } else {
+                        arr.push({name:'monitorId',value:monitorValue,type:'select-one',required:false});
+                    }
                 }
                 if (location.toString().indexOf('?new') === -1 && $('#providertype').val() == 'AZURE') {
                     var azureSubscriptionId = $('#azureSubscriptionId').val();
@@ -743,7 +811,6 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
                         return false;
                 } else {
                     if (isFormValid()) {
-                        console.log(arr);
                         appendLoader();
                         return true;
                     } else {
diff --git a/client/htmls/private/ajax/Settings/monitoringServer.html b/client/htmls/private/ajax/Settings/monitoringServer.html
new file mode 100644
index 000000000..c6341a119
--- /dev/null
+++ b/client/htmls/private/ajax/Settings/monitoringServer.html
@@ -0,0 +1,691 @@
+<style>
+input[type="file"] { 
+    display: none;
+}
+</style>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="widget-box">
+      <div class="widget-header">
+        <h5 class="widget-title widgetColor">
+          <strong>List of Monitoring Servers</strong>
+        </h5>
+        <div class="widget-toolbar no-border">
+          <div>
+            <!--new button for adding a new item-->
+            <a href="#modalForTrackEdit" type="reset" data-backdrop="false" data-toggle="modal" class="btn btn-minier btn-primary addDashboardItem">
+            <i class="ace-icon ace-icon fa fa-plus bigger-110"></i>&nbsp;New
+            </a>                                                                                                            
+          </div>
+        </div>
+      </div>
+      <div class="widget-body">
+        <div class="widget-main widgetHeight">
+          <div class="col-md-12 table-responsive tablePadding">
+            <table id="monitorTable" class="tableData table table-striped table-bordered table-hover dataTable no-footer textCenter" cellpadding="5px">
+              <thead>
+                <tr class="rowCustomStyle">
+                  <td>Name</td>
+                  <td>Organization</td>
+                  <td>Type</td>
+                  <td>Server Url</td>
+                  <td>Protocol Type</td>
+                  <td>Host</td>
+                  <td>Port</td>
+                  <td>Action</td>
+                </tr>
+              </thead>
+              <tbody id="monitorTableInput">
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <!--widget main ends here-->
+      </div>
+      <!--widget body ends here-->
+    </div>
+    <!--widget box ends here-->  
+  </div>
+  <!-- col-lg-12 ends here-->
+</div>
+<!--row ends here-->     
+
+<!--modal for ItemList-->
+<div class="modal fade" id="modalForTrackEdit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+  <div class="modal-dialog " style="">
+    <div class="modal-content">
+      <form role="form" id="monitorServerForm">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <h4 class="modal-title">
+          </h4>
+        </div>
+        <div class="modal-body">
+          <fieldset class="fieldsetCustom">
+            <div class="col-lg-6 col-md-6 col-xs-6">
+              <label for="monitorName">Name:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="text" name="monitorName" class="required monitorName form-control" id="monitorName">
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6">
+              <label for="">Organization Name:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <select id="orgName" name="orgName" class="required form-control width-100" style="vertical-align:central"></select>
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15">
+              <label for="">Server Type:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <select id="serverType" name="serverType" class="required form-control width-100" style="vertical-align:central">
+                  <option value="">Choose Server Type</option>
+                  <option value="sensu">Sensu</option>
+                </select>
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 margintop15 serverType hidden">
+                <label for="serverUrl">Server URL:<span class="control-label redSpan">&nbsp;*</span></label>
+                <div class="input-groups">
+                  <input type="url" name="serverUrl" class="required serverUrl form-control" id="serverUrl"/> 
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 serverType hidden">
+              <label for="">Protocol Type:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <select id="protocolType" name="protocolType" class="required form-control width-100" style="vertical-align:central">
+                  <option value="">Choose Protocol Type</option>
+                  <!-- <option value="redis">Redis</option> -->
+                  <option value="rabbitmq">RabbitMq</option>
+                </select>
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="protocolUser">User:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="text" name="protocolUser" class=" protocolUser form-control" id="protocolUser">
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="protocolPassword">Password:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="password" name="protocolPassword" class="protocolPassword form-control" id="protocolPassword">
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="protocolHost">Host:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="text" name="protocolHost" class="required protocolHost form-control" id="protocolHost">
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="protocolPort">Port:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="text" name="protocolPort" class="required protocolPort form-control" id="protocolPort">
+              </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="protocolVhost">Vhost:<span class="control-label redSpan">&nbsp;*</span></label>
+              <div class="input-groups">
+                <input type="text" name="protocolVhost" class=" protocolVhost form-control" id="protocolVhost">
+              </div>
+            </div>
+            
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="certificateFile">Certificate File:</label>
+              <div class="input-groups">
+                <input type="file" extension="pem" name="certificateFile" id="certificateFile" class="form-control form-controls" onchange="setFileNameCertificate(this.value);"/>
+              </div>
+                <span class="pull-left">
+                    <label title="Please choose a Certificate file" class="choose-file cursor" for="certificateFile">Choose File</label>
+                </span>
+                <div id="certificateFileNameDisplay" class="file-name"></div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-xs-6 margintop15 hidden showForRabbit">
+              <label for="privateFile">Private File:</label>
+              <div class="input-groups">
+                <input type="file" extension="pem" name="privateFile" id="privateFile" class="form-control form-controls" onchange="setFileNamePrivate(this.value);"/>
+              </div>
+                <span class="pull-left">
+                    <label title="Please choose a Private file" class="choose-file cursor" for="privateFile">Choose File</label>
+                </span>
+                <div id="privateFileNameDisplay" class="file-name"></div>
+            </div>
+            <input type="hidden" id="monitorEditHiddenInputId">
+            <input type="hidden" id="monitorEditHiddenInput">
+            <input type="hidden" id="monitorHiddenCertificateFile">
+            <input type="hidden" id="monitorHiddenPrivateFile">
+          </fieldset>
+        </div>
+        <div class="modal-footer">
+          <label id="saveItemSpinner" class="hidden"><img  style="margin-left:5px;margin-right:25px;" src="img/select2-spinner.gif"></label>
+          <a type="button" class="btn btn-default" data-dismiss="modal"><i class="ace-icon fa fa-times bigger-110"></i>&nbsp;Cancel</a>
+          <button type="submit" id="saveBtnTrack" class="btn btn-primary" value="Save"><i class="ace-icon fa fa-check bigger-110"></i>&nbsp;Save</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+
+<script>
+//initialising the datatable...
+if (!$.fn.dataTable.isDataTable('#monitorTable')) {
+    var $monitorDatatable = $('#monitorTable').DataTable({
+        "pagingType": "full_numbers",
+        "bInfo": false,
+        "bLengthChange": false,
+        "paging": true,
+        "bFilter": false,
+        "aoColumns": [{
+            "bSortable": false
+        }, {
+            "bSortable": false
+        }, {
+            "bSortable": false
+        }, {
+            "bSortable": false
+        },{
+            "bSortable": false
+        },{
+            "bSortable": false
+        },{
+            "bSortable": false
+        }, {
+            "bSortable": false
+        }]
+
+    });
+}
+
+//calling the global track functionality when track params are available..
+$(document).ready(function(e) {
+    getGlobalMonitorServers();
+});
+
+function setFileNameCertificate(val){
+    $('#certificateFileNameDisplay').empty();
+    var fileNameCertificate = val.substr(val.lastIndexOf("\\")+1, val.length);
+    $("#certificateFileNameDisplay").append(fileNameCertificate);
+}
+
+function setFileNamePrivate(val){
+    $('#privateFileNameDisplay').empty();
+    var fileNamePrivate = val.substr(val.lastIndexOf("\\")+1, val.length);
+    $("#privateFileNameDisplay").append(fileNamePrivate);
+}
+
+var serverTypeValue = $('#serverType').val();
+$('#serverType').change(function(e){
+    var val = $(this).val();
+    if(val === 'sensu') {
+      $('.serverType').removeClass('hidden');
+    }else {
+      $('.serverType').addClass('hidden');
+      $('.showForRabbit').addClass('hidden');
+      $('#protocolType').val('');
+    }
+});
+
+$('#protocolType').change(function(e){
+    var val = $(this).val();
+    if (val === 'rabbitmq') {
+        $('.showForRabbit').removeClass('hidden');
+    } else {
+        $('.showForRabbit').addClass('hidden');
+    }
+});
+
+//when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item..
+$('.addDashboardItem').click(function(e) {
+    $('#monitorServerForm').trigger('reset');
+    $('.modal-header').find('.modal-title').html('Create New Monitoring Server');
+    $('#monitorEditHiddenInput').val('new');
+    getOrganizationList();
+    $('#orgName,#protocolType').removeAttr('disabled');
+    $('#protocolType').change();
+    $('#monitorEditHiddenInputId,#monitorHiddenCertificateFile,#monitorHiddenPrivateFile').val('');
+    $('#certificateFileNameDisplay').empty();
+    $('#privateFileNameDisplay').empty();
+});
+
+//to list down the organization for creating the monitoring server item.
+function getOrganizationList() {
+    $.get('/d4dMasters/readmasterjsonnew/1', function(data) {
+        var str = ' <option value="">Select Organization</option>',
+        len = data.length;
+        for (var i = 0; i < data.length; i++) {
+            str = str + '<option value="' + data[i].rowid + '">' + data[i].orgname + '</option>';
+        }
+        $('#orgName').html(str);
+    })
+}
+
+
+//to show the focus on first input ....
+$(document).on('shown.bs.modal', function(e) {
+    $('[autofocus]', e.target).focus();
+});
+
+//form validation for dashboard save
+var validator = $('#monitorServerForm').validate({
+    ignore: [],
+    rules: {
+        serverUrl: {
+            url: true
+        },
+        protocolPassword : {
+          required: true
+        },
+        certificateFile: {
+            extension: "pem"
+        },
+        privateFile: {
+            extension: "pem"
+        },
+        monitorName: {
+            maxlength: 15
+        }
+    },
+    messages: {
+        certificateFile: {
+            extension: "Only .pem files"
+        },
+        privateFile: {
+            extension: "Only .pem files"
+        },
+        monitorName: {
+            maxlength: "Limited to 15 chars"
+        }
+    },
+    onkeyup: false,
+    errorClass: "error",
+
+    //put error message behind each form element
+    errorPlacement: function(error, element) {
+        console.log(error, element);
+        var elem = $(element);
+        if (element.parent('.input-groups').length) {
+            error.insertBefore(element.parent());
+        } else {
+            if (element.parent('div.inputGroups')) {
+                console.log(element);
+                console.log(element.parent);
+                error.insertBefore('div.inputGroups');
+            }
+
+            $("select.select2-me").each(function(index, el) {
+
+                if ($(this).is("[data-rule-required]") &&
+                    $(this).attr("data-rule-required") == "true") {
+                    $(this).on('select2-close', function(e) {
+                        $(this).valid()
+                    });
+                }
+            });
+        }
+    },
+
+    //When there is an error normally you just add the class to the element.
+    // But in the case of select2s you must add it to a UL to make it visible.
+    // The select element, which would otherwise get the class, is hidden from
+    // view.
+    highlight: function(element, errorClass, validClass) {
+        var elem = $(element);
+        if (elem.hasClass("select2-offscreen")) {
+            $("#s2id_" + elem.attr("id") + " ul").addClass(errorClass);
+        } else {
+            elem.addClass(errorClass);
+        }
+    },
+
+    //When removing make the same adjustments as when adding
+    unhighlight: function(element, errorClass, validClass) {
+        var elem = $(element);
+        if (elem.hasClass("select2-offscreen")) {
+            $("#s2id_" + elem.attr("id") + " ul").removeClass(errorClass);
+        } else {
+            elem.removeClass(errorClass);
+        }
+    }
+});
+$('a.addDashboardItem[type="reset"]').on('click', function(e) {
+    validator.resetForm();
+});
+
+//this is a functionality to get the list of global track items that have been created....
+function getGlobalMonitorServers() {
+    //for getting the list of monitors
+    var trackUrlDetails = '../monitors';
+    $.get(trackUrlDetails, function(data) {
+        if (data && data.length) {
+            for (var kk = 0; kk < data.length; kk++) {
+                createTableForMonitorList(data[kk]);
+            }
+        }
+
+
+    }).fail(function(jxhr) {
+        var msg = "Server Behaved Unexpectedly";
+        if (jxhr.responseJSON && jxhr.responseJSON.message) {
+            msg = jxhr.responseJSON.message;
+        } else if (jxhr.responseText) {
+            msg = jxhr.responseText;
+        }
+        bootbox.alert(msg);
+    });
+};
+
+
+//creating a table for showcasing the list of track items on the dashboard page..
+function createTableForMonitorList(monitorData) { 
+  var $monitorList = $('#monitorTable tbody');
+  var $tr = $('<tr class="monitorItemRow"></tr>').attr('data-monitorId', monitorData._id).attr('data-type', monitorData.type).attr('transportProtocol-type', monitorData.parameters.transportProtocol).attr('orgId',monitorData.organization.id).attr('orgName',monitorData.organization.name);
+  $tr.data('monitorData', monitorData);
+
+  var $tdName = $('<td class="monitorName">' + monitorData.name + '</td>');
+
+  var $tdOrganization = $('<td class="monitorOrg">' + monitorData.organization.name + '</td>');
+
+  var $tdServerType = $('<td class="monitorServerType">' + monitorData.type + '</td>');
+
+  var $tdServerURL = $('<td class="monitorServerURL">' + monitorData.parameters.url + '</td>');
+  
+  var $tdProtocolType = $('<td class="monitorProtocolType">' + monitorData.parameters.transportProtocol + '</td>');
+
+  var $tdProtocolHost = $('<td class="monitorProtocolHost">' + monitorData.parameters.transportProtocolParameters.host + '</td>');
+
+  var $tdProtocolPort = $('<td class="monitorProtocolPort">' + monitorData.parameters.transportProtocolParameters.port + '</td>');
+
+  var $tdAction = $('<td/>');
+
+  $tdAction.append('<div class="btn-group">').append('<div style="margin-left:14px;" class="btn-group"><button class="btn btn-danger pull-left btn-sg tableactionbutton globalMonitorRemove" data-placement="top" value="Remove" title="Delete"><i class="ace-icon fa fa-trash-o bigger-120"></i></button></div>');
+
+  //for editing track items from the table...
+  /*$tdAction.find('button.editMonitorRow').click(function() {
+      var $this = $(this);
+      var $tr = $this.parents('tr.monitorItemRow');
+      var monitorData = $tr.data('monitorData');
+      var monitorId = monitorData._id;
+      var $editModal = $('#modalForTrackEdit');
+      $editModal.modal('show');
+      $editModal.find('#monitorEditHiddenInput').val('edit');
+      $editModal.find('h4.modal-title').html('Edit Monitor Item &nbsp;-&nbsp;&nbsp;' + monitorData.name);
+      $editModal.find('#monitorName').val(monitorData.name);
+      $editModal.find('#orgName').empty().append('<option value="'+$this.parents('tr').attr("orgId")+'">'+$this.parents('tr').attr("orgName")+'</option>').attr('disabled','disabled');
+      $editModal.find('#serverType').val(monitorData.type);
+      $editModal.find('.serverUrl').val(monitorData.parameters.url);
+      $editModal.find('#protocolType').val(monitorData.parameters.transportProtocol).change().attr('disabled','disabled');
+      $editModal.find('.protocolHost').val(monitorData.parameters.transportProtocolParameters.host);
+      $editModal.find('.protocolPort').val(monitorData.parameters.transportProtocolParameters.port);
+      $editModal.find('.protocolPassword').val('').rules('remove', 'required');
+      $editModal.find('.protocolVhost').val(monitorData.parameters.transportProtocolParameters.vhost);
+      $editModal.find('.protocolUser').val(monitorData.parameters.transportProtocolParameters.user);
+      $editModal.find('#monitorEditHiddenInputId').val(monitorData._id);
+      if(monitorData.parameters.transportProtocolParameters.ssl) {
+          $editModal.find('#monitorHiddenCertificateFile').val(monitorData.parameters.transportProtocolParameters.ssl.certChainFile.id);
+          $editModal.find('#certificateFileNameDisplay').empty().append(monitorData.parameters.transportProtocolParameters.ssl.certChainFile.name);
+          $editModal.find('#monitorHiddenPrivateFile').val(monitorData.parameters.transportProtocolParameters.ssl.privateKeyFile.id);
+          $editModal.find('#privateFileNameDisplay').empty().append(monitorData.parameters.transportProtocolParameters.ssl.privateKeyFile.name);
+      }
+      return false;
+  });*/
+
+  //for deletion of track items from the table..
+  $tdAction.find('button.globalMonitorRemove').click(function() {
+
+      var $this = $(this);
+      var $tr = $this.parents('tr.monitorItemRow');
+      var monitorId = monitorData._id;
+      bootbox.confirm({
+          message: 'Are you sure you want to Delete Monitor Item -&nbsp;' + monitorData.name,
+          title: "Warning",
+          callback: function(result) {
+              if (result) {
+                  $.ajax({
+                      url: '../monitors/' + monitorId,
+                      method: 'DELETE',
+                      success: function() {
+                          $monitorDatatable.row($tr).remove().draw(false);
+
+                      },
+                      error: function(jxhr) {
+                          bootbox.alert(result);
+                          var msg = "Unable to Delete URL please try again later";
+                          if (jxhr.responseJSON && jxhr.responseJSON.message) {
+                              msg = jxhr.responseJSON.message;
+                          } else if (jxhr.responseText) {
+                              msg = jxhr.responseText;
+                          }
+                          bootbox.alert(msg);
+                      }
+                  });
+              } else {
+                  return;
+              }
+          }
+      });
+      return false;
+  });
+
+  $tr.append($tdName).append($tdOrganization).append($tdServerType).append($tdServerURL).append($tdProtocolType).append($tdProtocolHost).append($tdProtocolPort).append($tdAction);
+  $monitorList.append($tr);
+  $monitorDatatable.row.add($tr).draw();
+};
+
+function saveForm(methodName,url,reqBody,createNewEdit,monitorId,parameters,name,serverType) {
+  $.ajax({
+  method: methodName,
+  url: url,
+  async:false,
+  data: reqBody,
+  success: function(data, success) {
+      $('#modalForTrackEdit').modal('hide');
+      $('#saveItemSpinner').addClass('hidden');
+      $('#saveBtnTrack').removeAttr('disabled');  
+      if (createNewEdit === 'new') {
+          $monitorDatatable.clear().draw(); 
+          getGlobalMonitorServers();
+          $('#saveBtnTrack').removeAttr('disabled');
+      } else {
+          var $tr = $('tr[data-monitorId="' + monitorId + '"]');
+          $tr.find('.monitorName').html(reqBody.name);
+          $tr.find('.monitorServerType').html(reqBody.type);
+          $tr.find('.monitorServerURL').html(reqBody.parameters.url);
+          $tr.find('.monitorProtocolHost').html(reqBody.parameters.transportProtocolParameters.host);
+          $tr.find('.monitorProtocolPort').html(reqBody.parameters.transportProtocolParameters.port);
+          $tr.data('monitorData', {
+              name:name,
+              _id: monitorId,
+              type: serverType,
+              parameters:parameters
+          });
+      }
+  },
+  error: function(jxhr) {
+      console.log(jxhr);
+      var msg = "Server Behaved Unexpectedly";
+      if (jxhr.responseJSON && jxhr.responseJSON.message) {
+          msg = jxhr.responseJSON.message;
+      } else if (jxhr.responseText) {
+          msg = jxhr.responseText;
+      }
+      bootbox.alert(msg);
+
+      $('#saveItemSpinner').addClass('hidden');
+      $('#saveBtnTrack').removeAttr('disabled');
+  }
+});
+}
+
+//save form for creating a new monitor item and updation of the monitor server details.
+$('#monitorServerForm').submit(function(e) {
+    var isValidator = $('#monitorServerForm').valid();
+    if (!isValidator) {
+        e.preventDefault();
+        return false;
+    } else {
+        e.preventDefault();
+        $('#saveItemSpinner').removeClass('hidden');
+        var $form = $('#monitorServerForm');
+        $this = $(this);
+        var name, orgValue, serverType, serverUrl, protocolType, host, port, passwordName, vhost, user, certChainFileId, privateKeyFileId;
+
+        name = $this.find('.monitorName').val().trim();
+        orgValue = $this.find('#orgName').val();
+        serverType = $this.find('#serverType').val();
+        serverUrl = $this.find('.serverUrl').val().trim();
+        protocolType = $this.find('#protocolType').val();
+        host = $this.find('.protocolHost').val().trim();
+        port = $this.find('.protocolPort').val().trim();
+        passwordName = $this.find('.protocolPassword').val().trim();
+        vhost = $this.find('.protocolVhost').val().trim();
+        user = $this.find('.protocolUser').val().trim();
+        certChainFileId = $this.find('#monitorHiddenCertificateFile').val();
+        privateKeyFileId = $this.find('#monitorHiddenPrivateFile').val();
+
+        var dashboardEditNew = $this.find('#monitorEditHiddenInput').val();
+        var monitorId = $form.find('input#monitorEditHiddenInputId').val();
+        var parameters = {};
+        var url;
+        var reqBody = {};
+        var methodName;
+        //for edit of form.
+        var fileCertificate = $('#certificateFile').get(0).files[0];
+        var filePrivate = $('#privateFile').get(0).files[0];
+        var formData = new FormData();
+        formData.append('file', fileCertificate);
+        var newFormData = new FormData();
+        newFormData.append('file', filePrivate);
+        if (dashboardEditNew === 'edit') {
+            url = '../monitors/' + monitorId;
+            methodName = 'PUT';
+        } else {
+            methodName = 'POST';
+            url = '../monitors';
+        }
+        if (protocolType === 'rabbitmq') {
+          if(certChainFileId === '' && privateKeyFileId === ''){
+            $.ajax({
+                method: "POST",
+                url: '../fileUpload?fileId=' + certChainFileId,
+                data: formData,
+                cache: false,
+                contentType: false,
+                processData: false,
+                success: function(dataCertificate, success) {
+                    $.ajax({
+                        method: "POST",
+                        url: '../fileUpload?fileId=' + privateKeyFileId,
+                        data: newFormData,
+                        cache: false,
+                        contentType: false,
+                        processData: false,
+                        success: function(dataPrivate, success) {
+                            parameters = {
+                                url: serverUrl,
+                                transportProtocol: protocolType,
+                                transportProtocolParameters: {
+                                    host: host,
+                                    port: port,
+                                    vhost: vhost,
+                                    user: user,
+                                    password: passwordName,
+                                    heartbeat: 30,
+                                    prefetch: 50,
+                                    ssl: {
+                                        certChainFileId: dataCertificate.fileId,
+                                        privateKeyFileId: dataPrivate.fileId
+                                    }
+                                }
+                            };
+                            reqBody = {
+                                "name": name,
+                                "orgId": orgValue,
+                                "type": serverType,
+                                "parameters": parameters
+                            }
+                            saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters,name,serverType);
+                        }
+                    });
+                }
+            });
+          } else {
+            if (passwordName !== '') {
+              parameters = {
+                  url: serverUrl,
+                  transportProtocol: protocolType,
+                  transportProtocolParameters: {
+                      host: host,
+                      port: port,
+                      vhost: vhost,
+                      user: user,
+                      password: passwordName,
+                      heartbeat: 30,
+                      prefetch: 50,
+                      ssl: {
+                          certChainFileId: certChainFileId,
+                          privateKeyFileId: privateKeyFileId
+                      }
+                  }
+              };
+            } else {
+              parameters = {
+                  url: serverUrl,
+                  transportProtocol: protocolType,
+                  transportProtocolParameters: {
+                      host: host,
+                      port: port,
+                      vhost: vhost,
+                      user: user,
+                      heartbeat: 30,
+                      prefetch: 50,
+                      ssl: {
+                          certChainFileId: certChainFileId,
+                          privateKeyFileId: privateKeyFileId
+                      }
+                  }
+              };
+            }
+            reqBody = {
+                "name": name,
+                "orgId": orgValue,
+                "type": serverType,
+                "parameters": parameters
+            }
+            saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters,name,serverType);
+          }
+        } else if (protocolType === 'redis') {
+            if (passwordName !== '') {
+                parameters = {
+                    url: serverUrl,
+                    transportProtocol: protocolType,
+                    transportProtocolParameters: {
+                        host: host,
+                        port: port,
+                        password: passwordName
+                    }
+                };
+            } else {
+                parameters = {
+                    url: serverUrl,
+                    transportProtocol: protocolType,
+                    transportProtocolParameters: {
+                        host: host,
+                        port: port
+                    }
+                };
+            }
+            reqBody = {
+                "name": name,
+                "orgId": orgValue,
+                "type": serverType,
+                "parameters": parameters
+            }
+            saveForm(methodName,url,reqBody,dashboardEditNew,monitorId,parameters,name,serverType);
+        }
+        return false;
+    }
+});
+</script>
+                             
\ No newline at end of file
diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html
index f1f444a89..88416a3b1 100644
--- a/client/htmls/private/index.html
+++ b/client/htmls/private/index.html
@@ -1170,6 +1170,21 @@ <h4 class="modal-title">
         "selectable": false,
         "href": "javascript:void(0);",
         "icon": "fa fa-lg fa-fw fa-database"
+    }, {
+        "name": "monitoring",
+        "text": "Monitors",
+        "nodes": [{
+            "name": "organizations",
+            "text": "Monitors",
+            "borderColor": "#000",
+            "href": "#ajax/Settings/monitoringServer.html",
+            "selectable": true,
+            "icon": "fa fa-lg fa-fw fa fa-eye"
+        }],
+        "borderColor": "#000",
+        "selectable": false,
+        "href": "javascript:void(0);",
+        "icon": "fa fa-lg fa-fw fa fa-eye"
     }
 ];
 
diff --git a/server/app/lib/utils/masterUtil.js b/server/app/lib/utils/masterUtil.js
index c8409ba65..80fe80a97 100755
--- a/server/app/lib/utils/masterUtil.js
+++ b/server/app/lib/utils/masterUtil.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.
@@ -28,14 +28,15 @@ var appConfig = require('_pr/config');
 var chefSettings = appConfig.chef;
 var AppDeploy = require('_pr/model/app-deploy/app-deploy');
 var async = require('async');
+var monitorsModel = require('_pr/model/monitors/monitors.js');
 
-var MasterUtil = function() {
+var MasterUtil = function () {
     // Return All Orgs specific to User
-    this.getOrgs = function(loggedInUser, callback) {
+    this.getOrgs = function (loggedInUser, callback) {
         var orgList = [];
         d4dModelNew.d4dModelMastersUsers.find({
             loginname: loggedInUser
-        }, function(err, users) {
+        }, function (err, users) {
             if (err) {
                 logger.debug("Unable to fetch User.");
                 callback(err, null);
@@ -46,7 +47,7 @@ var MasterUtil = function() {
                 var usrCount = 0;
                 var errOccured = false;
                 for (var x = 0; x < users.length; x++) {
-                    (function(countUser) {
+                    (function (countUser) {
                         if (users[countUser].id === '7') {
                             usrCount++;
                             var orgIds = users[countUser].orgname_rowid;
@@ -55,7 +56,7 @@ var MasterUtil = function() {
                                 d4dModelNew.d4dModelMastersOrg.find({
                                     id: "1",
                                     active: true
-                                }, function(err, orgs) {
+                                }, function (err, orgs) {
                                     count++;
                                     if (err) {
                                         logger.debug("Unable to fetch Org.", err);
@@ -64,7 +65,7 @@ var MasterUtil = function() {
                                     }
                                     if (orgs) {
                                         for (var y = 0; y < orgs.length; y++) {
-                                            (function(countOrg) {
+                                            (function (countOrg) {
                                                 if (orgs[countOrg].id === '1') {
                                                     logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
                                                     orgList.push(orgs[countOrg]);
@@ -88,7 +89,7 @@ var MasterUtil = function() {
                                         $in: orgIds
                                     },
                                     active: true
-                                }, function(err, orgs) {
+                                }, function (err, orgs) {
                                     count++;
                                     if (err) {
                                         logger.debug("Unable to fetch Org.", err);
@@ -97,7 +98,7 @@ var MasterUtil = function() {
                                     }
                                     if (orgs) {
                                         for (var y = 0; y < orgs.length; y++) {
-                                            (function(countOrg) {
+                                            (function (countOrg) {
                                                 if (orgs[countOrg].id === '1') {
                                                     logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
                                                     orgList.push(orgs[countOrg]);
@@ -122,7 +123,7 @@ var MasterUtil = function() {
     }
 
     // Return all BusinessGroups specific to User
-    this.getBusinessGroups = function(orgList, callback) {
+    this.getBusinessGroups = function (orgList, callback) {
 
         var productGroupList = [];
         var rowIds = [];
@@ -134,14 +135,14 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, bgs) {
+        }, function (err, bgs) {
             if (err) {
                 callback(err, null);
             }
             if (bgs) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < bgs.length; i++) {
-                        (function(bgCount) {
+                        (function (bgCount) {
                             if (bgs[bgCount].id === '2') {
                                 logger.debug("Returned BG: ", JSON.stringify(bgs[bgCount]));
                                 names = configmgmtDao.convertRowIDToValue(bgs[bgCount].orgname_rowid, rowidlist)
@@ -161,13 +162,13 @@ var MasterUtil = function() {
         });
     }
 
-    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+    this.getBusinessGroupsByOrgId = function (orgId, callback) {
         d4dModelNew.d4dModelMastersProductGroup.find({
             orgname_rowid: orgId,
-            id:'2'
-        }, function(err, productGroupData) {
-            if(err) {
-                logger.debug("getBusinessGroupsByOrgId: "+err);
+            id: '2'
+        }, function (err, productGroupData) {
+            if (err) {
+                logger.debug("getBusinessGroupsByOrgId: " + err);
                 callback(err, null);
             }
             callback(null, productGroupData);
@@ -175,13 +176,13 @@ var MasterUtil = function() {
         });
     };
 
-    this.getProjectsBybgId = function(bgId, callback) {
+    this.getProjectsBybgId = function (bgId, callback) {
         d4dModelNew.d4dModelMastersProjects.find({
             productgroupname_rowid: bgId,
-            id:'4'
-        }, function(err, projectData) {
-            if(err) {
-                logger.debug("getProjectsBybgId: "+err);
+            id: '4'
+        }, function (err, projectData) {
+            if (err) {
+                logger.debug("getProjectsBybgId: " + err);
                 callback(err, null);
             }
             callback(null, projectData);
@@ -189,13 +190,13 @@ var MasterUtil = function() {
         });
     };
 
-    this.getEnvironmentsByprojectId = function(projectId, callback) {
+    this.getEnvironmentsByprojectId = function (projectId, callback) {
         d4dModelNew.d4dModelMastersEnvironments.find({
             projectname_rowid: {$regex: projectId},
-            id:'3'
-        }, function(err, environmentData) {
-            if(err) {
-                logger.debug("getEnvironmentsByprojectId: "+err);
+            id: '3'
+        }, function (err, environmentData) {
+            if (err) {
+                logger.debug("getEnvironmentsByprojectId: " + err);
                 callback(err, null);
             }
             callback(null, environmentData);
@@ -204,7 +205,7 @@ var MasterUtil = function() {
     };
 
     // Return all Environments specific to User
-    this.getEnvironments = function(orgList, callback) {
+    this.getEnvironments = function (orgList, callback) {
         var envList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -215,14 +216,14 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, envs) {
+        }, function (err, envs) {
             if (err) {
                 callback(err, null);
             }
             if (envs) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < envs.length; i++) {
-                        (function(envCount) {
+                        (function (envCount) {
                             if (envs[envCount].id === '3') {
                                 names = configmgmtDao.convertRowIDToValue(envs[envCount].orgname_rowid, rowidlist)
                                 envs[envCount].orgname = names;
@@ -244,7 +245,7 @@ var MasterUtil = function() {
     }
 
     // Return all Projects specific to User
-    this.getProjects = function(orgList, callback) {
+    this.getProjects = function (orgList, callback) {
         var projectList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -255,15 +256,15 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, projects) {
+        }, function (err, projects) {
             if (err) {
                 callback(err, null);
             }
             if (projects) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     var allEnvs = '';
                     for (var i = 0; i < projects.length; i++) {
-                        (function(projectCount) {
+                        (function (projectCount) {
                             if (projects[projectCount].id === '4') {
                                 names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
                                 bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
@@ -283,13 +284,13 @@ var MasterUtil = function() {
             }
         });
     }
-    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+    this.getBusinessGroupsByOrgId = function (orgId, callback) {
         d4dModelNew.d4dModelMastersProductGroup.find({
             orgname_rowid: orgId,
-            id:'2'
-        }, function(err, productGroupData) {
-            if(err) {
-                logger.debug("getBusinessGroupsByOrgId: "+err);
+            id: '2'
+        }, function (err, productGroupData) {
+            if (err) {
+                logger.debug("getBusinessGroupsByOrgId: " + err);
                 callback(err, null);
             }
             callback(null, productGroupData);
@@ -297,13 +298,13 @@ var MasterUtil = function() {
         });
     };
 
-    this.getProjectsBybgId = function(bgId, callback) {
+    this.getProjectsBybgId = function (bgId, callback) {
         d4dModelNew.d4dModelMastersProjects.find({
             productgroupname_rowid: bgId,
-            id:'4'
-        }, function(err, projectData) {
-            if(err) {
-                logger.debug("getProjectsBybgId: "+err);
+            id: '4'
+        }, function (err, projectData) {
+            if (err) {
+                logger.debug("getProjectsBybgId: " + err);
                 callback(err, null);
             }
             callback(null, projectData);
@@ -312,7 +313,7 @@ var MasterUtil = function() {
     };
 
     // Return all ConfigManagement specific to User
-    this.getCongifMgmts = function(orgList, callback) {
+    this.getCongifMgmts = function (orgList, callback) {
         var congifMgmtList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -323,9 +324,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             if (configMgmt) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < configMgmt.length; i++) {
                         if (configMgmt[i].id === '10') {
                             names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
@@ -343,7 +344,7 @@ var MasterUtil = function() {
         });
     }
     // Return all Dockers
-    this.getDockers = function(orgList, callback) {
+    this.getDockers = function (orgList, callback) {
         var dockerList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -354,9 +355,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, dockers) {
+        }, function (err, dockers) {
             if (dockers) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < dockers.length; i++) {
                         if (dockers[i].id === '18') {
                             names = configmgmtDao.convertRowIDToValue(dockers[i].orgname_rowid, rowidlist)
@@ -376,7 +377,7 @@ var MasterUtil = function() {
     }
 
     // Return all Templates
-    this.getTemplates = function(orgList, callback) {
+    this.getTemplates = function (orgList, callback) {
         var templateList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -387,12 +388,12 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, templates) {
+        }, function (err, templates) {
             if (err) {
                 callback(err, null);
             }
             if (templates) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < templates.length; i++) {
                         if (templates[i].id === '17') {
                             names = configmgmtDao.convertRowIDToValue(templates[i].orgname_rowid, rowidlist)
@@ -412,7 +413,7 @@ var MasterUtil = function() {
     }
 
     // Return all TemplateTypes
-    this.getTemplateTypes = function(orgList, callback) {
+    this.getTemplateTypes = function (orgList, callback) {
         logger.debug("getTemplateTypes called. ", JSON.stringify(orgList));
         var templateTypeList = [];
         var rowIds = [];
@@ -424,12 +425,12 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, templateTypes) {
+        }, function (err, templateTypes) {
             if (err) {
                 callback(err, null);
             }
             if (templateTypes) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < templateTypes.length; i++) {
                         if (templateTypes[i].id === '16') {
                             names = configmgmtDao.convertRowIDToValue(templateTypes[i].orgname_rowid, rowidlist)
@@ -449,7 +450,7 @@ var MasterUtil = function() {
     }
 
     // Return all ServiceCommands
-    this.getServiceCommands = function(orgList, callback) {
+    this.getServiceCommands = function (orgList, callback) {
         var serviceCommandList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -460,9 +461,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, serviceCommands) {
+        }, function (err, serviceCommands) {
             if (serviceCommands) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < serviceCommands.length; i++) {
                         if (serviceCommands[i].id === '19') {
                             names = configmgmtDao.convertRowIDToValue(serviceCommands[i].orgname_rowid, rowidlist)
@@ -482,7 +483,7 @@ var MasterUtil = function() {
     }
 
     // Return all Jenkins
-    this.getJenkins = function(orgList, callback) {
+    this.getJenkins = function (orgList, callback) {
         var jenkinList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -493,9 +494,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, jenkins) {
+        }, function (err, jenkins) {
             if (jenkins) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < jenkins.length; i++) {
                         if (jenkins[i].id === '20') {
                             names = configmgmtDao.convertRowIDToValue(jenkins[i].orgname_rowid, rowidlist)
@@ -515,11 +516,11 @@ var MasterUtil = function() {
     }
 
     // Return All Orgs specific to User
-    this.getActiveOrgs = function(loggedInUser, callback) {
+    this.getActiveOrgs = function (loggedInUser, callback) {
         var orgList = [];
         d4dModelNew.d4dModelMastersUsers.find({
             loginname: loggedInUser
-        }, function(err, users) {
+        }, function (err, users) {
             if (err) {
                 logger.debug("Unable to fetch User.");
                 callback(err, null);
@@ -530,7 +531,7 @@ var MasterUtil = function() {
                 var usrCount = 0;
                 var errOccured = false;
                 for (var x = 0; x < users.length; x++) {
-                    (function(countUser) {
+                    (function (countUser) {
                         if (users[countUser].id === '7') {
                             usrCount++;
                             var orgIds = users[countUser].orgname_rowid;
@@ -539,7 +540,7 @@ var MasterUtil = function() {
                                 d4dModelNew.d4dModelMastersOrg.find({
                                     id: "1",
                                     active: true
-                                }, function(err, orgs) {
+                                }, function (err, orgs) {
                                     count++;
                                     if (err) {
                                         logger.debug("Unable to fetch Org.", err);
@@ -548,7 +549,7 @@ var MasterUtil = function() {
                                     }
                                     if (orgs) {
                                         for (var y = 0; y < orgs.length; y++) {
-                                            (function(countOrg) {
+                                            (function (countOrg) {
                                                 if (orgs[countOrg].id === '1') {
                                                     logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
                                                     orgList.push(orgs[countOrg]);
@@ -572,7 +573,7 @@ var MasterUtil = function() {
                                         $in: orgIds
                                     },
                                     active: true
-                                }, function(err, orgs) {
+                                }, function (err, orgs) {
                                     count++;
                                     if (err) {
                                         logger.debug("Unable to fetch Org.", err);
@@ -581,7 +582,7 @@ var MasterUtil = function() {
                                     }
                                     if (orgs) {
                                         for (var y = 0; y < orgs.length; y++) {
-                                            (function(countOrg) {
+                                            (function (countOrg) {
                                                 if (orgs[countOrg].id === '1') {
                                                     logger.debug("Able to get Org.", JSON.stringify(orgs[countOrg]));
                                                     orgList.push(orgs[countOrg]);
@@ -605,12 +606,12 @@ var MasterUtil = function() {
         });
     }
 
-    this.getAllActiveOrg = function(callback) {
+    this.getAllActiveOrg = function (callback) {
         var orgList = [];
         d4dModelNew.d4dModelMastersOrg.find({
             id: "1",
             active: true
-        }, function(err, orgs) {
+        }, function (err, orgs) {
             if (err) {
                 callback(err, null);
             }
@@ -627,16 +628,16 @@ var MasterUtil = function() {
         });
     }
 
-    this.getUserRoles = function(callback) {
+    this.getUserRoles = function (callback) {
         var userRoleList = [];
         d4dModelNew.d4dModelMastersUserroles.find({
             id: "6"
-        }, function(err, userRoles) {
+        }, function (err, userRoles) {
             if (err) {
                 callback(err, null);
             }
             if (userRoles) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var j1 = 0; j1 < userRoles.length; j1++) {
                         if (userRoles[j1].id === '6') {
                             names = configmgmtDao.convertRowIDToValue(userRoles[j1].orgname_rowid, rowidlist)
@@ -655,13 +656,13 @@ var MasterUtil = function() {
     }
 
     // Return all Users whose are associated to loggedIn User
-    this.getUsers = function(loggedInUser, callback) {
+    this.getUsers = function (loggedInUser, callback) {
         var userList = [];
         d4dModelNew.d4dModelMastersUsers.find({
             loginname: loggedInUser
-        }, function(err, users) {
+        }, function (err, users) {
             if (users) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < users.length; i++) {
                         if (users[i].id === '7') {
                             names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
@@ -681,7 +682,7 @@ var MasterUtil = function() {
     }
 
     // Return all Users whose are associated to loggedIn User
-    this.getUsersForOrg = function(orgList, callback) {
+    this.getUsersForOrg = function (orgList, callback) {
         var userList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -693,9 +694,9 @@ var MasterUtil = function() {
                 $in: rowIds
             },
             "id": "7"
-        }, function(err, users) {
+        }, function (err, users) {
             if (users) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < users.length; i++) {
                         if (users[i].id === '7') {
                             names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
@@ -715,7 +716,7 @@ var MasterUtil = function() {
     }
 
     // Return all Users whose are associated to loggedIn User
-    this.getUsersForOrgOrAll = function(orgList, callback) {
+    this.getUsersForOrgOrAll = function (orgList, callback) {
         var userList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -724,15 +725,15 @@ var MasterUtil = function() {
         logger.debug("org rowids: ", rowIds);
         d4dModelNew.d4dModelMastersUsers.find({
             $or: [{
-                orgname_rowid: {
-                    $in: rowIds
-                }
-            }, {
-                orgname_rowid: [""]
-            }]
-        }, function(err, users) {
+                    orgname_rowid: {
+                        $in: rowIds
+                    }
+                }, {
+                    orgname_rowid: [""]
+                }]
+        }, function (err, users) {
             if (users) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < users.length; i++) {
                         if (users[i].id === '7') {
                             names = configmgmtDao.convertRowIDToValue(users[i].orgname_rowid, rowidlist)
@@ -752,7 +753,7 @@ var MasterUtil = function() {
     }
 
 
-    this.getTeams = function(orgList, callback) {
+    this.getTeams = function (orgList, callback) {
         var teamList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -763,13 +764,13 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, teams) {
+        }, function (err, teams) {
             if (err) {
                 callback(err, null);
             }
             logger.debug("Able to fetch Team: ", JSON.stringify(teams));
             if (teams) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < teams.length; i++) {
                         if (teams[i].id === '21') {
                             names = configmgmtDao.convertRowIDToValue(teams[i].orgname_rowid, rowidlist)
@@ -794,12 +795,12 @@ var MasterUtil = function() {
         });
     }
 
-    this.getOrgById = function(orgId, callback) {
+    this.getOrgById = function (orgId, callback) {
         var orgList = [];
         logger.debug("Incomming orgid: ", orgId);
         d4dModelNew.d4dModelMastersOrg.find({
             _id: new ObjectId(orgId)
-        }, function(err, orgs) {
+        }, function (err, orgs) {
             if (orgs) {
                 for (var i = 0; i < orgs.length; i++) {
                     if (orgs[i].id === '1') {
@@ -813,12 +814,12 @@ var MasterUtil = function() {
         });
     }
 
-    this.getOrgByRowId = function(orgId, callback) {
+    this.getOrgByRowId = function (orgId, callback) {
         var orgList = [];
         d4dModelNew.d4dModelMastersOrg.find({
             rowid: orgId,
-            id:'1'
-        }, function(err, orgs) {
+            id: '1'
+        }, function (err, orgs) {
             if (orgs) {
                 for (var i = 0; i < orgs.length; i++) {
                     if (orgs[i].id === '1') {
@@ -833,14 +834,14 @@ var MasterUtil = function() {
     }
 
     // Now not in use
-    getOrgsByRowIds = function(orgIds, callback) {
+    getOrgsByRowIds = function (orgIds, callback) {
         var orgList = [];
         logger.debug("Incomming orgid: ", orgIds);
         d4dModelNew.d4dModelMastersOrg.find({
             rowid: {
                 $in: orgIds
             }
-        }, function(err, orgs) {
+        }, function (err, orgs) {
             if (orgs) {
                 for (var i = 0; i < orgs.length; i++) {
                     if (orgs[i].id === '1') {
@@ -855,11 +856,11 @@ var MasterUtil = function() {
     }
 
     // Return only loggedIn User.
-    this.getLoggedInUser = function(loggedInUser, callback) {
+    this.getLoggedInUser = function (loggedInUser, callback) {
         var anUser;
         d4dModelNew.d4dModelMastersUsers.find({
             loginname: loggedInUser
-        }, function(err, users) {
+        }, function (err, users) {
             if (users) {
                 for (var i = 0; i < users.length; i++) {
                     if (users[i].id === '7') {
@@ -875,7 +876,7 @@ var MasterUtil = function() {
     }
 
     // Return all settings for User.
-    this.getAllSettingsForUser = function(loggedInUser, callback) {
+    this.getAllSettingsForUser = function (loggedInUser, callback) {
         var returnObj = [];
         var catObj = {};
         d4dModelNew.d4dModelMastersUsers.find({
@@ -905,13 +906,13 @@ var MasterUtil = function() {
                                 callback(err, null);
                                 return;
                             } else if (teams.length > 0) {
-                                var orgIdList = [],bgIdList=[],projectIdList=[];
+                                var orgIdList = [], bgIdList = [], projectIdList = [];
                                 for (var j = 0; j < teams.length; j++) {
                                     (function (team) {
                                         if (catObj.teams.indexOf(team.rowid) === -1) {
                                             catObj.teams.push(team.rowid);
                                             async.waterfall([
-                                                function(next){
+                                                function (next) {
                                                     d4dModelNew.d4dModelMastersOrg.find({
                                                         rowid: {
                                                             $in: team.orgname_rowid
@@ -922,27 +923,27 @@ var MasterUtil = function() {
                                                         if (err) {
                                                             callback(err, null);
                                                             return;
-                                                        }else if (orgs.length > 0) {
+                                                        } else if (orgs.length > 0) {
                                                             var orgCount = 0;
                                                             for (var k = 0; k < orgs.length; k++) {
-                                                                (function(org){
+                                                                (function (org) {
                                                                     orgCount++;
-                                                                    if(orgIdList.indexOf(org.rowid) === -1){
+                                                                    if (orgIdList.indexOf(org.rowid) === -1) {
                                                                         orgIdList.push(org.rowid);
                                                                     }
                                                                 })(orgs[k]);
-                                                                if(orgCount === orgs.length){
-                                                                    next(null,orgIdList);
+                                                                if (orgCount === orgs.length) {
+                                                                    next(null, orgIdList);
                                                                     return;
                                                                 }
                                                             }
-                                                        }else {
+                                                        } else {
                                                             next(null, orgIdList);
                                                             return;
                                                         }
                                                     });
                                                 },
-                                                function(orgIds,next) {
+                                                function (orgIds, next) {
                                                     catObj.orgs = orgIds;
                                                     async.parallel({
                                                         bgIds: function (callback) {
@@ -954,21 +955,21 @@ var MasterUtil = function() {
                                                             }, function (err, bgs) {
                                                                 if (err) {
                                                                     callback(err, null);
-                                                                }else if (bgs.length > 0) {
+                                                                } else if (bgs.length > 0) {
                                                                     var bgCount = 0;
                                                                     for (var l = 0; l < bgs.length; l++) {
-                                                                        (function(bg){
+                                                                        (function (bg) {
                                                                             bgCount++;
-                                                                            if(bgIdList.indexOf(bg.rowid) === -1){
+                                                                            if (bgIdList.indexOf(bg.rowid) === -1) {
                                                                                 bgIdList.push(bg.rowid);
                                                                             }
                                                                         })(bgs[l]);
-                                                                        if(bgCount === bgs.length){
-                                                                            callback(null,bgIdList);
+                                                                        if (bgCount === bgs.length) {
+                                                                            callback(null, bgIdList);
                                                                             return;
                                                                         }
                                                                     }
-                                                                }else {
+                                                                } else {
                                                                     callback(null, bgIdList);
                                                                     return;
                                                                 }
@@ -983,36 +984,36 @@ var MasterUtil = function() {
                                                             }, function (err, projects) {
                                                                 if (err) {
                                                                     callback(err, null);
-                                                                }else if (projects.length > 0) {
+                                                                } else if (projects.length > 0) {
                                                                     var projectCount = 0;
                                                                     for (var m = 0; m < projects.length; m++) {
-                                                                        (function(project){
+                                                                        (function (project) {
                                                                             projectCount++;
-                                                                            if(projectIdList.indexOf(project.rowid) === -1){
+                                                                            if (projectIdList.indexOf(project.rowid) === -1) {
                                                                                 projectIdList.push(project.rowid);
                                                                             }
                                                                         })(projects[m]);
-                                                                        if(projectCount === projects.length){
-                                                                            callback(null,projectIdList);
+                                                                        if (projectCount === projects.length) {
+                                                                            callback(null, projectIdList);
                                                                             return;
                                                                         }
                                                                     }
-                                                                }else {
+                                                                } else {
                                                                     callback(null, projectIdList);
                                                                     return;
                                                                 }
                                                             });
                                                         }
 
-                                                    },function(err,results){
+                                                    }, function (err, results) {
                                                         if (err) {
                                                             next(err, null);
                                                         }
                                                         catObj.projects = results.projectIds;
                                                         catObj.bunits = results.bgIds;
-                                                        next(null,catObj);
+                                                        next(null, catObj);
                                                     })
-                                                }],function (err, results) {
+                                                }], function (err, results) {
                                                 if (err) {
                                                     callback(err, null);
                                                 }
@@ -1044,14 +1045,14 @@ var MasterUtil = function() {
     };
 
     // check valid user permission
-    this.checkPermission = function(username, callback) {
+    this.checkPermission = function (username, callback) {
         logger.debug("User for permission: ", JSON.stringify(username));
-        this.getLoggedInUser(username, function(err, anUser) {
+        this.getLoggedInUser(username, function (err, anUser) {
             if (err) {
                 callback(err, null);
             }
             if (anUser) {
-                permissionsetDao.getPermissionSet(anUser.userrolename, function(err, permissionSet) {
+                permissionsetDao.getPermissionSet(anUser.userrolename, function (err, permissionSet) {
                     if (err) {
                         callback(err, null);
                     }
@@ -1069,24 +1070,24 @@ var MasterUtil = function() {
     }
 
     // Now not in use
-    this.getJsonForNewTree = function(loggedInUser, callback) {
+    this.getJsonForNewTree = function (loggedInUser, callback) {
         var jsonTree = [];
         var businessGroups = [];
         var projects = [];
         var environments = [];
         var orgObj = {};
-        this.getLoggedInUser(loggedInUser, function(err, anUser) {
+        this.getLoggedInUser(loggedInUser, function (err, anUser) {
             if (err) {
                 callback(err, null);
             }
             if (anUser) {
-                this.getOrgsByRowIds(anUser.orgname_rowid, function(err, orgList) {
+                this.getOrgsByRowIds(anUser.orgname_rowid, function (err, orgList) {
                     if (err) {
                         callback(err, null);
                     }
                     if (orgList) {
                         for (var i = 0; i < orgList.length; i++) {
-                            (function(orgCount) {
+                            (function (orgCount) {
                                 if (orgList[orgCount].id === "1") {
                                     orgObj = {
                                         name: orgList[orgCount].name,
@@ -1097,24 +1098,24 @@ var MasterUtil = function() {
                                     };
                                     d4dModelNew.d4dModelMastersProductGroup.find({
                                         orgname_rowid: orgList[orgCount].rowid
-                                    }, function(err, bgs) {
+                                    }, function (err, bgs) {
                                         if (err) {
                                             callback(err, null);
                                         }
                                         if (bgs) {
                                             for (var x = 0; x < bgs.length; x++) {
-                                                (function(bgCount) {
+                                                (function (bgCount) {
                                                     if (bgs[bgCount].id === "2") {
                                                         businessGroups.push(bgs[bgCount]);
                                                         d4dModelNew.d4dModelMastersProjects.find({
                                                             productgroupname_rowid: bgs[bgCount].rowid
-                                                        }, function(err, project) {
+                                                        }, function (err, project) {
                                                             if (err) {
                                                                 callback(err, null);
                                                             }
                                                             if (project) {
                                                                 for (var p = 0; p < project.length; p++) {
-                                                                    (function(pCount) {
+                                                                    (function (pCount) {
                                                                         if (project[pCount].id === "4") {
                                                                             projects.push({
                                                                                 "name": bgs[bgCount].projectname,
@@ -1140,13 +1141,13 @@ var MasterUtil = function() {
                                     });
                                     d4dModelNew.d4dModelMastersEnvironments.find({
                                         orgname_rowid: orgList[orgCount].rowid
-                                    }, function(err, envs) {
+                                    }, function (err, envs) {
                                         if (err) {
                                             callback(err, null);
                                         }
                                         if (envs) {
                                             for (var e = 0; e < envs.length; e++) {
-                                                (function(envCount) {
+                                                (function (envCount) {
                                                     if (envs[envCount].id === "3") {
                                                         environments.push({
                                                             "name": envs[envCount].environmentname,
@@ -1175,18 +1176,18 @@ var MasterUtil = function() {
     }
 
     // check valid user permission
-    this.getProjectsForOrg = function(orgId, callback) {
+    this.getProjectsForOrg = function (orgId, callback) {
         var projectList = [];
         d4dModelNew.d4dModelMastersProjects.find({
             orgname_rowid: orgId
-        }, function(err, projects) {
+        }, function (err, projects) {
             if (err) {
                 callback(err, null);
             }
             if (projects) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < projects.length; i++) {
-                        (function(projectCount) {
+                        (function (projectCount) {
                             if (projects[projectCount].id === '4') {
                                 names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
                                 bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
@@ -1216,17 +1217,17 @@ var MasterUtil = function() {
     }
 
     // Return all TemplateTypes
-    this.getTemplateTypesById = function(anId, callback) {
+    this.getTemplateTypesById = function (anId, callback) {
         logger.debug("getTemplateTypesById called. ", JSON.stringify(anId));
         var templateTypeList = [];
         d4dModelNew.d4dModelMastersDesignTemplateTypes.find({
             rowid: anId
-        }, function(err, templateTypes) {
+        }, function (err, templateTypes) {
             if (err) {
                 callback(err, null);
             }
             if (templateTypes) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < templateTypes.length; i++) {
                         if (templateTypes[i].id === '16') {
                             names = configmgmtDao.convertRowIDToValue(templateTypes[i].orgname_rowid, rowidlist);
@@ -1245,10 +1246,10 @@ var MasterUtil = function() {
         });
     }
 
-    this.updateAllSettings = function(orgId, orgName, callback) {
+    this.updateAllSettings = function (orgId, orgName, callback) {
         d4dModelNew.d4dModelMastersOrg.find({
             rowid: orgId
-        }, function(err, org) {
+        }, function (err, org) {
             if (err) {
                 callback(err, null);
                 return;
@@ -1260,7 +1261,7 @@ var MasterUtil = function() {
                 $set: {
                     orgname: orgName
                 }
-            }, function(err, aBody) {
+            }, function (err, aBody) {
                 if (err) {
                     logger.debug("Error to update Settings.");
                 }
@@ -1272,7 +1273,7 @@ var MasterUtil = function() {
                     $set: {
                         orgname: orgName
                     }
-                }, function(err, aBody) {
+                }, function (err, aBody) {
                     if (err) {
                         logger.debug("Error to update Settings.");
                     }
@@ -1284,7 +1285,7 @@ var MasterUtil = function() {
                         $set: {
                             orgname: orgName
                         }
-                    }, function(err, aBody) {
+                    }, function (err, aBody) {
                         if (err) {
                             logger.debug("Error to update Settings.");
                         }
@@ -1296,7 +1297,7 @@ var MasterUtil = function() {
                             $set: {
                                 orgname: orgName
                             }
-                        }, function(err, aBody) {
+                        }, function (err, aBody) {
                             if (err) {
                                 logger.debug("Error to update Settings.");
                             }
@@ -1307,7 +1308,7 @@ var MasterUtil = function() {
                                 $set: {
                                     orgname: orgName
                                 }
-                            }, function(err, aBody) {
+                            }, function (err, aBody) {
                                 if (err) {
                                     logger.debug("Error to update Settings.");
                                 }
@@ -1318,7 +1319,7 @@ var MasterUtil = function() {
                                     $set: {
                                         orgname: orgName
                                     }
-                                }, function(err, aBody) {
+                                }, function (err, aBody) {
                                     if (err) {
                                         logger.debug("Error to update Settings.");
                                     }
@@ -1329,7 +1330,7 @@ var MasterUtil = function() {
                                         $set: {
                                             orgname: orgName
                                         }
-                                    }, function(err, aBody) {
+                                    }, function (err, aBody) {
                                         if (err) {
                                             logger.debug("Error to update Settings.");
                                         }
@@ -1340,7 +1341,7 @@ var MasterUtil = function() {
                                             $set: {
                                                 orgname: orgName
                                             }
-                                        }, function(err, aBody) {
+                                        }, function (err, aBody) {
                                             if (err) {
                                                 logger.debug("Error to update Settings.");
                                             }
@@ -1351,7 +1352,7 @@ var MasterUtil = function() {
                                                 $set: {
                                                     orgname: orgName
                                                 }
-                                            }, function(err, aBody) {
+                                            }, function (err, aBody) {
                                                 if (err) {
                                                     logger.debug("Error to update Settings.");
                                                 }
@@ -1362,7 +1363,7 @@ var MasterUtil = function() {
                                                     $set: {
                                                         orgname: orgName
                                                     }
-                                                }, function(err, aBody) {
+                                                }, function (err, aBody) {
                                                     if (err) {
                                                         logger.debug("Error to update Settings.");
                                                     }
@@ -1373,14 +1374,14 @@ var MasterUtil = function() {
                                                         $set: {
                                                             orgname: orgName
                                                         }
-                                                    }, function(err, aBody) {
+                                                    }, function (err, aBody) {
                                                         if (err) {
                                                             logger.debug("Error to update Settings.");
                                                         }
                                                         d4dModelNew.d4dModelMastersTeams.find({
                                                             orgname_rowid: orgId,
                                                             id: '21'
-                                                        }, function(err, teams) {
+                                                        }, function (err, teams) {
                                                             if (err) {
                                                                 logger.debug("Error to get Settings.");
                                                             }
@@ -1394,7 +1395,7 @@ var MasterUtil = function() {
                                                                 $set: {
                                                                     orgname: orgName
                                                                 }
-                                                            }, function(err, aBody) {
+                                                            }, function (err, aBody) {
                                                                 if (err) {
                                                                     logger.debug("Error to update Settings.");
                                                                 }
@@ -1416,14 +1417,14 @@ var MasterUtil = function() {
         });
     }
 
-    this.updateTeam = function(orgId, callback) {
+    this.updateTeam = function (orgId, callback) {
         var teamName = '';
         var teamDescription = '';
-        configmgmtDao.getRowids(function(err, rowidlist) {
+        configmgmtDao.getRowids(function (err, rowidlist) {
             d4dModelNew.d4dModelMastersTeams.find({
                 orgname_rowid: orgId,
                 id: '21'
-            }, function(err, teams) {
+            }, function (err, teams) {
                 if (err) {
                     logger.debug("Error to get Settings.");
                 }
@@ -1452,7 +1453,7 @@ var MasterUtil = function() {
                                 teamname: teamName,
                                 descriptions: teamDescription
                             }
-                        }, function(err, aBody) {
+                        }, function (err, aBody) {
                             if (err) {
                                 logger.debug("Error to update Settings.");
                             }
@@ -1465,26 +1466,26 @@ var MasterUtil = function() {
         });
     };
 
-    this.getBusinessGroupsByOrgId = function(orgId, callback) {
+    this.getBusinessGroupsByOrgId = function (orgId, callback) {
         d4dModelNew.d4dModelMastersProductGroup.find({
             orgname_rowid: orgId,
-            id:'2'
-        }, function(err, productGroupData) {
-            if(err) {
-                logger.debug("getBusinessGroupsByOrgId: "+err);
+            id: '2'
+        }, function (err, productGroupData) {
+            if (err) {
+                logger.debug("getBusinessGroupsByOrgId: " + err);
                 callback(err, null);
             }
             callback(null, productGroupData);
 
         });
     };
-    this.getProjectsBybgId = function(bgId, callback) {
+    this.getProjectsBybgId = function (bgId, callback) {
         d4dModelNew.d4dModelMastersProjects.find({
             productgroupname_rowid: bgId,
-            id:'4'
-        }, function(err, projectData) {
-            if(err) {
-                logger.debug("getProjectsBybgId: "+err);
+            id: '4'
+        }, function (err, projectData) {
+            if (err) {
+                logger.debug("getProjectsBybgId: " + err);
                 callback(err, null);
             }
             callback(null, projectData);
@@ -1492,14 +1493,14 @@ var MasterUtil = function() {
         });
     };
 
-    this.getUsersForAllOrg = function(callback) {
+    this.getUsersForAllOrg = function (callback) {
         logger.debug("getUsersForAllOrg called. ");
         d4dModelNew.d4dModelMastersUsers.find({
             id: "7",
             orgname_rowid: {
                 $in: [""]
             }
-        }, function(err, users) {
+        }, function (err, users) {
             if (err) {
                 callback(err, null);
                 return;
@@ -1516,7 +1517,7 @@ var MasterUtil = function() {
         });
     }
 
-    var getPermissionForCategory = function(category, permissionto, permissionset) {
+    var getPermissionForCategory = function (category, permissionto, permissionset) {
         var perms = [];
         if (permissionset) {
             for (var i = 0; i < permissionset.length; i++) {
@@ -1542,14 +1543,14 @@ var MasterUtil = function() {
     };
 
     // Check wheather permission is there for user or not.
-    this.hasPermission = function(category, permissionto, sessionUser, callback) {
+    this.hasPermission = function (category, permissionto, sessionUser, callback) {
         var retVal = '';
         retVal = getPermissionForCategory(category, permissionto, sessionUser.permissionset);
         callback(null, retVal);
     };
 
     // Return all Puppet Servers specific to User
-    this.getPuppetServers = function(orgList, callback) {
+    this.getPuppetServers = function (orgList, callback) {
         var congifMgmtList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -1560,9 +1561,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             if (configMgmt) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < configMgmt.length; i++) {
                         if (configMgmt[i].id === '25') {
                             names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
@@ -1579,29 +1580,29 @@ var MasterUtil = function() {
             }
         });
     }
-    this.getServerDetails=function(jsonData,callBack){
-        var serverDetail=[];
+    this.getServerDetails = function (jsonData, callBack) {
+        var serverDetail = [];
         d4dModelNew.d4dModelMastersDockerConfig.find({
-            orgname_rowid:jsonData.orgId,
-            id:jsonData.dockerId
-        },function(err,dockerData){
-            if(err){
-                callBack(err,null);
+            orgname_rowid: jsonData.orgId,
+            id: jsonData.dockerId
+        }, function (err, dockerData) {
+            if (err) {
+                callBack(err, null);
                 return;
             }
-            serverDetail=dockerData;
+            serverDetail = dockerData;
             d4dModelNew.d4dModelMastersNexusServer.find({
-                orgname_rowid:jsonData.orgId,
-                id:jsonData.nexusId
-            },function(err,nexusData){
-                if(err){
-                    callBack(err,null);
+                orgname_rowid: jsonData.orgId,
+                id: jsonData.nexusId
+            }, function (err, nexusData) {
+                if (err) {
+                    callBack(err, null);
                     return;
                 }
-                for(var i = 0; i <nexusData.length; i++){
+                for (var i = 0; i < nexusData.length; i++) {
                     serverDetail.push(nexusData[i])
                 }
-                callBack(null,serverDetail);
+                callBack(null, serverDetail);
             })
         })
     }
@@ -1610,29 +1611,29 @@ var MasterUtil = function() {
 
 
 
-    this.getDockerServer=function(jsonData,callBack){
+    this.getDockerServer = function (jsonData, callBack) {
         d4dModelNew.d4dModelMastersDockerConfig.find({
-            orgname_rowid:jsonData.orgId,
-            id:jsonData.dockerId
-        },function(err,dockerData){
-            if(err){
-                callBack(err,null);
+            orgname_rowid: jsonData.orgId,
+            id: jsonData.dockerId
+        }, function (err, dockerData) {
+            if (err) {
+                callBack(err, null);
                 return;
             }
-            callBack(null,dockerData);
+            callBack(null, dockerData);
         })
     }
 
-    this.getNexusServer=function(jsonData,callBack){
+    this.getNexusServer = function (jsonData, callBack) {
         d4dModelNew.d4dModelMastersNexusServer.find({
-            orgname_rowid:jsonData.orgId,
-            id:jsonData.nexusId
-        },function(err,nexusData){
-            if(err){
-                callBack(err,null);
+            orgname_rowid: jsonData.orgId,
+            id: jsonData.nexusId
+        }, function (err, nexusData) {
+            if (err) {
+                callBack(err, null);
                 return;
             }
-            callBack(null,nexusData);
+            callBack(null, nexusData);
         })
     }
 
@@ -1640,7 +1641,7 @@ var MasterUtil = function() {
 
 
     // Return all Nexus Servers specific to User
-    this.getNexusServers = function(orgList, callback) {
+    this.getNexusServers = function (orgList, callback) {
         var congifMgmtList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -1651,9 +1652,9 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             if (configMgmt) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < configMgmt.length; i++) {
                         if (configMgmt[i].id === '26') {
                             names = configmgmtDao.convertRowIDToValue(configMgmt[i].orgname_rowid, rowidlist)
@@ -1672,7 +1673,7 @@ var MasterUtil = function() {
     }
 
     // Return all Puppet Servers specific to User
-    this.getAllCongifMgmts = function(orgList, callback) {
+    this.getAllCongifMgmts = function (orgList, callback) {
         var congifMgmtList = [];
         var rowIds = [];
         for (var x = 0; x < orgList.length; x++) {
@@ -1683,13 +1684,13 @@ var MasterUtil = function() {
             orgname_rowid: {
                 $in: rowIds
             }
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             d4dModelNew.d4dModelMastersConfigManagement.find({
                 orgname_rowid: {
                     $in: rowIds
                 }
-            }, function(err, chefmgmt) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+            }, function (err, chefmgmt) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     if (configMgmt) {
                         for (var i = 0; i < configMgmt.length; i++) {
                             if (configMgmt[i].id === '25') {
@@ -1715,16 +1716,16 @@ var MasterUtil = function() {
     }
 
     // Return all Puppet Servers specific to User
-    this.getAllCongifMgmtsForOrg = function(orgId, callback) {
+    this.getAllCongifMgmtsForOrg = function (orgId, callback) {
         logger.debug("Entered..", orgId);
         var congifMgmtList = [];
         d4dModelNew.d4dModelMastersPuppetServer.find({
             orgname_rowid: orgId
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             d4dModelNew.d4dModelMastersConfigManagement.find({
                 orgname_rowid: orgId
-            }, function(err, chefmgmt) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+            }, function (err, chefmgmt) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     if (configMgmt) {
                         for (var i = 0; i < configMgmt.length; i++) {
                             if (configMgmt[i].id === '25') {
@@ -1750,17 +1751,17 @@ var MasterUtil = function() {
     }
 
     // Return all Puppet Servers specific to User
-    this.getCongifMgmtsById = function(anId, callback) {
+    this.getCongifMgmtsById = function (anId, callback) {
         logger.debug("Entered..", anId);
         d4dModelNew.d4dModelMastersPuppetServer.find({
             rowid: anId,
             id: "25"
-        }, function(err, configMgmt) {
+        }, function (err, configMgmt) {
             if (err) {
                 callback(err, null);
                 return;
             }
-            configmgmtDao.getRowids(function(err, rowidlist) {
+            configmgmtDao.getRowids(function (err, rowidlist) {
                 if (err) {
                     callback(err, null);
                     return;
@@ -1777,21 +1778,31 @@ var MasterUtil = function() {
                 d4dModelNew.d4dModelMastersConfigManagement.find({
                     rowid: anId,
                     id: "10"
-                }, function(err, chefmgmt) {
+                }, function (err, chefmgmt) {
                     if (err) {
                         callback(err, null);
                         return;
                     }
                     if (chefmgmt.length) {
-
+                        chefmgmt[0] = chefmgmt[0].toObject();
                         names = configmgmtDao.convertRowIDToValue(chefmgmt[0].orgname_rowid, rowidlist);
                         chefmgmt[0].orgname = names;
 
                         chefmgmt[0].chefRepoLocation = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].loginname + '/';
                         chefmgmt[0].userpemfile = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].folderpath + chefmgmt[0].userpemfile_filename;
                         chefmgmt[0].validatorpemfile = chefSettings.chefReposLocation + chefmgmt[0].orgname_rowid[0] + '/' + chefmgmt[0].folderpath + chefmgmt[0].validatorpemfile_filename;
-
-                        callback(null, chefmgmt[0]);
+                        if (chefmgmt[0].monitorId) {
+                            monitorsModel.getById(chefmgmt[0].monitorId, function (err, monitor) {
+                                if (err || !monitor) {
+                                     chefmgmt[0].monitor = null;
+                                } else {
+                                     chefmgmt[0].monitor = monitor;
+                                }
+                                callback(null, chefmgmt[0]);
+                            });
+                        }else{
+                            callback(null, chefmgmt[0]);
+                        }                        
                     } else {
                         callback(null, null);
                     }
@@ -1801,12 +1812,12 @@ var MasterUtil = function() {
     }
 
     // Return Environment Name
-    this.getEnvironmentName = function(envId, callback) {
+    this.getEnvironmentName = function (envId, callback) {
         logger.debug("org rowids: ", envId);
         d4dModelNew.d4dModelMastersEnvironments.find({
             rowid: envId,
             "id": 3
-        }, function(err, envs) {
+        }, function (err, envs) {
             if (err) {
                 callback(err, null);
             }
@@ -1821,25 +1832,25 @@ var MasterUtil = function() {
         });
     };
 
-    this.getChefDetailsByOrgId = function(orgId, callback) {
+    this.getChefDetailsByOrgId = function (orgId, callback) {
         d4dModelNew.d4dModelMastersConfigManagement.find({
             orgname_rowid: orgId,
             "id": '10'
-        }, function(err, chefDetails) {
+        }, function (err, chefDetails) {
             if (err) {
                 callback(err, null);
-            }else {
+            } else {
                 callback(null, chefDetails);
             }
         });
     };
 
-    this.getEnvironmentByEnvId = function(envId, callback) {
+    this.getEnvironmentByEnvId = function (envId, callback) {
         logger.debug("org rowids: ", envId);
         d4dModelNew.d4dModelMastersEnvironments.find({
             rowid: envId,
             "id": 3
-        }, function(err, envs) {
+        }, function (err, envs) {
             if (err) {
                 callback(err, null);
             }
@@ -1849,11 +1860,11 @@ var MasterUtil = function() {
     }
 
     // Return Project Name
-    this.getProjectName = function(projectId, callback) {
+    this.getProjectName = function (projectId, callback) {
         logger.debug("Project rowids: ", projectId);
         d4dModelNew.d4dModelMastersProjects.find({
             rowid: projectId
-        }, function(err, projects) {
+        }, function (err, projects) {
             if (err) {
                 callback(err, null);
             }
@@ -1869,18 +1880,18 @@ var MasterUtil = function() {
     }
 
     // Get all appData informations.
-    this.getAppDataWithDeployList = function(envName, projectId, callback) {
+    this.getAppDataWithDeployList = function (envName, projectId, callback) {
         logger.debug("projectId: ", projectId);
-        AppDeploy.getAppDeployListByEnvId(projectId, envName, function(err, data) {
+        AppDeploy.getAppDeployListByEnvId(projectId, envName, function (err, data) {
             if (err) {
                 logger.debug("App deploy fetch error.", err);
             }
-            callback(null,data);
+            callback(null, data);
         });
     };
 
     // Get AppDeploy by name.
-    this.getAppDataByName = function(envName, appName, projectId, callback) {
+    this.getAppDataByName = function (envName, appName, projectId, callback) {
         d4dModelNew.d4dModelMastersProjects.find({
             appdeploy: {
                 $elemMatch: {
@@ -1888,7 +1899,7 @@ var MasterUtil = function() {
                 }
             },
             rowid: projectId
-        }, function(err, anAppData) {
+        }, function (err, anAppData) {
             if (err) {
                 logger.debug("Got error while fetching appData: ", err);
                 callback(err, null);
@@ -1896,7 +1907,7 @@ var MasterUtil = function() {
             if (anAppData.length) {
                 var appData = [];
 
-                AppDeploy.getAppDeployByNameAndEnvId(appName, envName, function(err, data) {
+                AppDeploy.getAppDeployByNameAndEnvId(appName, envName, function (err, data) {
                     if (err) {
                         logger.debug("App deploy fetch error.", err);
                     }
@@ -1932,20 +1943,20 @@ var MasterUtil = function() {
     };
 
     // Return particular Projects specific to User
-    this.getParticularProject = function(projectId, callback) {
+    this.getParticularProject = function (projectId, callback) {
         var projectList = [];
         d4dModelNew.d4dModelMastersProjects.find({
             id: "4",
             rowid: projectId
-        }, function(err, projects) {
+        }, function (err, projects) {
             if (err) {
                 callback(err, null);
             }
             if (projects) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     var allEnvs = '';
                     for (var i = 0; i < projects.length; i++) {
-                        (function(projectCount) {
+                        (function (projectCount) {
                             if (projects[projectCount].id === '4') {
                                 names = configmgmtDao.convertRowIDToValue(projects[projectCount].orgname_rowid, rowidlist);
                                 bgnames = configmgmtDao.convertRowIDToValue(projects[projectCount].productgroupname_rowid, rowidlist);
@@ -1966,18 +1977,18 @@ var MasterUtil = function() {
         });
     }
 
-    this.updateParticularProject = function(projectData, callback) {
+    this.updateParticularProject = function (projectData, callback) {
         d4dModelNew.d4dModelMastersProjects.update({
             id: "4",
             rowid: projectData.projectId
-        },{
+        }, {
             $set: {
-                environmentname:projectData.envNames,
-                environmentname_rowid:projectData.envIds
+                environmentname: projectData.envNames,
+                environmentname_rowid: projectData.envIds
             }
         }, {
             upsert: false
-        }, function(err, projects) {
+        }, function (err, projects) {
             if (err) {
                 callback(err, null);
             } else {
@@ -1989,11 +2000,11 @@ var MasterUtil = function() {
 
 
     // Return Docker
-    this.getDockerById = function(anId, callback) {
+    this.getDockerById = function (anId, callback) {
         d4dModelNew.d4dModelMastersDockerConfig.find({
             rowid: anId,
             id: "18"
-        }, function(err, dockers) {
+        }, function (err, dockers) {
             if (err) {
                 logger.debug("Error to get Docker: ", err);
                 callback(err, null);
@@ -2005,7 +2016,7 @@ var MasterUtil = function() {
     }
 
     // Return all Templates for Org and TemplateType
-    this.getTemplatesByOrgAndTemplateType = function(orgId, templateType, callback) {
+    this.getTemplatesByOrgAndTemplateType = function (orgId, templateType, callback) {
         var templateList = [];
         var rowIds = [];
         rowIds.push(orgId);
@@ -2014,12 +2025,12 @@ var MasterUtil = function() {
                 $in: rowIds
             },
             templatetypename: templateType
-        }, function(err, templates) {
+        }, function (err, templates) {
             if (err) {
                 callback(err, null);
             }
             if (templates) {
-                configmgmtDao.getRowids(function(err, rowidlist) {
+                configmgmtDao.getRowids(function (err, rowidlist) {
                     for (var i = 0; i < templates.length; i++) {
                         if (templates[i].id === '17') {
                             names = configmgmtDao.convertRowIDToValue(templates[i].orgname_rowid, rowidlist)
@@ -2046,13 +2057,13 @@ var MasterUtil = function() {
         d4dModelNew.d4dModelMastersProjects.find({
             rowid: projectId,
             id: '4'
-        }, function(err, project) {
+        }, function (err, project) {
             if (err) {
                 logger.error("Failed to get project. ", err);
                 return callback(err, null);
             }
             if (project.length) {
-                AppDeploy.getAppDeployByProjectId(projectId, function(err, appData) {
+                AppDeploy.getAppDeployByProjectId(projectId, function (err, appData) {
                     if (err) {
                         logger.debug("App deploy fetch error.", err);
                         return callback(err, null);
@@ -2072,11 +2083,11 @@ var MasterUtil = function() {
                         logger.debug("created array: ", JSON.stringify(filterArray));
                         var count = 0;
                         for (var k = 0; k < filterArray.length; k++) {
-                            (function(k) {
+                            (function (k) {
                                 var arrayValue = filterArray[k].split("@");
                                 logger.debug("name: ", arrayValue[0]);
                                 logger.debug("Version: ", arrayValue[1]);
-                                AppDeploy.getAppDeployByAppNameAndVersion(projectId,arrayValue[0], arrayValue[1], function(err, filteredData) {
+                                AppDeploy.getAppDeployByAppNameAndVersion(projectId, arrayValue[0], arrayValue[1], function (err, filteredData) {
                                     count++;
                                     if (err) {
                                         logger.error("Failed to get filteredData: ", err);
@@ -2141,13 +2152,13 @@ var MasterUtil = function() {
     };
 
     // update project with app name
-    this.updateProject = function(projectId, appName, callback) {
+    this.updateProject = function (projectId, appName, callback) {
         var appDescription = appName + " deployed.";
         var count = 0;
         d4dModelNew.d4dModelMastersProjects.find({
             rowid: projectId,
             id: '4'
-        }, function(err, project) {
+        }, function (err, project) {
             if (err) {
                 logger.debug("Failed to find Project", err);
                 return;
@@ -2173,7 +2184,7 @@ var MasterUtil = function() {
                             }
                         }, {
                             upsert: false
-                        }, function(err, data) {
+                        }, function (err, data) {
                             if (err) {
                                 logger.debug('Err while updating d4dModelMastersProjects' + err);
                                 callback(err, null);
@@ -2200,7 +2211,7 @@ var MasterUtil = function() {
                         }
                     }, {
                         upsert: false
-                    }, function(err, data) {
+                    }, function (err, data) {
                         if (err) {
                             logger.debug('Err while updating d4dModelMastersProjects' + err);
                             callback(err, null);
@@ -2215,14 +2226,14 @@ var MasterUtil = function() {
         });
     };
 
-    this.getTemplateById = function(templateId, callback) {
+    this.getTemplateById = function (templateId, callback) {
         d4dModelNew.d4dModelMastersTemplatesList.find({
             rowid: templateId
-        }, function(err, templates) {
-            if(err) {
+        }, function (err, templates) {
+            if (err) {
                 return callback(err);
             }
-            return callback(null,templates);
+            return callback(null, templates);
         });
     };
 }
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 3873bcdf4..8fcd80b06 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
@@ -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.
+ */
 
 
 var logger = require('_pr/logger')(module);
@@ -38,6 +38,7 @@ var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var Schema = mongoose.Schema;
 var resourceService = require('_pr/services/resourceService');
 var auditTrailService = require('_pr/services/auditTrailService');
+var monitorsModel = require('_pr/model/monitors/monitors.js');
 
 var AWSInstanceBlueprintSchema = new Schema({
     keyPairId: {
@@ -90,10 +91,10 @@ var AWSInstanceBlueprintSchema = new Schema({
     }
 });
 
-AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
+AWSInstanceBlueprintSchema.methods.launch = function (launchParams, callback) {
     var self = this;
     var domainName = launchParams.domainName;
-    VMImage.getImageById(self.imageId, function(err, anImage) {
+    VMImage.getImageById(self.imageId, function (err, anImage) {
         if (err) {
             logger.error(err);
             callback({
@@ -107,7 +108,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
         //     anImage.instancePassword = 
         // }
 
-        AWSProvider.getAWSProviderById(anImage.providerId, function(err, aProvider) {
+        AWSProvider.getAWSProviderById(anImage.providerId, function (err, aProvider) {
             if (err) {
                 logger.error(err);
                 callback({
@@ -121,7 +122,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                 });
                 return;
             }
-            AWSKeyPair.getAWSKeyPairById(self.keyPairId, function(err, aKeyPair) {
+            AWSKeyPair.getAWSKeyPairById(self.keyPairId, function (err, aKeyPair) {
                 if (err) {
                     logger.error(err);
                     callback({
@@ -187,17 +188,18 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                 }
                 var paramRunList = [];
                 var paramAttributes = [];
+
                 if (launchParams && launchParams.version) {
                     paramRunList = launchParams.version.runlist;
                     paramAttributes = launchParams.version.attributes;
                 }
 
-                ec2.launchInstance(anImage.imageIdentifier, self.instanceType, securityGroupIds, self.subnetId, 'D4D-' + launchParams.blueprintName, aKeyPair.keyPairName, self.instanceCount, function(err, instanceDataAll) {
+                ec2.launchInstance(anImage.imageIdentifier, self.instanceType, securityGroupIds, self.subnetId, 'D4D-' + launchParams.blueprintName, aKeyPair.keyPairName, self.instanceCount, function (err, instanceDataAll) {
                     if (err) {
                         logger.error("launchInstance Failed >> ", err);
                         callback({
-                           // message: "Instance Launched Failed"
-                           message: err.message
+                            // message: "Instance Launched Failed"
+                            message: err.message
                         });
                         return;
                     }
@@ -227,7 +229,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                             attributes: paramAttributes,
                             platformId: instanceData.InstanceId,
                             appUrls: launchParams.appUrls,
-							instanceIP: instanceData.PublicIpAddress || null,
+                            instanceIP: instanceData.PublicIpAddress || null,
                             instanceState: instanceData.State.Name,
                             bootStrapStatus: 'waiting',
                             users: launchParams.users,
@@ -243,10 +245,10 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                 },
                                 os: self.instanceOS
                             },
-							vpcId: instanceData.VpcId,
-							subnetId: instanceData.SubnetId,
-							privateIpAddress: instanceData.PrivateIpAddress,
-                            hostName:instanceData.PrivateDnsName,
+                            vpcId: instanceData.VpcId,
+                            subnetId: instanceData.SubnetId,
+                            privateIpAddress: instanceData.PrivateIpAddress,
+                            hostName: instanceData.PrivateDnsName,
                             credentials: {
                                 username: anImage.userName,
                                 pemFileLocation: encryptedPemFileLocation,
@@ -268,7 +270,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
 
 
                         logger.debug('Creating instance in catalyst');
-                        instancesDao.createInstance(instance, function(err, data) {
+                        instancesDao.createInstance(instance, function (err, data) {
                             if (err) {
                                 logger.error("Failed to create Instance", err);
                                 callback({
@@ -286,20 +288,20 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                             var actionLog = instancesDao.insertBootstrapActionLog(instance.id, instance.runlist, launchParams.sessionUser, timestampStarted);
                             var logsReferenceIds = [instance.id, actionLog._id];
 
-                            if(launchParams.auditTrailId !== null){
-                                var resultTaskExecution={
-                                    "actionLogId":logsReferenceIds[1],
-                                    "auditTrailConfig.nodeIdsWithActionLog":[{
-                                        "actionLogId" : logsReferenceIds[1],
-                                        "nodeId" : logsReferenceIds[0]
-                                    }],
-                                    "auditTrailConfig.nodeIds":[logsReferenceIds[0]],
-                                    "masterDetails.orgName":launchParams.orgName,
-                                    "masterDetails.bgName":launchParams.bgName,
-                                    "masterDetails.projectName":launchParams.projectName,
-                                    "masterDetails.envName":launchParams.envName
+                            if (launchParams.auditTrailId !== null) {
+                                var resultTaskExecution = {
+                                    "actionLogId": logsReferenceIds[1],
+                                    "auditTrailConfig.nodeIdsWithActionLog": [{
+                                            "actionLogId": logsReferenceIds[1],
+                                            "nodeId": logsReferenceIds[0]
+                                        }],
+                                    "auditTrailConfig.nodeIds": [logsReferenceIds[0]],
+                                    "masterDetails.orgName": launchParams.orgName,
+                                    "masterDetails.bgName": launchParams.bgName,
+                                    "masterDetails.projectName": launchParams.projectName,
+                                    "masterDetails.envName": launchParams.envName
                                 }
-                                auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                     if (err) {
                                         logger.error("Failed to create or update bot Log: ", err);
                                     }
@@ -332,13 +334,13 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                 providerType: launchParams.cloudProviderType,
                                 action: "Bootstrap",
                                 logs: [{
-                                    err: false,
-                                    log: "Starting instance",
-                                    timestamp: new Date().getTime()
-                                }]
+                                        err: false,
+                                        log: "Starting instance",
+                                        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);
                                 }
@@ -352,7 +354,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                             });
                             //For windows instance handle another check..
 
-                            ec2.waitForInstanceRunnnigState(instance.platformId, function(err, instanceData) {
+                            ec2.waitForInstanceRunnnigState(instance.platformId, function (err, instanceData) {
                                 if (err) {
                                     var timestamp = new Date().getTime();
                                     instanceLog.logs = {
@@ -362,18 +364,18 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                     };
                                     instanceLog.actionStatus = "failed";
                                     instanceLog.endedOn = 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);
                                         }
                                     });
-                                    if(launchParams.auditTrailId !== null){
-                                        var resultTaskExecution={
-                                            actionStatus : "failed",
-                                            status:"failed",
-                                            endedOn : new Date().getTime()
+                                    if (launchParams.auditTrailId !== null) {
+                                        var resultTaskExecution = {
+                                            actionStatus: "failed",
+                                            status: "failed",
+                                            endedOn: new Date().getTime()
                                         }
-                                        auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                        auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                             if (err) {
                                                 logger.error("Failed to create or update bot Log: ", err);
                                             }
@@ -390,14 +392,14 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                 }
                                 logger.debug("Enter waitForInstanceRunnnigState :", instanceData);
                                 instance.instanceIP = instanceData.PublicIpAddress || instanceData.PrivateIpAddress;
-                                instancesDao.updateInstanceIp(instance.id, instance.instanceIP, function(err, updateCount) {
+                                instancesDao.updateInstanceIp(instance.id, instance.instanceIP, function (err, updateCount) {
                                     if (err) {
                                         logger.error("instancesDao.updateInstanceIp Failed ==>", err);
                                         return;
                                     }
                                     logger.debug('Instance ip upadated');
                                 });
-                                instancesDao.updateInstanceState(instance.id, instanceData.State.Name, function(err, updateCount) {
+                                instancesDao.updateInstanceState(instance.id, instanceData.State.Name, function (err, updateCount) {
                                     if (err) {
                                         logger.error("error(date instance state err ==>", err);
                                         return;
@@ -411,7 +413,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                     log: "waiting for instance state to be ok",
                                     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);
                                     }
@@ -424,7 +426,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                     log: "waiting for instance state to be ok",
                                     timestamp: new Date().getTime()
                                 });
-                                ec2.waitForEvent(instanceData.InstanceId, 'instanceStatusOk', function(err) {
+                                ec2.waitForEvent(instanceData.InstanceId, 'instanceStatusOk', function (err) {
                                     if (err) {
                                         instanceLog.logs = {
                                             err: true,
@@ -433,19 +435,19 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                         };
                                         instanceLog.actionStatus = "failed";
                                         instanceLog.endedOn = 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);
                                             }
                                         });
 
-                                        if(launchParams.auditTrailId !== null){
-                                            var resultTaskExecution={
-                                                actionStatus : "failed",
-                                                status:"failed",
-                                                endedOn : new Date().getTime()
+                                        if (launchParams.auditTrailId !== null) {
+                                            var resultTaskExecution = {
+                                                actionStatus: "failed",
+                                                status: "failed",
+                                                endedOn: new Date().getTime()
                                             }
-                                            auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                            auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                                 if (err) {
                                                     logger.error("Failed to create or update bot Log: ", err);
                                                 }
@@ -469,10 +471,10 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                     var cryptoConfig = appConfig.cryptoSettings;
                                     var tempUncryptedPemFileLoc = appConfig.tempDir + uuid.v4();
                                     //cryptography.decryptFile(instance.credentials.pemFileLocation, cryptoConfig.decryptionEncoding, tempUncryptedPemFileLoc, cryptoConfig.encryptionEncoding, function(err) {
-                                    credentialcryptography.decryptCredential(instance.credentials, function(err, decryptedCredentials) {
+                                    credentialcryptography.decryptCredential(instance.credentials, function (err, decryptedCredentials) {
 
                                         if (err) {
-                                            instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function(err, updateData) {
+                                            instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
                                                 if (err) {
                                                     logger.error("Unable to set instance bootstarp status", err);
                                                 } else {
@@ -486,19 +488,19 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                                 log: "Unable to decrpt pem file. Bootstrap failed",
                                                 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);
                                                 }
                                             });
 
-                                            if(launchParams.auditTrailId !== null){
-                                                var resultTaskExecution={
-                                                    actionStatus : "failed",
-                                                    status:"failed",
-                                                    endedOn : new Date().getTime()
+                                            if (launchParams.auditTrailId !== null) {
+                                                var resultTaskExecution = {
+                                                    actionStatus: "failed",
+                                                    status: "failed",
+                                                    endedOn: new Date().getTime()
                                                 }
-                                                auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                                     if (err) {
                                                         logger.error("Failed to create or update bot Log: ", err);
                                                     }
@@ -526,269 +528,306 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
                                         } else if (launchParams.blueprintData.docker.image) {
                                             repoData['repoName'] = launchParams.blueprintData.docker.image;
                                         }
-                                        launchParams.blueprintData.getCookBookAttributes(instance, repoData, function(err, jsonAttributes) {
-                                            logger.debug("jsonAttributes::::: ", JSON.stringify(jsonAttributes));
-                                            var runlist = instance.runlist;
-                                            //logger.debug("launchParams.blueprintData.extraRunlist: ", JSON.stringify(launchParams.blueprintData.extraRunlist));
-                                            if (launchParams.blueprintData.extraRunlist) {
-                                                runlist = launchParams.blueprintData.extraRunlist.concat(instance.runlist);
-                                            }
 
-                                            //logger.debug("runlist: ", JSON.stringify(runlist));
-                                            var bootstrapInstanceParams = {
-                                                instanceIp: instance.instanceIP,
-                                                pemFilePath: decryptedCredentials.pemFileLocation,
-                                                runlist: runlist,
-                                                instanceUsername: instance.credentials.username,
-                                                nodeName: instance.chef.chefNodeName,
-                                                environment: launchParams.envName,
-                                                instanceOS: instance.hardware.os,
-                                                jsonAttributes: jsonAttributes,
-                                                instancePassword: decryptedCredentials.password
-                                            };
-                                            launchParams.infraManager.bootstrapInstance(bootstrapInstanceParams, function(err, code) {
+                                        launchParams.blueprintData.getCookBookAttributes(instance, repoData, function (err, jsonAttributes) {
 
-                                                if (decryptedCredentials.pemFileLocation) {
-                                                    fileIo.removeFile(decryptedCredentials.pemFileLocation, function(err) {
-                                                        if (err) {
-                                                            logger.error("Unable to delete temp pem file =>", err);
+                                            AWSProvider.getAWSProviderById(instance.providerId, function (err, aProvider) {
+                                                if (aProvider && aProvider.monitorId) {
+
+                                                    monitorsModel.getById(aProvider.monitorId, function (err, monitor) {
+                                                        if (monitor) {
+                                                            fnBootstrapInstance(monitor);
                                                         } else {
-                                                            logger.debug("temp pem file deleted =>", err);
+                                                            fnBootstrapInstance(null);
                                                         }
+
                                                     });
+                                                } else {
+                                                    fnBootstrapInstance(null);
                                                 }
-                                                logger.error('process stopped ==> ', err, code);
-                                                if (err) {
-                                                    instanceLog.endedOn = new Date().getTime();
-                                                    instanceLog.actionStatus = "failed";
-                                                    instanceLog.logs = {
-                                                        err: true,
-                                                        log: "Bootstrap failed",
-                                                        timestamp: new Date().getTime()
+
+                                            });
+                                            function fnBootstrapInstance(monitor) {
+                                                var runlist = instance.runlist;
+                                                if (launchParams.blueprintData.extraRunlist) {
+                                                    runlist = launchParams.blueprintData.extraRunlist.concat(instance.runlist);
+                                                }
+
+                                                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
                                                     };
-                                                    instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
-                                                        if (err) {
-                                                            logger.error("Failed to create or update instanceLog: ", err);
-                                                        }
-                                                    });
-                                                    if(launchParams.auditTrailId !== null){
-                                                        var resultTaskExecution={
-                                                            actionStatus : "failed",
-                                                            status:"failed",
-                                                            endedOn : new Date().getTime()
-                                                        }
-                                                        auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
-                                                            if (err) {
-                                                                logger.error("Failed to create or update bot Log: ", err);
-                                                            }
-                                                        });
-                                                    }
-                                                    logger.error("knife launch err ==>", err);
-                                                    instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function(err, updateData) {
 
-                                                    });
-                                                    var timestampEnded = new Date().getTime();
-                                                    logsDao.insertLog({
-                                                        referenceId: logsReferenceIds,
-                                                        err: true,
-                                                        log: "Bootstrap failed",
-                                                        timestamp: timestampEnded
-                                                    });
-                                                    instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
+                                                    logger.debug("sensuAttributes-------->", JSON.stringify(sensuAttributes));
+                                                    jsonAttributes['sensu-client'] = sensuAttributes;
 
+                                                }
 
-                                                } else {
-                                                    if (code == 0) {
-                                                        instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function(err, updateData) {
+                                                //logger.debug("runlist: ", JSON.stringify(runlist));
+                                                var bootstrapInstanceParams = {
+                                                    instanceIp: instance.instanceIP,
+                                                    pemFilePath: decryptedCredentials.pemFileLocation,
+                                                    runlist: runlist,
+                                                    instanceUsername: instance.credentials.username,
+                                                    nodeName: instance.chef.chefNodeName,
+                                                    environment: launchParams.envName,
+                                                    instanceOS: instance.hardware.os,
+                                                    jsonAttributes: jsonAttributes,
+                                                    instancePassword: decryptedCredentials.password
+                                                };
+                                                launchParams.infraManager.bootstrapInstance(bootstrapInstanceParams, function (err, code) {
+
+                                                    if (decryptedCredentials.pemFileLocation) {
+                                                        fileIo.removeFile(decryptedCredentials.pemFileLocation, function (err) {
                                                             if (err) {
-                                                                logger.error("Unable to set instance bootstarp status. code 0", err);
+                                                                logger.error("Unable to delete temp pem file =>", err);
                                                             } else {
-                                                                logger.debug("Instance bootstrap status set to success");
+                                                                logger.debug("temp pem file deleted =>", err);
                                                             }
                                                         });
+                                                    }
+                                                    logger.error('process stopped ==> ', err, code);
+                                                    if (err) {
                                                         instanceLog.endedOn = new Date().getTime();
-                                                        instanceLog.actionStatus = "success";
+                                                        instanceLog.actionStatus = "failed";
                                                         instanceLog.logs = {
-                                                            err: false,
-                                                            log: "Instance Bootstrapped successfully",
+                                                            err: true,
+                                                            log: "Bootstrap failed",
                                                             timestamp: new Date().getTime()
                                                         };
-                                                        if(launchParams.auditTrailId !== null){
-                                                            var resultTaskExecution={
-                                                                actionStatus : "success",
-                                                                status:"success",
-                                                                endedOn : new Date().getTime()
+                                                        instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                            if (err) {
+                                                                logger.error("Failed to create or update instanceLog: ", err);
+                                                            }
+                                                        });
+                                                        if (launchParams.auditTrailId !== null) {
+                                                            var resultTaskExecution = {
+                                                                actionStatus: "failed",
+                                                                status: "failed",
+                                                                endedOn: new Date().getTime()
                                                             }
-                                                            auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                                            auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
                                                                 if (err) {
                                                                     logger.error("Failed to create or update bot Log: ", err);
                                                                 }
                                                             });
                                                         }
-                                                        instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
-                                                            if (err) {
-                                                                logger.error("Failed to create or update instanceLog: ", err);
-                                                            }
+                                                        logger.error("knife launch err ==>", err);
+                                                        instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
+
                                                         });
                                                         var timestampEnded = new Date().getTime();
                                                         logsDao.insertLog({
                                                             referenceId: logsReferenceIds,
-                                                            err: false,
-                                                            log: "Instance Bootstrapped successfully",
+                                                            err: true,
+                                                            log: "Bootstrap failed",
                                                             timestamp: timestampEnded
                                                         });
-                                                        if(typeof domainName !== 'undefined' && domainName !== '' && domainName !== null && domainName !== 'null') {
-                                                            resourceService.updateDomainNameForInstance(domainName, instance.instanceIP,instance.id, awsSettings, function (err, updateDomainName) {
+                                                        instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
+
+
+                                                    } else {
+                                                        if (code == 0) {
+                                                            instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) {
                                                                 if (err) {
-                                                                    logger.error("resourceService.updateDomainNameForInstance Failed ==>", err);
-                                                                    return;
+                                                                    logger.error("Unable to set instance bootstarp status. code 0", err);
+                                                                } else {
+                                                                    logger.debug("Instance bootstrap status set to success");
                                                                 }
-                                                                logger.debug("Domain name is updated successfully");
                                                             });
-                                                        }
-                                                        instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded);
-                                                        launchParams.infraManager.getNode(instance.chefNodeName, function(err, nodeData) {
-                                                            if (err) {
-                                                                logger.error("Failed chef.getNode", err);
-                                                                return;
+                                                            instanceLog.endedOn = new Date().getTime();
+                                                            instanceLog.actionStatus = "success";
+                                                            instanceLog.logs = {
+                                                                err: false,
+                                                                log: "Instance Bootstrapped successfully",
+                                                                timestamp: new Date().getTime()
+                                                            };
+                                                            if (launchParams.auditTrailId !== null) {
+                                                                var resultTaskExecution = {
+                                                                    actionStatus: "success",
+                                                                    status: "success",
+                                                                    endedOn: new Date().getTime()
+                                                                }
+                                                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
+                                                                    if (err) {
+                                                                        logger.error("Failed to create or update bot Log: ", err);
+                                                                    }
+                                                                });
                                                             }
-                                                            instanceLog.platform = nodeData.automatic.platform;
-                                                            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);
                                                                 }
                                                             });
-                                                            var hardwareData = {};
-                                                            hardwareData.architecture = nodeData.automatic.kernel.machine;
-                                                            hardwareData.platform = nodeData.automatic.platform;
-                                                            hardwareData.platformVersion = nodeData.automatic.platform_version;
-                                                            hardwareData.memory = {
-                                                                total: 'unknown',
-                                                                free: 'unknown'
-                                                            };
-                                                            if (nodeData.automatic.memory) {
-                                                                hardwareData.memory.total = nodeData.automatic.memory.total;
-                                                                hardwareData.memory.free = nodeData.automatic.memory.free;
+                                                            var timestampEnded = new Date().getTime();
+                                                            logsDao.insertLog({
+                                                                referenceId: logsReferenceIds,
+                                                                err: false,
+                                                                log: "Instance Bootstrapped successfully",
+                                                                timestamp: timestampEnded
+                                                            });
+                                                            if (typeof domainName !== 'undefined' && domainName !== '' && domainName !== null && domainName !== 'null') {
+                                                                resourceService.updateDomainNameForInstance(domainName, instance.instanceIP, instance.id, awsSettings, function (err, updateDomainName) {
+                                                                    if (err) {
+                                                                        logger.error("resourceService.updateDomainNameForInstance Failed ==>", err);
+                                                                        return;
+                                                                    }
+                                                                    logger.debug("Domain name is updated successfully");
+                                                                });
                                                             }
-                                                            hardwareData.os = instance.hardware.os;
-                                                            instancesDao.setHardwareDetails(instance.id, hardwareData, function(err, updateData) {
+                                                            instancesDao.updateActionLog(instance.id, actionLog._id, true, timestampEnded);
+                                                            launchParams.infraManager.getNode(instance.chefNodeName, function (err, nodeData) {
                                                                 if (err) {
-                                                                    logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
-                                                                } else {
-                                                                    logger.debug("Instance hardware details set successessfully");
+                                                                    logger.error("Failed chef.getNode", err);
+                                                                    return;
                                                                 }
-                                                            });
-                                                            //Checking docker status and updating
-                                                            var _docker = new Docker();
-                                                            _docker.checkDockerStatus(instance.id,
-                                                                function(err, retCode) {
+                                                                instanceLog.platform = nodeData.automatic.platform;
+                                                                instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
                                                                     if (err) {
-                                                                        logger.error("Failed _docker.checkDockerStatus", err);
-                                                                        res.send(500);
-                                                                        return;
-                                                                        //res.end('200');
-
+                                                                        logger.error("Failed to create or update instanceLog: ", err);
                                                                     }
-                                                                    logger.debug('Docker Check Returned:' + retCode);
-                                                                    if (retCode == '0') {
-                                                                        instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function(data) {
-                                                                            logger.debug('Instance Docker Status set to Success');
-                                                                        });
-
+                                                                });
+                                                                var hardwareData = {};
+                                                                hardwareData.architecture = nodeData.automatic.kernel.machine;
+                                                                hardwareData.platform = nodeData.automatic.platform;
+                                                                hardwareData.platformVersion = nodeData.automatic.platform_version;
+                                                                hardwareData.memory = {
+                                                                    total: 'unknown',
+                                                                    free: 'unknown'
+                                                                };
+                                                                if (nodeData.automatic.memory) {
+                                                                    hardwareData.memory.total = nodeData.automatic.memory.total;
+                                                                    hardwareData.memory.free = nodeData.automatic.memory.free;
+                                                                }
+                                                                hardwareData.os = instance.hardware.os;
+                                                                instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) {
+                                                                    if (err) {
+                                                                        logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
+                                                                    } else {
+                                                                        logger.debug("Instance hardware details set successessfully");
                                                                     }
                                                                 });
+                                                                //Checking docker status and updating
+                                                                var _docker = new Docker();
+                                                                _docker.checkDockerStatus(instance.id,
+                                                                    function (err, retCode) {
+                                                                        if (err) {
+                                                                            logger.error("Failed _docker.checkDockerStatus", err);
+                                                                            res.send(500);
+                                                                            return;
+                                                                            //res.end('200');
+
+                                                                        }
+                                                                        logger.debug('Docker Check Returned:' + retCode);
+                                                                        if (retCode == '0') {
+                                                                            instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) {
+                                                                                logger.debug('Instance Docker Status set to Success');
+                                                                            });
+
+                                                                        }
+                                                                    });
 
-                                                        });
+                                                            });
 
-                                                    } else {
-                                                        instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function(err, updateData) {
-                                                            if (err) {
-                                                                logger.error("Unable to set instance bootstarp status code != 0", err);
-                                                            } else {
-                                                                logger.debug("Instance bootstrap status set to failed");
-                                                            }
-                                                        });
-                                                        instanceLog.endedOn = new Date().getTime();
-                                                        instanceLog.actionStatus = "failed";
-                                                        instanceLog.logs = {
-                                                            err: false,
-                                                            log: "Bootstrap Failed",
-                                                            timestamp: new Date().getTime()
-                                                        };
-                                                        instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
-                                                            if (err) {
-                                                                logger.error("Failed to create or update instanceLog: ", err);
-                                                            }
-                                                        });
-                                                        if(launchParams.auditTrailId !== null){
-                                                            var resultTaskExecution={
-                                                                actionStatus : "failed",
-                                                                status:"failed",
-                                                                endedOn : new Date().getTime()
-                                                            }
-                                                            auditTrailService.updateAuditTrail('BOTs',launchParams.auditTrailId,resultTaskExecution,function(err,auditTrail){
+                                                        } else {
+                                                            instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
                                                                 if (err) {
-                                                                    logger.error("Failed to create or update bot Log: ", err);
+                                                                    logger.error("Unable to set instance bootstarp status code != 0", err);
+                                                                } else {
+                                                                    logger.debug("Instance bootstrap status set to failed");
                                                                 }
                                                             });
-                                                        }
-                                                        var timestampEnded = new Date().getTime();
-                                                        logsDao.insertLog({
-                                                            referenceId: logsReferenceIds,
-                                                            err: false,
-                                                            log: "Bootstrap Failed",
-                                                            timestamp: timestampEnded
-                                                        });
-                                                        instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
+                                                            instanceLog.endedOn = new Date().getTime();
+                                                            instanceLog.actionStatus = "failed";
+                                                            instanceLog.logs = {
+                                                                err: false,
+                                                                log: "Bootstrap Failed",
+                                                                timestamp: new Date().getTime()
+                                                            };
+                                                            instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                                if (err) {
+                                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                                }
+                                                            });
+                                                            if (launchParams.auditTrailId !== null) {
+                                                                var resultTaskExecution = {
+                                                                    actionStatus: "failed",
+                                                                    status: "failed",
+                                                                    endedOn: new Date().getTime()
+                                                                }
+                                                                auditTrailService.updateAuditTrail('BOTs', launchParams.auditTrailId, resultTaskExecution, function (err, auditTrail) {
+                                                                    if (err) {
+                                                                        logger.error("Failed to create or update bot Log: ", err);
+                                                                    }
+                                                                });
+                                                            }
+                                                            var timestampEnded = new Date().getTime();
+                                                            logsDao.insertLog({
+                                                                referenceId: logsReferenceIds,
+                                                                err: false,
+                                                                log: "Bootstrap Failed",
+                                                                timestamp: timestampEnded
+                                                            });
+                                                            instancesDao.updateActionLog(instance.id, actionLog._id, false, timestampEnded);
 
+                                                        }
                                                     }
-                                                }
 
-                                            }, function(stdOutData) {
+                                                }, function (stdOutData) {
 
-                                                instanceLog.logs = {
-                                                    err: false,
-                                                    log: stdOutData.toString('ascii'),
-                                                    timestamp: new Date().getTime()
-                                                };
-                                                instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
-                                                    if (err) {
-                                                        logger.error("Failed to create or update instanceLog: ", err);
-                                                    }
-                                                });
+                                                    instanceLog.logs = {
+                                                        err: false,
+                                                        log: stdOutData.toString('ascii'),
+                                                        timestamp: new Date().getTime()
+                                                    };
+                                                    instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                        if (err) {
+                                                            logger.error("Failed to create or update instanceLog: ", err);
+                                                        }
+                                                    });
 
-                                                logsDao.insertLog({
-                                                    referenceId: logsReferenceIds,
-                                                    err: false,
-                                                    log: stdOutData.toString('ascii'),
-                                                    timestamp: new Date().getTime()
-                                                });
+                                                    logsDao.insertLog({
+                                                        referenceId: logsReferenceIds,
+                                                        err: false,
+                                                        log: stdOutData.toString('ascii'),
+                                                        timestamp: new Date().getTime()
+                                                    });
 
-                                            }, function(stdErrData) {
-                                                instanceLog.logs = {
-                                                    err: true,
-                                                    log: stdErrData.toString('ascii'),
-                                                    timestamp: new Date().getTime()
-                                                };
-                                                instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
-                                                    if (err) {
-                                                        logger.error("Failed to create or update instanceLog: ", err);
-                                                    }
-                                                });
+                                                }, function (stdErrData) {
+                                                    instanceLog.logs = {
+                                                        err: true,
+                                                        log: stdErrData.toString('ascii'),
+                                                        timestamp: new Date().getTime()
+                                                    };
+                                                    instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function (err, logData) {
+                                                        if (err) {
+                                                            logger.error("Failed to create or update instanceLog: ", err);
+                                                        }
+                                                    });
 
-                                                //retrying 4 times before giving up.
-                                                logsDao.insertLog({
-                                                    referenceId: logsReferenceIds,
-                                                    err: true,
-                                                    log: stdErrData.toString('ascii'),
-                                                    timestamp: new Date().getTime()
-                                                });
+                                                    //retrying 4 times before giving up.
+                                                    logsDao.insertLog({
+                                                        referenceId: logsReferenceIds,
+                                                        err: true,
+                                                        log: stdErrData.toString('ascii'),
+                                                        timestamp: new Date().getTime()
+                                                    });
 
 
-                                            });
+                                                });
+                                            }
                                         });
-
-
                                     });
                                 });
                             });
@@ -812,7 +851,7 @@ AWSInstanceBlueprintSchema.methods.launch = function(launchParams, callback) {
 };
 
 // static methods
-AWSInstanceBlueprintSchema.statics.createNew = function(awsData) {
+AWSInstanceBlueprintSchema.statics.createNew = function (awsData) {
     var self = this;
     var awsInstanceBlueprint = new self(awsData);
     return awsInstanceBlueprint;
@@ -820,4 +859,4 @@ AWSInstanceBlueprintSchema.statics.createNew = function(awsData) {
 
 var AWSInstanceBlueprint = mongoose.model('AWSInstanceBlueprint', AWSInstanceBlueprintSchema);
 
-module.exports = AWSInstanceBlueprint;
+module.exports = AWSInstanceBlueprint;
\ No newline at end of file
diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js
index 860e84b6a..b68228526 100755
--- a/server/app/model/blueprint/blueprint.js
+++ b/server/app/model/blueprint/blueprint.js
@@ -1468,4 +1468,4 @@ BlueprintSchema.statics.checkBPDependencyByFieldName = function(fieldName,id, ca
 
 var Blueprints = mongoose.model('blueprints', BlueprintSchema);
 
-module.exports = Blueprints;
\ No newline at end of file
+module.exports = Blueprints;
diff --git a/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js b/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
index c403ae11d..889f34531 100644
--- a/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
+++ b/server/app/model/classes/masters/cloudprovider/awsCloudProvider.js
@@ -76,6 +76,12 @@ var awsProviderSchema = new Schema({
 		type: Number,
 		required:false,
 		default:0.0
+	},
+	monitorId: {
+		type: String,
+		required:false,
+		trim: true,
+		default: null
 	}
 });
 awsProviderSchema.path('plannedCost').get(function(num) {
@@ -214,6 +220,7 @@ awsProviderSchema.statics.updateAWSProviderById = function(providerId, providerD
 			accessKey: providerData.accessKey,
 			secretKey: providerData.secretKey,
 			s3BucketName: providerData.s3BucketName,
+			monitorId:providerData.monitorId,
 			plannedCost:providerData.plannedCost
 		}
 	}, {
diff --git a/server/app/model/d4dmasters/d4dmastersmodelnew.js b/server/app/model/d4dmasters/d4dmastersmodelnew.js
index 58bc05c9b..cde5ac1c6 100755
--- a/server/app/model/d4dmasters/d4dmastersmodelnew.js
+++ b/server/app/model/d4dmasters/d4dmastersmodelnew.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.
@@ -24,12 +24,12 @@ var logger = require('_pr/logger')(module);
 var extend = require('mongoose-validator').extend;
 var Schema = mongoose.Schema;
 
-extend('is_ValidName', function(val) {
+extend('is_ValidName', function (val) {
     var pattern = /^[a-zA-Z0-9-_]+$/;
     return pattern.test(val);
 }, 'Name can contain alphabets, numbers,dash, underscore');
 
-extend('isValidDesc', function(val) {
+extend('isValidDesc', function (val) {
     var pattern = /^[a-zA-Z0-9-_.,\s]+$/;
     return pattern.test(val);
 }, 'Name can contain alphabets, numbers,dash, underscore');
@@ -105,8 +105,8 @@ var d4dMastersOrg = new mongoose.Schema({
     },
     plannedCost: {
         type: Number,
-        required:false,
-        default:0.0
+        required: false,
+        default: 0.0
     },
     active: {
         type: Boolean,
@@ -379,9 +379,9 @@ var d4dMastersProjects = new mongoose.Schema({
         default: true
     },
     appdeploy: [{
-        applicationname: String,
-        appdescription: String
-    }],
+            applicationname: String,
+            appdescription: String
+        }],
     repositories: {
         nexus: [String],
         docker: [String]
@@ -472,6 +472,12 @@ var d4dMastersConfigManagement = new mongoose.Schema({
         type: String,
         required: true,
         trim: true
+    },
+    monitorId: {
+        type: String,
+        required: false,
+        trim: true,
+        default: null
     }
 }, {
     collection: 'd4dmastersnew'
@@ -534,7 +540,7 @@ var d4dMastersDockerConfig = new mongoose.Schema({
         required: false,
         trim: true
     },
-    repositories:Schema.Types.Mixed,
+    repositories: Schema.Types.Mixed,
     folderpath: {
         type: String,
         trim: true
@@ -1281,7 +1287,7 @@ var d4dMastersNexusServer = new mongoose.Schema({
         required: false,
         trim: true
     },
-    repositories:Schema.Types.Mixed,
+    repositories: Schema.Types.Mixed,
     orgrowid: {
         type: String,
         trim: true
diff --git a/server/app/model/file-upload/file-upload.js b/server/app/model/file-upload/file-upload.js
index 8e3ccc9c6..b1b1a5d87 100644
--- a/server/app/model/file-upload/file-upload.js
+++ b/server/app/model/file-upload/file-upload.js
@@ -3,9 +3,9 @@ var fs = require('fs');
 var Grid = require('gridfs-stream');
 var appConfig = require('_pr/config');
 var logger = require('_pr/logger')(module);
-var gfs =null;
+var gfs = null;
 var mongoDbClient = require('mongodb');
-mongoDbClient.connect('mongodb://'+ appConfig.db.host + ':' + appConfig.db.port + '/' + appConfig.db.dbName, function(err, db) {
+mongoDbClient.connect('mongodb://' + appConfig.db.host + ':' + appConfig.db.port + '/' + appConfig.db.dbName, function (err, db) {
     if (err) {
         throw "unable to connect to mongodb"
         return;
@@ -15,59 +15,69 @@ mongoDbClient.connect('mongodb://'+ appConfig.db.host + ':' + appConfig.db.port
 
 var fileUpload = module.exports = {};
 
-fileUpload.uploadFile = function uploadFile(filename, filePath,fileId, callback){
+fileUpload.uploadFile = function uploadFile(filename, filePath, fileId, callback) {
     var writeStream = gfs.createWriteStream({
         _id: fileId,
         filename: filename,
-        mode:'w',
+        mode: 'w',
         content_type: 'plain/text'
     });
     fs.createReadStream(filePath).pipe(writeStream).on('error', function (err) {
         logger.error(err);
-        callback(err,null);
-    }).on('finish', function() {
-        callback(null,fileId)
+        callback(err, null);
+    }).on('finish', function () {
+        callback(null, fileId)
     });
 };
 
-fileUpload.getFileByFileId = function getFileByFileId(fileId, callback){
+fileUpload.getFileByFileId = function getFileByFileId(fileId, callback) {
     gfs.findOne({
         _id: fileId
     }, function (err, file) {
         if (err) {
             callback(err, null);
         }
-        callback(null,file);
+        callback(null, file);
     });
 };
 
-fileUpload.getReadStreamFileByFileId = function getFileByFileId(fileId, callback){
+fileUpload.getReadStreamFileByFileId = function getFileByFileId(fileId, callback) {
     var buffer = '';
     gfs.findOne({
         _id: fileId
     }, function (err, file) {
-        var readStream = gfs.createReadStream({
-            _id: file._id
-        });
-        readStream.on("data", function (chunk) {
-            buffer += chunk;
-        });
-        readStream.on("end", function () {
-            callback(null, {fileName:file.filename,fileData:buffer})
-        });
-        readStream.on("error", function (err) {
-            callback(err, null)
-        });
+        if (err) {
+            var err = new Error('Internal server error');
+            err.status = 500;
+            return callback(err);
+        } else if (!file) {
+            var err = new Error('File not found');
+            err.status = 404;
+            return callback(err);
+        } else {
+            var readStream = gfs.createReadStream({
+                _id: file._id
+            });
+            readStream.on("data", function (chunk) {
+                buffer += chunk;
+            });
+            readStream.on("end", function () {
+                callback(null, {fileName: file.filename, fileData: buffer})
+            });
+            readStream.on("error", function (err) {
+                callback(err, null)
+            });
+        }
     });
 };
 
-fileUpload.removeFileByFileId = function removeFileByFileId(fileId, callback){
+fileUpload.removeFileByFileId = function removeFileByFileId(fileId, callback) {
     gfs.files.remove({
         _id: fileId
     }, function (err, file) {
         if (err) {
             callback(err, null);
-        }else{
+        } else {
             callback(null, file);
         }
     });
diff --git a/server/app/model/monitors/monitors.js b/server/app/model/monitors/monitors.js
new file mode 100644
index 000000000..5a3a98f92
--- /dev/null
+++ b/server/app/model/monitors/monitors.js
@@ -0,0 +1,162 @@
+/*
+ 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.
+ */
+
+var mongoose = require('mongoose');
+var ObjectId = require('mongoose').Types.ObjectId;
+var logger = require('_pr/logger')(module);
+var Schema = mongoose.Schema;
+var MonitorsSchema = new Schema({
+    orgId: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    name: {
+        type: String,
+        required: true,
+        trim: true
+    },
+    type: {
+        type: String,
+        trim: true,
+        required: true
+    },
+    parameters: {
+        type: Schema.Types.Mixed
+    },
+    isDeleted: {
+        type: Boolean,
+        required: true,
+        default: false
+    }
+});
+
+var hiddenFields = { 'isDeleted': 0 };
+
+MonitorsSchema.statics.createNew = function createNew(data, callback) {
+    var self = this;
+    var monitors = new self(data);
+    monitors.save(function(err, data) {
+        if (err) {
+            logger.error(err);
+            if (typeof callback === 'function') {
+                return callback(err, null);
+            }
+        } else {
+            if (typeof callback === 'function') {
+                return callback(null, monitors);
+            }
+        }
+    });
+};
+
+MonitorsSchema.statics.getMonitors = function(params, callback) {
+    params.isDeleted = false;
+
+    this.aggregate([{
+        $match: params
+    }, {
+        $lookup: {
+            from: "d4dmastersnew",
+            localField: "orgId",
+            foreignField: "rowid",
+            as: "organization"
+        }
+    }], function(err, monitors) {
+        if (err) {
+            callback(err, null);
+            return;
+        } else if (monitors.length === 0) {
+            callback(null, monitors);
+            return;
+        } else {
+            return callback(null, monitors);
+        }
+    });
+
+};
+
+MonitorsSchema.statics.getById = function(monitorId, callback) {
+    this.find({ '_id': monitorId, 'isDeleted': false },
+        hiddenFields,
+        function(err, monitors) {
+            if (err) {
+                logger.error(err);
+                return callback(err, null);
+            } else if (monitors.length === 0) {
+                callback(null, null);
+                return;
+            } else {
+                return callback(null, monitors[0]);
+            }
+        }
+    );
+};
+
+MonitorsSchema.statics.getMonitor = function(monitorId, callback) {
+    this.aggregate([{
+        $match: { '_id': ObjectId(monitorId), 'isDeleted': false }
+    }, {
+        $lookup: {
+            from: "d4dmastersnew",
+            localField: "orgId",
+            foreignField: "rowid",
+            as: "organization"
+        }
+    }], function(err, monitors) {
+        if (err) {
+            callback(err, null);
+            return;
+        } else if (monitors.length === 0) {
+            callback(null, null);
+            return;
+        } else {
+            return callback(null, monitors[0]);
+        }
+    });
+};
+
+MonitorsSchema.statics.updateMonitors = function(monitorId, fields, callback) {
+    this.update({ '_id': monitorId }, { $set: fields },
+        function(err, result) {
+            if (err) {
+                logger.error(err);
+                if (typeof callback === 'function') {
+                    return callback(err, null);
+                }
+            } else if ((result.ok === 1 && result.n == 1) && (typeof callback == 'function')) {
+                return callback(null, true);
+            } else if (typeof callback === 'function') {
+                return callback(null, null);
+            }
+        }
+    );
+};
+
+MonitorsSchema.statics.deleteMonitors = function(monitorId, callback) {
+    this.update({ '_id': monitorId }, { $set: { isDeleted: true } },
+        function(err, monitors) {
+            if (err) {
+                logger.error(err);
+                return callback(err, null);
+            } else {
+                return callback(null, true);
+            }
+        }
+    );
+};
+var Monitors = mongoose.model('Monitors', MonitorsSchema);
+module.exports = Monitors;
diff --git a/server/app/model/monitors/package.json b/server/app/model/monitors/package.json
new file mode 100644
index 000000000..ad5ef5756
--- /dev/null
+++ b/server/app/model/monitors/package.json
@@ -0,0 +1,3 @@
+{
+	"main":"monitors.js"
+}
\ No newline at end of file
diff --git a/server/app/routes/v1.0/routes.js b/server/app/routes/v1.0/routes.js
index 7b8bf7057..420008cf0 100755
--- a/server/app/routes/v1.0/routes.js
+++ b/server/app/routes/v1.0/routes.js
@@ -74,6 +74,7 @@ var scripts = require('./routes_scripts');
 var fileUpload = require('./routes_fileUpload');
 var settingWizard = require('./routes_setting_wizard');
 var configData = require('./routes_config_data');
+var monitors = require('./routes_monitors');
 /*
  * @TODO
  * Change app to router in internal routes files
@@ -181,6 +182,8 @@ module.exports.setRoutes = function(app) {
     fileUpload.setRoutes(app, sessionVerificationFunc);
 
     settingWizard.setRoutes(app, sessionVerificationFunc);
+    
+    monitors.setRoutes(app, sessionVerificationFunc);
 
     configData.setRoutes(app, sessionVerificationFunc);
 
@@ -264,4 +267,4 @@ module.exports.setRoutes = function(app) {
             return res.status(err.status).send(errorResponse);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/server/app/routes/v1.0/routes_d4dMasters.js b/server/app/routes/v1.0/routes_d4dMasters.js
index 4bcc205b0..2ca05c644 100755
--- a/server/app/routes/v1.0/routes_d4dMasters.js
+++ b/server/app/routes/v1.0/routes_d4dMasters.js
@@ -13,10 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-
-
 // This file act as a Controller which contains Settings related all end points.
-
 var d4dModel = require('_pr/model/d4dmasters/d4dmastersmodel.js');
 var d4dModelNew = require('_pr/model/d4dmasters/d4dmastersmodelnew.js');
 var usersDao = require('_pr/model/users.js');
@@ -46,6 +43,7 @@ var async = require('async');
 var appDeployPipelineService = require('_pr/services/appDeployPipelineService');
 var settingsService = require('_pr/services/settingsService');
 var settingWizard = require('_pr/model/setting-wizard');
+var monitorsModel = require('_pr/model/monitors/monitors.js');
 
 
 module.exports.setRoutes = function(app, sessionVerification) {
@@ -649,7 +647,14 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                     d4dMasterJson[flds[0]] = names; //configmgmtDao.convertRowIDToValue(jobj[k1],rowidlist);
                                 }
                             }
-                            res.end(JSON.stringify(d4dMasterJson));
+                            if (req.params.id === '10') {
+                                getMonitorDetail(d4dMasterJson, function(data) {
+                                    d4dMasterJson = data;
+                                    res.end(JSON.stringify(d4dMasterJson));
+                                });
+                            } else {
+                                res.end(JSON.stringify(d4dMasterJson));
+                            }
                             logger.debug("sent response %s", JSON.stringify(d4dMasterJson));
                             logger.debug("Exit get() for /d4dMasters/readmasterjsonrecord/%s/%s", req.params.id, req.params.rowid);
                         } else {
@@ -756,8 +761,17 @@ module.exports.setRoutes = function(app, sessionVerification) {
                             if (err) {
                                 res.status(500).send('Not able to fetch ConfigManagement.');
                             }
-                            res.send(configMgmtList);
-                            return;
+                            var response = [];
+                            for (var i = 0; i < configMgmtList.length; i++) {
+                                getMonitorDetail(configMgmtList[i], function(data) {
+                                    response.push(data);
+                                    if (response.length === configMgmtList.length) {
+                                        res.send(response);
+                                        return;
+                                    }
+                                });
+                            }
+
                         });
 
                     } else if (req.params.id === '18') {
@@ -911,8 +925,16 @@ module.exports.setRoutes = function(app, sessionVerification) {
                             if (err) {
                                 res.status(500).send('Not able to fetch ConfigManagement.');
                             }
-                            res.send(configMgmtList);
-                            return;
+                            var response = [];
+                            for (var i = 0; i < configMgmtList.length; i++) {
+                                getMonitorDetail(configMgmtList[i], function(data) {
+                                    response.push(data);
+                                    if (response.length === configMgmtList.length) {
+                                        res.send(response);
+                                        return;
+                                    }
+                                });
+                            }
                         });
 
                     } else if (req.params.id === '18') {
@@ -4026,4 +4048,26 @@ module.exports.setRoutes = function(app, sessionVerification) {
             }
         });
     });
+};
+
+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;
+            }
+            callback(data);
+        });
+    } else {
+        delete data['monitorId'];
+        data.monitor = null;
+        callback(data);
+    }
 }
\ No newline at end of file
diff --git a/server/app/routes/v1.0/routes_monitors.js b/server/app/routes/v1.0/routes_monitors.js
new file mode 100644
index 000000000..46f375bae
--- /dev/null
+++ b/server/app/routes/v1.0/routes_monitors.js
@@ -0,0 +1,485 @@
+/*
+ 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.
+ */
+const json2csv = require('json2csv');
+const monitorsService = require('_pr/services/monitorsService');
+const async = require('async');
+var logger = require('_pr/logger')(module);
+var validate = require('express-validation');
+var appConfig = require('_pr/config');
+var Cryptography = require('_pr/lib/utils/cryptography');
+var monitorsValidator = require('_pr/validators/monitorsValidator');
+
+module.exports.setRoutes = function(app, sessionVerificationFunc) {
+
+    app.all('/monitors/*', sessionVerificationFunc);
+    /**
+     * @api {get} /monitors/filterBy=orgId:<organizationId> 
+     *                                     Get monitors list
+     * @apiName getMonitors
+     * @apiGroup monitors
+     * @apiVersion 1.0.0
+     *
+     * @apiParam {String} filterBy          Catalyst entity. Multiple entities can be specified using +
+     * 
+     * @apiExample Sample_Request_1
+     *      /monitors?filterBy=orgId:5790c31edff2c49223fd6efa
+     *
+     * @apiSuccess {Object[]} monitors              List of monitors
+     * @apiSuccess {String} id       Monitor id
+     * @apiSuccess {Object} organization       Monitor Organization
+     * @apiSuccess {String} organization.id        Monitor organization id
+     * @apiSuccess {String} organization.name      Monitor organization name
+     * @apiSuccess {String} type         Monitor Server type     
+     * @apiSuccess {String} name         Monitor Server name     
+     * @apiSuccess {Object} parameters       Monitor Server Parameters
+     * @apiSuccess {String} parameters.url   Monitor Server Url
+     * @apiSuccess {String} parameters.transportProtocol   Monitor Server Transport Protocols Name
+     * @apiSuccess {Object} parameters.transportProtocolParameters   Monitor Server Transport Protocols Parameters
+     * @apiSuccessExample {json} Monitor-Success-Response:
+     *      HTTP/1.1 200 OK
+     *      {[
+     *          "_id": "",
+     *          "name": "someName",
+     *          "organization": {
+     *              "id": "",
+     *              "name": "Organization name"
+     *          },
+     *          "type": "Sensu",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": {
+     *                  "name": "rabbitmq",
+     *                  "parameters": {
+     *                      "host": "10.0.0.6",
+     *                      "port": 5671,
+     *                      "vhost": "/sensu",
+     *                      "user": "sensu",
+     *                      "heartbeat": 30,
+     *                      "prefetch": 50
+     *                  }
+     *              }
+     *          }
+     *      ]}
+     *      
+     *      
+     *      HTTP/1.1 200 OK
+     *      {[
+     *          "_id": "",
+     *          "name": "someName",
+     *          "organization": {
+     *              "id": "",
+     *              "name": "Organization name"
+     *          },
+     *          "type": "Sensu",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": {
+     *                  "name": "redis",
+     *                  "parameters": {
+     *                      "host": "10.0.0.6",
+     *                      "port": 5671
+     *                  }
+     *              }
+     *          }
+     *      ]}
+     */
+    app.get("/monitors/", getMonitors);
+
+    function getMonitors(req, res, next) {
+
+        //@TODO Authorization to be implemented after fixing provider schema
+        async.waterfall([
+            function(next) {
+                monitorsService.getMonitors(req.query, next);
+            }
+        ], function(err, monitors) {
+            if (err) {
+                next(err);
+            } else {
+                res.status(200).send(monitors);
+            }
+        });
+    }
+
+
+    /**
+     * @api {get} /monitors/:monitorId Get monitor details
+     * @apiName getMonitor
+     * @apiGroup monitors
+     *
+     * @apiSuccess {Object} monitor             monitor data
+     * @apiSuccess {String} id       Monitor id
+     * @apiSuccess {Object} organization       Monitor Organization
+     * @apiSuccess {String} organization.id        Monitor organization id
+     * @apiSuccess {String} organization.name      Monitor organization name
+     * @apiSuccess {String} type         Monitor Server type     
+     * @apiSuccess {String} name         Monitor Server name
+     * @apiSuccess {Object} parameters       Monitor Server Parameters
+     * @apiSuccess {String} parameters.url   Monitor Server Url
+     * @apiSuccess {String} parameters.transportProtocol   Monitor Server Transport Protocols Name
+     * @apiSuccess {Object} parameters.transportProtocolParameters   Monitor Server Transport Protocols Parameters
+     * @apiSuccessExample {json} Monitor-Success-Response:
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "_id": "",
+     *          "name": "someName",
+     *          "organization": {
+     *              "id": "",
+     *              "name": "Organization name"
+     *          },
+     *          "type": "Sensu",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": {
+     *                  "name": "rabbitmq",
+     *                  "parameters": {
+     *                      "host": "10.0.0.6",
+     *                      "port": 5671,
+     *                      "vhost": "/sensu",
+     *                      "user": "sensu"
+     *                      "heartbeat": 30,
+     *                      "prefetch": 50
+     *                  }
+     *              }
+     *          }
+     *      }
+     *      
+     *      
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "_id": "",
+     *          "name": "someName",
+     *          "organization": {
+     *              "id": "",
+     *              "name": "Organization name"
+     *          },
+     *          "type": "Sensu",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": {
+     *                  "name": "redis",
+     *                  "parameters": {
+     *                      "host": "10.0.0.6",
+     *                      "port": 5671
+     *                  }
+     *              }
+     *          }
+     *      }
+     */
+    app.get('/monitors/:monitorId', getMonitor);
+
+    function getMonitor(req, res, next) {
+        async.waterfall(
+            [
+                function(next) {
+                    monitorsService.getMonitor(req.params.monitorId, next);
+                }
+            ],
+            function(err, results) {
+                if (err) {
+                    next(err);
+                } else {
+                    return res.status(200).send(results);
+                }
+            }
+        );
+    }
+
+    /**
+     * @api {post} /monitors/  Add Monitor
+     * @apiName createMonitors
+     * @apiGroup monitors
+     *
+     * @apiSuccess {Object} monitor             monitor data
+     * @apiSuccess {String} orgId        Organization Id
+     * @apiSuccess {String} type         Monitor Server type     
+     * @apiSuccess {String} name         Monitor Server name     
+     * @apiSuccess {Object} parameters       Monitor Server Parameters
+     * @apiSuccess {String} parameters.url   Monitor Server Url
+     * @apiSuccess {String} parameters.transportProtocol   Monitor Server Transport Protocols Name
+     * @apiSuccess {Object} parameters.transportProtocolParameters   Monitor Server Transport Protocols Parameters
+     * @apiParamExample {json} Request-Example:
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": "redis",
+     *              "transportProtocolParameters":{
+     *                  "host": "10.0.0.6",
+     *                  "port": 5671,
+     *                  "password": "secret",
+     *              
+     *              }
+     *          }
+     *      }
+     *
+     *      {
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *          "url": "Server Url",
+     *          "transportProtocol": "rabbitmq",
+     *          "transportProtocolParameters":{
+     *              "host": "10.0.0.6",
+     *              "port": 5671,
+     *              "vhost": "/sensu",
+     *              "user": "sensu",
+     *              "password": "secret",
+     *              "heartbeat": 30,
+     *              "prefetch": 50,
+     *              "ssl": {
+     *                  "certChainFileId": "SomeId",
+     *                  "privateKeyFileId": "SomeId"
+     *              }
+     *          }
+     *          }
+     *      }
+     *
+     *
+     * @apiSuccessExample {json} Success-Response:
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "__v": 0,
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *              "transportProtocolParameters": {
+     *                  "password": "iEhK5+u/dBHRNbilkF7f7Q==",
+     *                  "port": 5671,
+     *                  "host": "10.0.0.6"
+     *              },
+     *              "transportProtocol": "redis",
+     *              "url": "Server Url"
+     *          },
+     *          "_id": "58071046efa15bb50b7ccdf8",
+     *          "isDeleted": false
+     *      }
+     *
+     *      {
+     *          "__v": 0,
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *              "transportProtocolParameters": {
+     *                  "ssl": {
+     *                      "privateKeyFileId": "SomeId",
+     *                      "certChainFileId": "SomeId"
+     *                  },
+     *                  "prefetch": 50,
+     *                  "heartbeat": 30,
+     *                  "password": "iEhK5+u/dBHRNbilkF7f7Q==",
+     *                  "user": "sensu",
+     *                  "vhost": "/sensu",
+     *                  "port": 5671,
+     *                  "host": "10.0.0.6"
+     *              },
+     *              "transportProtocol": "rabbitmq",
+     *              "url": "Server Url"
+     *          },
+     *          "_id": "58071104efa15bb50b7cce41",
+     *          "isDeleted": false
+     *      }
+     */
+    app.post('/monitors', validate(monitorsValidator.create), createMonitors);
+
+    function createMonitors(req, res, next) {
+        async.waterfall(
+            [
+                function(next) {
+                    if (req.body.type === 'sensu' && req.body.parameters.transportProtocolParameters['password']) {
+                        var cryptoConfig = appConfig.cryptoSettings;
+                        var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+                        var encryptedPassword = cryptography.encryptText(req.body.parameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding);
+                        req.body.parameters.transportProtocolParameters['password'] = encryptedPassword;
+                    }
+                    monitorsService.createMonitor(req.body, next);
+                }
+            ],
+            function(err, results) {
+                if (err) {
+                    next(err);
+                } else {
+                    return res.status(201).send(results);
+                }
+            }
+        );
+    }
+
+
+    /**
+     * @api {put} /monitors/:monitorId  Update Monitor
+     * @apiName updateMonitor
+     * @apiGroup monitors
+     *
+     * @apiSuccess {Object} monitor             monitor data
+     * @apiSuccess {String} orgId        Organization Id
+     * @apiSuccess {String} type         Monitor Server type     
+     * @apiSuccess {String} name         Monitor Server name     
+     * @apiSuccess {Object} parameters       Monitor Server Parameters
+     * @apiSuccess {String} parameters.url   Monitor Server Url
+     * @apiSuccess {String} parameters.transportProtocol   Monitor Server Transport Protocols Name
+     * @apiSuccess {Object} parameters.transportProtocolParameters   Monitor Server Transport Protocols Parameters
+     * @apiParamExample {json} Request-Example:
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *              "url": "Server Url",
+     *              "transportProtocol": "redis",
+     *              "transportProtocolParameters":{
+     *                  "host": "10.0.0.6",
+     *                  "port": 5671,
+     *                  "password": "secret",
+     *              }
+     *          }
+     *      }
+     *
+     *      {
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *          "url": "Server Url",
+     *          "transportProtocol": "rabbitmq",
+     *          "transportProtocolParameters":{
+     *              "host": "10.0.0.6",
+     *              "port": 5671,
+     *              "vhost": "/sensu",
+     *              "user": "sensu",
+     *              "password": "secret",
+     *              "heartbeat": 30,
+     *              "prefetch": 50,
+     *              "ssl": {
+     *                  "certChainFileId": "SomeId",
+     *                  "privateKeyFileId": "SomeId"
+     *              }
+     *          }
+     *          }
+     *      }
+     *
+     *
+     * @apiSuccessExample {json} Success-Response:
+     *      HTTP/1.1 200 OK
+     *      {
+     *          "__v": 0,
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "type": "sensu",
+     *          "name": "someName",
+     *          "parameters": {
+     *              "transportProtocolParameters": {
+     *                  "password": "iEhK5+u/dBHRNbilkF7f7Q==",
+     *                  "port": 5671,
+     *                  "host": "10.0.0.6"
+     *              },
+     *              "transportProtocol": "redis",
+     *              "url": "Server Url"
+     *          },
+     *          "_id": "58071046efa15bb50b7ccdf8",
+     *          "isDeleted": false
+     *      }
+     *
+     *      {
+     *          "__v": 0,
+     *          "orgId": "46d1da9a-d927-41dc-8e9e-7e926d927535",
+     *          "name": "someName",
+     *          "type": "sensu",
+     *          "parameters": {
+     *              "transportProtocolParameters": {
+     *                  "ssl": {
+     *                      "privateKeyFileId": "SomeId",
+     *                      "certChainFileId": "SomeId"
+     *                  },
+     *                  "prefetch": 50,
+     *                  "heartbeat": 30,
+     *                  "password": "iEhK5+u/dBHRNbilkF7f7Q==",
+     *                  "user": "sensu",
+     *                  "vhost": "/sensu",
+     *                  "port": 5671,
+     *                  "host": "10.0.0.6"
+     *              },
+     *              "transportProtocol": "rabbitmq",
+     *              "url": "Server Url"
+     *          },
+     *          "_id": "58071104efa15bb50b7cce41",
+     *          "isDeleted": false
+     *      }
+     */
+    app.put('/monitors/:monitorId', validate(monitorsValidator.update), updateMonitor);
+
+    function updateMonitor(req, res, next) {
+        async.waterfall(
+            [
+                function(next) {
+                    monitorsService.checkIfMonitorExists(req.params.monitorId, next);
+                },
+                function(monitor, next) {
+                    if (req.body.type === 'sensu' && req.body.parameters.transportProtocolParameters['password']) {
+                        var cryptoConfig = appConfig.cryptoSettings;
+                        var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+                        var encryptedPassword = cryptography.encryptText(req.body.parameters.transportProtocolParameters['password'], cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding);
+                        req.body.parameters.transportProtocolParameters['password'] = encryptedPassword;
+                    }
+                    monitorsService.updateMonitor(req.params.monitorId, req.body, next);
+                }
+            ],
+            function(err, results) {
+                if (err) {
+                    next(err);
+                } else {
+                    return res.status(200).send(results);
+                }
+            }
+        );
+    }
+
+
+    /**
+     * @api {delete} /monitors/:monitorId Delete Monitor
+     * @apiName deleteMonitor
+     * @apiGroup monitors
+     *
+     * @apiParam {Number} monitorId    Monitor ID
+     *
+     * @apiSuccess {Object} response    Empty response object
+     *
+     */
+    app.delete('/monitors/:monitorId', deleteMonitor);
+
+    function deleteMonitor(req, res, next) {
+        async.waterfall(
+            [
+                function(next) {
+                    monitorsService.checkIfMonitorExists(req.params.monitorId, next);
+                },
+                function(monitor, next) {
+                    monitorsService.deleteMonitors(req.params.monitorId, next);
+                }
+            ],
+            function(err, results) {
+                if (err) {
+                    next(err);
+                } else {
+                    return res.status(200).send(results);
+                }
+            }
+        );
+    }
+};
diff --git a/server/app/routes/v1.0/routes_organizations.js b/server/app/routes/v1.0/routes_organizations.js
index 7e81e4253..d82e70bbe 100755
--- a/server/app/routes/v1.0/routes_organizations.js
+++ b/server/app/routes/v1.0/routes_organizations.js
@@ -1512,6 +1512,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                     instanceState: nodeAlive,
                                                     bootStrapStatus: 'waiting',
                                                     tagServer: req.params.tagServer,
+                                                    monitorId: req.params.monitorId,
                                                     runlist: [],
                                                     appUrls: appUrls,
                                                     users: [req.session.user.cn], //need to change this
@@ -1641,6 +1642,32 @@ module.exports.setRoutes = function(app, sessionVerification) {
                                                                 environment: envName,
                                                                 instanceOS: instance.hardware.os
                                                             };
+                                                            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));
+                                                                            runlist.push(sensuCookBook);
+                                                                            jsonAttributes['sensu-client'] = sensuAttributes;
+
+                                                                            bootstarpOption['runlist'] = runlist;
+                                                                            bootstarpOption['jsonAttributes'] = jsonAttributes;
+
+                                                                        }
                                                             deleteOptions = {
                                                                 privateKey: decryptedCredentials.pemFileLocation,
                                                                 username: decryptedCredentials.username,
diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js
index 0eafbe69a..e8d3ca2c5 100644
--- a/server/app/routes/v1.0/routes_provider.js
+++ b/server/app/routes/v1.0/routes_provider.js
@@ -1,23 +1,20 @@
 /*
  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 Controller which contains provider related all end points.
 /* TODO AWS EC2 client creation code replication to be reduced */
-
 var logger = require('_pr/logger')(module);
 var EC2 = require('_pr/lib/ec2.js');
 var cost = require('_pr/lib/dashboard.js');
@@ -34,3658 +31,3715 @@ var blueprints = require('_pr/model/dao/blueprints');
 var instances = require('_pr/model/classes/instance/instance');
 var masterUtil = require('_pr/lib/utils/masterUtil.js');
 var usersDao = require('_pr/model/users.js');
+var monitorsModel = require('_pr/model/monitors/monitors.js');
 var configmgmtDao = require('_pr/model/d4dmasters/configmgmt.js');
 var Cryptography = require('_pr/lib/utils/cryptography');
 var rc = require('node-rest-client').Client;
 var appConfig = require('_pr/config');
-var instanceService=require('_pr/services/instanceService');
+var instanceService = require('_pr/services/instanceService');
 var settingWizard = require('_pr/model/setting-wizard');
 var settingsService = require('_pr/services/settingsService');
 
-module.exports.setRoutes = function(app, sessionVerificationFunc) {
-
-
-	// Return AWS Provider respect to id.
-	app.get('/aws/providers/list', function(req, res) {
-
-		AWSProvider.getAWSProviders(function(err, providers) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			logger.debug("Provider list: ", JSON.stringify(providers));
-			if (providers) {
-				var providerList = [];
-				var count = 0;
-				for (var i = 0; i < providers.length; i++) {
-					(function(i) {
-
-						AWSKeyPair.getAWSKeyPairByProviderId(providers[i]._id, function(err, keyPair) {
-							count++;
-
-							if (keyPair) {
-								var dommyProvider = {
-									_id: providers[i]._id,
-									id: 9,
-									providerName: providers[i].providerName,
-									providerType: providers[i].providerType,
-									orgId: providers[i].orgId,
-									__v: providers[i].__v,
-									keyPairs: keyPair,
-									isDefault: providers[i].isDefault
-								};
-
-								var cryptoConfig = appConfig.cryptoSettings;
-								var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-
-								if (!providers[i].isDefault) {
-									var cryptoConfig = appConfig.cryptoSettings;
-									var cryptography = new Cryptography(cryptoConfig.algorithm,
-										cryptoConfig.password);
-
-									dommyProvider.accessKey = cryptography.decryptText(providers[i].accessKey,
-										cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
-									dommyProvider.secretKey = cryptography.decryptText(providers[i].secretKey,
-										cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
-								}
-
-								providerList.push(dommyProvider);
-								logger.debug("count: ", count);
-								if (count === providers.length) {
-									res.send(providerList);
-									return;
-								}
-							}
-
-						});
-					})(i);
-				}
-			} else {
-				res.send(404);
-			}
-		});
-	});
-
-	// Return AWS Provider respect to id.
-	app.get('/aws/providers/:providerId', function(req, res) {
-		logger.debug("Enter get() for /providers/%s", req.params.providerId);
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-		AWSProvider.getAWSProviderById(providerId, function(err, aProvider) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (aProvider) {
-				AWSKeyPair.getAWSKeyPairByProviderId(aProvider._id, function(err, keyPair) {
-					masterUtil.getOrgByRowId(aProvider.orgId[0], function(err, orgs) {
-						if (err) {
-							res.status(500).send("Not able to fetch org.");
-							return;
-						}
-						if (orgs.length > 0) {
-							if (keyPair.length > 0) {
-								var results = [];
-								var dummyProvider = {
-									_id: aProvider._id,
-									id: 9,
-									providerName: aProvider.providerName,
-									providerType: aProvider.providerType,
-									s3BucketName: aProvider.s3BucketName,
-									orgId: aProvider.orgId,
-									plannedCost:aProvider.plannedCost,
-									orgName: orgs[0].orgname,
-									__v: aProvider.__v,
-									keyPairs: keyPair,
-									isDefault: aProvider.isDefault
-								};
-								for(var i = 0; i < keyPair.length; i++){
-									var regionList = appConfig.aws.regions;
-									results.push(keyPair[i]);
-									for(var j = 0;j < regionList.length; j++){
-										if(regionList[j].region === keyPair[i].region){
-											dummyProvider.providerRegion = regionList[j];
-										}
-									}
-								}
-								if(keyPair.length === results.length){
-									res.send(dummyProvider);
-								}
-							}else{
-								var dummyProvider = {
-									_id: aProvider._id,
-									id: 9,
-									providerName: aProvider.providerName,
-									providerType: aProvider.providerType,
-									s3BucketName: aProvider.s3BucketName,
-									orgId: aProvider.orgId,
-									plannedCost:aProvider.plannedCost,
-									orgName: orgs[0].orgname,
-									__v: aProvider.__v,
-									isDefault: aProvider.isDefault
-								};
-								res.send(dummyProvider);
-							}
-						}
-					});
-				});
-			} else {
-				res.send(404);
-			}
-		});
-	});
-	
-	app.all("/aws/providers/*", sessionVerificationFunc);
-	var cryptoConfig = appConfig.cryptoSettings;
-	var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
-
-	//Create VMWare Provider
-	app.post('/vmware/providers', function(req, res) {
-		logger.debug("Enter post() for /vmware.providers.", typeof req.body.fileName);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var vmwareusername = req.body.vmwareusername;
-		var vmwarepassword = req.body.vmwarepassword;
-		var vmwarehost = req.body.vmwarehost;
-		var vmwaredc = req.body.vmwaredc;
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType;
-		var pemFileName = null;
-		if(req.files && req.files.azurepem)
-			pemFileName = req.files.azurepem.originalFilename;
-		var keyFileName = null;
-		if(req.files && req.files.azurekey)
-			keyFileName = req.files.azurekey.originalFilename;
-		var orgId = req.body.orgId;
-
-		if (typeof vmwareusername === 'undefined' || vmwareusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		if (typeof vmwarepassword === 'undefined' || vmwarepassword.length === 0) {
-			res.status(400).send("Please Enter Password.");
-			return;
-		}
-		if (typeof vmwarehost === 'undefined' || vmwarehost.length === 0) {
-			res.status(400).send("Please Enter a Host.");
-			return;
-		}
-		if (typeof vmwaredc === 'undefined' || vmwaredc.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400).send("Please Select Any Organization.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.status(400).send("You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-
-					var providerData = {
-						id: 9,
-						username: vmwareusername,
-						password: vmwarepassword,
-						host: vmwarehost,
-						providerName: providerName,
-						providerType: providerType,
-						dc: vmwaredc,
-						orgId: orgId
-					};
-					vmwareProvider.getvmwareProviderByName(providerData.providerName, providerData.orgId, function(err, prov) {
-						if (err) {
-							logger.error("Error while fetching vmware: ", err);
-							res.status(500).send("Error while fetching vmware");
-							return;
-						}
-						if (prov) {
-							logger.error("Provider name already exist: ");
-							res.status(409).send("Provider name already exist.");
-							return;
-						}
-						vmwareProvider.createNew(providerData, function(err, provider) {
-							if (err) {
-								logger.error("Failed to create Provider: ", err);
-								res.status(500).send("Failed to create Provider.");
-								return;
-							}
-							masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-								if (err) {
-									res.status(500).send("Not able to fetch org.");
-									return;
-								}
-								trackSettingWizard(providerData.orgId,function(err,data){
-									if (err) {
-										res.status(500).send("Not able to update wizards.");
-										return;
-									}
-									if (orgs.length > 0) {
-										var dommyProvider = {
-											_id: provider._id,
-											id: 9,
-											username: vmwareusername,
-											//password: vmwarepassword,
-											host: vmwarehost,
-											dc: vmwaredc,
-											providerName: provider.providerName,
-											providerType: provider.providerType,
-											orgId: orgs[0].rowid,
-											orgName: orgs[0].orgname,
-											__v: provider.__v,
-										};
-										res.send(dommyProvider);
-										return;
-									}
-								});
-							});
-
-							logger.debug("Exit post() for /providers");
-						});
-					});
-
-				} //end anuser
-			});
-		});
-
-	});
-
-	//get vmware providers
-	app.get('/vmware/providers', function(req, res) {
-		logger.debug("Enter get() for vmware/providers");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						vmwareProvider.getvmwareProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (providers != null) {
-								if (providers.length > 0) {
-									for (var i = 0; i < providers.length; i++) {
-										providers[i].password = undefined;
-									}
-									res.send(providers);
-									return;
-								}
-							} else {
-								res.send(200, []);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						vmwareProvider.getvmwareProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers === null) {
-								res.send(providersList);
-								return;
-							}
-							if (providers.length > 0) {
-								for (var i = 0; i < providers.length; i++) {
-									providers[i].password = undefined;
-								}
-								res.send(providers);
-								return;
-							} else {
-								res.send(providersList);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			}
-		});
-	});
-
-	//start: get azure provider by id
-	app.get('/vmware/providers/:providerId', function(req, res) {
-
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-		vmwareProvider.getvmwareProviderById(providerId, function(err, aProvider) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (aProvider) {
-				masterUtil.getOrgByRowId(aProvider.orgId[0], function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					aProvider.orgname = orgs[0].orgname;
-					if (orgs.length > 0) {
-						aProvider.password = undefined;
-						res.send(aProvider);
-						return;
-					}
-				});
-
-			} else {
-				res.send(404);
-				return;
-			}
-		});
-	}); //end: get azure provider by id
-
-	//start: removes azure provider
-	app.delete('/vmware/providers/:providerId', function(req, res) {
-		logger.debug("Enter delete for vmware/providers/%s", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-					vmwareProvider.getvmwareProviderById(providerId, function(err, aProvider) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						if (aProvider) {
-							VMImage.getImageByProviderId(providerId, function (err, anImage) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-								if (anImage.length > 0) {
-									res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
-									return;
-								}
-								logger.debug('Providerid: ', providerId);
-								blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (providers.length > 0) {
-										res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
-										return;
-									}
-									vmwareProvider.removevmwareProviderById(providerId, function (err, deleteCount) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (deleteCount) {
-											instanceService.removeInstancesByProviderId(providerId, function (err, data) {
-												if (err) {
-													logger.error(err);
-													res.status(500).send(errorResponses.db.error);
-													return;
-												} else {
-													settingsService.trackSettingWizard('provider',aProvider.orgId[0],function(err,results){
-														if(err){
-															logger.error(err);
-															res.status(500).send(errorResponses.db.error);
-															return;
-														}else{
-															logger.debug("Enter delete() for vmware/providers/%s", req.params.providerId);
-															res.send({
-																deleteCount: deleteCount
-															});
-														}
-													})
-												}
-											})
-										} else {
-											res.send(400);
-										}
-									});
-								});
-							});
-						}
-					});
-				}
-			});
-		}); //
-	});
-
-
-	app.post('/vmware/providers/:providerId/update', function(req, res) {
-		logger.debug("Enter post() for /providers/vmware/%s/update", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var vmwareusername = req.body.vmwareusername;
-		var vmwarepassword = req.body.vmwarepassword;
-		var vmwarehost = req.body.vmwarehost;
-		var vmwaredc = req.body.vmwaredc;
-		var providerName = req.body.providerName;
-		var orgId = req.body.orgId;
-
-		if (typeof vmwareusername === 'undefined' || vmwareusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		// if (typeof vmwarepassword === 'undefined' || vmwarepassword.length === 0) {
-		// 	res.status(400).send("Please Enter Password.");
-		// 	return;
-		// }
-		if (typeof vmwarehost === 'undefined' || vmwarehost.length === 0) {
-			res.status(400).send("Please Enter a Host.");
-			return;
-		}
-		if (typeof vmwaredc === 'undefined' || vmwaredc.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please Select Any Organization.");
-			return;
-		}
-
-
-		function updateDb(providerData) {
-			vmwareProvider.updatevmwareProviderById(req.params.providerId, providerData, function(err, updateCount) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				}
-				masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					if (orgs.length > 0) {
-						var dommyProvider = {
-							_id: req.params.providerId,
-							id: 9,
-							username: vmwareusername,
-							//password: vmwarepassword,
-							host: vmwarehost,
-							providerName: providerName,
-							dc: vmwaredc,
-							orgId: orgs[0].rowid,
-							orgName: orgs[0].orgname
-						};
-						res.send(dommyProvider);
-						return;
-					}
-				});
-			});
-		}
-
-
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-					if (vmwarepassword) {
-						var providerData = {
-							id: 9,
-							username: vmwareusername,
-							password: vmwarepassword,
-							host: vmwarehost,
-							providerName: providerName,
-							tenantid: vmwaredc,
-							orgId: orgId
-						};
-						logger.debug("provider data %s", JSON.stringify(providerData));
-						updateDb(providerData);
-					} else {
-						vmwareProvider.getvmwareProviderById(req.params.providerId, function(err, aProvider) {
-							if (err) {
-								res.status(500).send("Not able to fetch org.");
-								return;
-							}
-							var providerData = {
-								id: 9,
-								username: vmwareusername,
-								password: aProvider.password,
-								host: vmwarehost,
-								providerName: providerName,
-								tenantid: vmwaredc,
-								orgId: orgId
-							};
-							logger.debug("provider data %s", JSON.stringify(providerData));
-							updateDb(providerData);
-						});
-
-					}
-				}
-			});
-		});
-	});
-
-
-	app.post('/hppubliccloud/providers', function(req, res) {
-		logger.debug("Enter post() for /hppubliccloud.", typeof req.files.hppubliccloudinstancepem);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var hppubliccloudusername = req.body.openstackusername;
-		var hppubliccloudpassword = req.body.openstackpassword;
-		var hppubliccloudhost = req.body.openstackhost;
-		var hppubliccloudtenantid = req.body.openstacktenantid;
-		var hppubliccloudtenantname = req.body.openstacktenantname;
-		var hppubliccloudprojectname = req.body.openstackprojectname;
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType.toLowerCase();
-		var hppubliccloudkeyname = req.body.hppubliccloudkeyname;
-		var hppubliccloudregion = req.body.hppubliccloudregion;
-		var hpFileName = req.files.hpFileName.originalFilename;
-		var orgId = req.body.orgId;
-
-		var serviceendpoints = {
-			compute: req.body.openstackendpointcompute,
-			network: req.body.openstackendpointnetwork,
-			image: req.body.openstackendpointimage,
-			ec2: req.body.openstackendpointec2,
-			identity: req.body.openstackendpointidentity,
-		};
-
-		if (typeof hppubliccloudusername === 'undefined' || hppubliccloudusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		if (typeof hppubliccloudpassword === 'undefined' || hppubliccloudpassword.length === 0) {
-			res.status(400).send("Please Enter Password.");
-			return;
-		}
-		if (typeof hppubliccloudhost === 'undefined' || hppubliccloudhost.length === 0) {
-			res.status(400).send("Please Enter a Host.");
-			return;
-		}
-		if (typeof hppubliccloudtenantid === 'undefined' || hppubliccloudtenantid.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof hppubliccloudregion === 'undefined' || hppubliccloudregion.length === 0) {
-			res.status(400).send("Please Enter Region.");
-			return;
-		}
-		if (typeof hppubliccloudkeyname === 'undefined' || hppubliccloudkeyname.length === 0) {
-			res.status(400).send("Please Enter a Key name.");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please Select Any Organization.");
-			return;
-		}
-		if (typeof hppubliccloudtenantname === 'undefined' || hppubliccloudtenantname.length === 0) {
-			res.status(400).send("Please Enter Tenant Name.");
-			return;
-		}
-		if (typeof hppubliccloudprojectname === 'undefined' || hppubliccloudprojectname.length === 0) {
-			res.status(400).send("Please Enter Project Name.");
-			return;
-		}
-		if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
-			res.status(400).send("Please Enter Compute Endpoint Name.");
-			return;
-		}
-		if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
-			res.status(400).send("Please Enter Identity Endpoint Name.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				if (anUser) {
-					var providerData = {
-						id: 9,
-						username: hppubliccloudusername,
-						password: hppubliccloudpassword,
-						host: hppubliccloudhost,
-						providerName: providerName,
-						providerType: providerType,
-						tenantid: hppubliccloudtenantid,
-						tenantname: hppubliccloudtenantname,
-						projectname: hppubliccloudprojectname,
-						serviceendpoints: serviceendpoints,
-						region: hppubliccloudregion,
-						keyname: hppubliccloudkeyname,
-						hpFileName: hpFileName,
-						orgId: orgId
-					};
-					hppubliccloudProvider.gethppubliccloudProviderByName(providerData.providerName, providerData.orgId, function(err, prov) {
-						if (err) {
-							logger.error("err. ", err);
-							res.status(500).send("Error to fetch Provider: ", err);
-						}
-						if (prov) {
-							logger.debug("Provider name already exist");
-							res.status(409).send("Provider name already exist.");
-							return;
-						}
-						hppubliccloudProvider.createNew(req, providerData, function(err, provider) {
-							if (err) {
-								logger.error("Failed to create Provider: ", err);
-								res.status(500).send("Failed to create Provider.");
-								return;
-							}
-
-							masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-								if (err) {
-									res.status(500).send("Not able to fetch org.");
-									return;
-								}
-								if (orgs.length > 0) {
-
-									var dommyProvider = {
-										_id: provider._id,
-										id: 9,
-										username: hppubliccloudusername,
-										password: hppubliccloudpassword,
-										host: hppubliccloudhost,
-										providerName: provider.providerName,
-										providerType: provider.providerType,
-										hpFileName: provider.hpFileName,
-										orgId: orgs[0].rowid,
-										orgName: orgs[0].orgname,
-										tenantid: hppubliccloudtenantid,
-										__v: provider.__v,
-
-									};
-									res.send(dommyProvider);
-									return;
-
-								}
-							});
-
-							logger.debug("Exit post() for /providers");
-						});
-					});
-
-				} //end anuser
-			});
-		});
-
-	});
-
-	app.get('/hppubliccloud/providers', function(req, res) {
-		logger.debug("Enter get() for /hppubliccloud/providers");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (providers != null) {
-								for (var i = 0; i < providers.length; i++) {
-									providers[i]['providerType'] = providers[i]['providerType'].toUpperCase();
-								}
-								logger.debug("providers>>> ", JSON.stringify(providers));
-								if (providers.length > 0) {
-									res.send(providers);
-									return;
-								}
-							} else {
-								res.send(200, []);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers === null) {
-								res.send(providersList);
-								return;
-							}
-							if (providers.length > 0) {
-								res.send(providers);
-								return;
-							} else {
-								res.send(providersList);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			}
-		});
-	});
-
-	app.get('/hppubliccloud/providers/:providerId', function(req, res) {
-		logger.debug("Enter get() for /hppubliccloud/providers//%s", req.params.providerId);
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-		hppubliccloudProvider.gethppubliccloudProviderById(providerId, function(err, aProvider) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (aProvider) {
-
-				masterUtil.getOrgByRowId(aProvider.orgId[0], function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					aProvider.orgname = orgs[0].orgname;
-
-					if (orgs.length > 0) {
-						res.send(aProvider);
-						return;
-					}
-				});
-
-			} else {
-				res.status(404).send("Provider not found.");
-				return;
-			}
-		});
-	});
-
-
-	app.post('/hppubliccloud/providers/:providerId/update', function(req, res) {
-		logger.debug("Enter post() for /providers/hppubliccloud/%s/update", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var hppubliccloudusername = req.body.openstackusername;
-		var hppubliccloudpassword = req.body.openstackpassword;
-		var hppubliccloudhost = req.body.openstackhost;
-		var hppubliccloudtenantid = req.body.openstacktenantid;
-		var hppubliccloudtenantname = req.body.openstacktenantname;
-		var hppubliccloudprojectname = req.body.openstackprojectname;
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType.toLowerCase();
-		var hppubliccloudkeyname = req.body.hppubliccloudkeyname;
-		var hpFileName = req.files.hpFileName.originalFilename;
-		var hppubliccloudregion = req.body.hppubliccloudregion;
-		var providerId = req.params.providerId;
-
-		var serviceendpoints = {
-			compute: req.body.openstackendpointcompute,
-			network: req.body.openstackendpointnetwork,
-			image: req.body.openstackendpointimage,
-			ec2: req.body.openstackendpointec2,
-			identity: req.body.openstackendpointidentity,
-
-		};
-
-		var orgId = req.body.orgId;
-		if (typeof hppubliccloudusername === 'undefined' || hppubliccloudusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		if (typeof hppubliccloudpassword === 'undefined' || hppubliccloudpassword.length === 0) {
-			res.status(400).send("Please Enter Password.");
-			return;
-		}
-		if (typeof hppubliccloudhost === 'undefined' || hppubliccloudhost.length === 0) {
-			res.status(400).send("Please Enter a Host.");
-			return;
-		}
-		if (typeof hppubliccloudtenantid === 'undefined' || hppubliccloudtenantid.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof hppubliccloudregion === 'undefined' || hppubliccloudregion.length === 0) {
-			res.status(400).send("Please Enter Region.");
-			return;
-		}
-		if (typeof hppubliccloudkeyname === 'undefined' || hppubliccloudkeyname.length === 0) {
-			res.status(400).send("Please Enter a Key name.");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof hppubliccloudtenantname === 'undefined' || hppubliccloudtenantname.length === 0) {
-			res.status(400).send("Please Enter Tenant Name.");
-			return;
-		}
-		if (typeof hppubliccloudprojectname === 'undefined' || hppubliccloudprojectname.length === 0) {
-			res.status(400).send("Please Enter Project Name.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please Select Any Organization.");
-			return;
-		}
-		if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
-			res.status(400).send("Please Enter Compute Endpoint Name.");
-			return;
-		}
-		if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
-			res.status(400).send("Please Enter Identity Endpoint Name.");
-			return;
-		}
-
-
-		var providerData = {
-			id: 9,
-			username: hppubliccloudusername,
-			password: hppubliccloudpassword,
-			host: hppubliccloudhost,
-			providerName: providerName,
-			providerType: providerType,
-			tenantid: hppubliccloudtenantid,
-			tenantname: hppubliccloudtenantname,
-			projectname: hppubliccloudprojectname,
-			serviceendpoints: serviceendpoints,
-			region: hppubliccloudregion,
-			hpFileName: hpFileName,
-			keyname: hppubliccloudkeyname,
-			orgId: orgId
-		};
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-					hppubliccloudProvider.updatehppubliccloudProviderById(providerId, providerData, function(err, updateCount) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-							if (err) {
-								res.status(500).send("Not able to fetch org.");
-								return;
-							}
-							if (orgs.length > 0) {
-								var dommyProvider = {
-									_id: providerId,
-									id: 9,
-									username: hppubliccloudusername,
-									password: hppubliccloudpassword,
-									host: hppubliccloudhost,
-									providerName: providerData.providerName,
-									providerType: providerData.providerType,
-									orgId: orgs[0].rowid,
-									orgName: orgs[0].orgname
-								};
-								res.send(dommyProvider);
-								return;
-							}
-						});
-					});
-
-				}
-			});
-		});
-	});
-
-	//start: removes azure provider
-	app.delete('/hppubliccloud/providers/:providerId', function(req, res) {
-		logger.debug("Enter delete() for hppubliccloud/providers/%s", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var providerId = req.params.providerId.trim();
-
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				if (anUser) {
-					hppubliccloudProvider.gethppubliccloudProviderById(providerId, function(err, aProvider) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						if (aProvider) {
-							VMImage.getImageByProviderId(providerId, function (err, anImage) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-								if (anImage) {
-									res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
-									return;
-								}
-								blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (providers.length > 0) {
-										res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
-										return;
-									}
-									hppubliccloudProvider.removehppubliccloudProviderById(providerId, function (err, deleteCount) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (deleteCount) {
-											instanceService.removeInstancesByProviderId(providerId, function (err, data) {
-												if (err) {
-													logger.error(err);
-													res.status(500).send(errorResponses.db.error);
-													return;
-												} else {
-													settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
-														if (err) {
-															logger.error(err);
-															res.status(500).send(errorResponses.db.error);
-															return;
-														} else {
-															logger.debug("Enter delete() for hppubliccloud/providers/%s", req.params.providerId);
-															res.send({
-																deleteCount: deleteCount
-															});
-														}
-													})
-												}
-											})
-										} else {
-											res.send(400);
-										}
-									});
-								});
-							});
-						}
-					});
-				}
-			});
-		});
-	});
-
-
-	//Creates Azure Provider
-	app.post('/azure/providers', function(req, res) {
-
-		logger.debug("Enter post() for Azure.");
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var azureSubscriptionId = req.body.azureSubscriptionId;
-		var azureClientId = req.body.azureClientId;
-		var azureClientSecret = req.body.azureClientSecret;
-		var azureTenantId = req.body.azureTenantId;
-
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType;
-		var pemFileName = null;
-		if(req.files && req.files.azurepem)
-			pemFileName = req.files.azurepem.originalFilename;
-		var keyFileName = null;
-		if(req.files && req.files.azurekey)
-			keyFileName = req.files.azurekey.originalFilename;
-		var orgId = req.body.orgId;
-
-		if (typeof azureSubscriptionId === 'undefined' || azureSubscriptionId.length === 0) {
-			res.status(400).send("Please Enter SubscriptionId.");
-			return;
-		}
-
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof pemFileName === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please upload azure subscription pem file");
-			return;
-		}
-		if (typeof keyFileName === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please upload azure subscription key file");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please Select Any Organization.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-
-					var providerData = {
-						id: 9,
-						subscriptionId: azureSubscriptionId,
-						providerName: providerName,
-						providerType: providerType,
-						pemFileName: pemFileName,
-						keyFileName: keyFileName,
-						orgId: orgId,
-						clientId: azureClientId,
-						clientSecret: azureClientSecret,
-						tenant: azureTenantId
-					};
-					azurecloudProvider.getAzureCloudProviderByName(providerData.providerName, providerData.orgId, function(err, prov) {
-						if (err) {
-							logger.debug("Failed to fetch Azure provider. ", err);
-							res.status(500).send("Failed to fetch Azure provider.");
-							return;
-						}
-						if (prov) {
-							res.status(409).send("Provider name already exist.");
-							return;
-						}
-						azurecloudProvider.createNew(req, providerData, function(err, provider) {
-							if (err) {
-								logger.debug("Failed to create Provider.", err);
-								res.status(500).send("Failed to create Provider.");
-								return;
-							}
-
-							masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-								if (err) {
-									res.status(500).send("Not able to fetch org.");
-									return;
-								}
-								trackSettingWizard(providerData.orgId,function(err,data) {
-									if (err) {
-										res.status(500).send("Not able to update wizards.");
-										return;
-									}
-									if (orgs.length > 0) {
-										var dommyProvider = {
-											_id: provider._id,
-											id: 9,
-											subscriptionId: azureSubscriptionId,
-											providerName: provider.providerName,
-											providerType: provider.providerType,
-											pemFileName: pemFileName,
-											keyFileName: keyFileName,
-											orgId: orgs[0].rowid,
-											orgName: orgs[0].orgname,
-											__v: provider.__v,
-
-										};
-										res.send(dommyProvider);
-										return;
-									}
-								});
-							});
-
-							logger.debug("Exit post() for /providers");
-						});
-					});
-
-				} //end anuser
-			});
-		});
-
-	}); //ends :create Azure provider
-
-	//starts: get azure providers
-	app.get('/azure/providers', function(req, res) {
-		logger.debug("Enter get() for /azure/providers");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (providers != null) {
-								for (var i = 0; i < providers.length; i++) {
-									providers[i]['providerType'] = providers[i]['providerType'].toUpperCase();
-								}
-								if (providers.length > 0) {
-									for (var i = 0; i < providers.length; i++) {
-										providers[i].clientId = undefined;
-										providers[i].clientSecret = undefined;
-										providers[i].tenant = undefined;
-									}
-									res.send(providers);
-									return;
-								}
-							} else {
-								res.status(200).send([]);
-								return;
-							}
-						});
-					} else {
-						res.status(200).send([]);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers === null) {
-								res.send(providersList);
-								return;
-							}
-							if (providers.length > 0) {
-								for (var i = 0; i < providers.length; i++) {
-									providers[i].clientId = undefined;
-									providers[i].clientSecret = undefined;
-									providers[i].tenant = undefined;
-								}
-								res.send(providers);
-								return;
-							} else {
-								res.send(providersList);
-								return;
-							}
-						});
-					} else {
-						res.status(200).send([]);
-						return;
-					}
-				});
-			}
-		});
-	}); //end: get azure providers
-
-	//start: get azure provider by id
-	app.get('/azure/providers/:providerId', function(req, res) {
-		logger.debug("Enter get() for /azure/providers//%s", req.params.providerId);
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-		azurecloudProvider.getAzureCloudProviderById(providerId, function(err, aProvider) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (aProvider) {
-				logger.debug(aProvider);
-				aProvider = JSON.parse(aProvider)
-				logger.debug(aProvider.orgId);
-				masterUtil.getOrgByRowId(aProvider.orgId[0], function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					aProvider.orgname = orgs[0].orgname;
-
-					if (orgs.length > 0) {
-
-						aProvider.clientId = undefined;
-						aProvider.clientSecret = undefined;
-						aProvider.tenant = undefined;
-						res.send(aProvider);
-						return;
-					}
-				});
-
-			} else {
-				res.status(500).send("Not Found Provider.");
-			}
-		});
-	}); //end: get azure provider by id
-
-	//start: update azure provider
-	app.post('/azure/providers/:providerId/update', function(req, res) {
-		logger.debug("Enter post() for /providers/azure/%s/update", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-
-		var azureSubscriptionId = req.body.azureSubscriptionId;
-		var azureClientId = req.body.azureClientId;
-		var azureClientSecret = req.body.azureClientSecret;
-		var azureTenantId = req.body.azureTenantId;
-		var providerName = req.body.providerName;
-		var providerId = req.params.providerId;
-		var orgId = req.body.orgId;
-
-		if (typeof azureSubscriptionId === 'undefined' || azureSubscriptionId.length === 0) {
-			res.status(400).send("Please Enter Subscription Id.");
-			return;
-		}
-
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-
-		function updateDb(providerData) {
-			azurecloudProvider.updateAzureCloudProviderById(providerId, providerData, function(err, updateCount) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				}
-				masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					if (orgs.length > 0) {
-						var dommyProvider = {
-							_id: providerId,
-							id: 9,
-							subscriptionId: azureSubscriptionId,
-							providerName: providerData.providerName,
-							orgId: orgs[0].rowid,
-							orgName: orgs[0].orgname
-						};
-						res.send(dommyProvider);
-						return;
-					}
-				});
-			});
-		}
-
-
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-
-					if (azureClientId && azureClientSecret && azureTenantId) {
-						var providerData = {
-							id: 9,
-							azureSubscriptionId: azureSubscriptionId,
-							providerName: providerName,
-							orgId: orgId,
-							clientId: azureClientId,
-							clientSecret: azureClientSecret,
-							tenant: azureTenantId
-						};
-						updateDb(providerData);
-					} else {
-						azurecloudProvider.getAzureCloudProviderById(providerId, function(err, aProvider) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							aProvider = JSON.parse(aProvider);
-
-							var providerData = {
-								id: 9,
-								azureSubscriptionId: azureSubscriptionId,
-								providerName: providerName,
-								orgId: orgId,
-								clientId: azureClientId || aProvider.clientId,
-								clientSecret: azureClientSecret || aProvider.clientSecret,
-								tenant: azureTenantId || aProvider.tenant
-							};
-							updateDb(providerData);
-
-						});
-
-					}
-				} else {
-					res.status(403).send('User does not exist');
-				}
-			});
-		});
-	}); //end: update azure provider
-
-	//start: removes azure provider
-	app.delete('/azure/providers/:providerId', function(req, res) {
-		logger.debug("Enter delete() for /providers/%s", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.status(401).send("You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-					azurecloudProvider.getAzureCloudProviderById(providerId, function(err, aProvider) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						if (aProvider) {
-							VMImage.getImageByProviderId(providerId, function (err, anImage) {
-								if (err) {
-									logger.error(errorResponses.db.error);
-									res.status(500).send("Failed to get Image.");
-									return;
-								}
-								if (anImage.length > 0) {
-									res.status(403).send("Provider already used by Some Images.To delete provider please delete respective Images first.");
-									return;
-								}
-								blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (providers.length > 0) {
-										res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
-										return;
-									}
-									azurecloudProvider.removeAzureCloudProviderById(providerId, function (err, deleteCount) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send("Failed to get Provider.");
-											return;
-										}
-										if (deleteCount) {
-											instanceService.removeInstancesByProviderId(providerId, function (err, data) {
-												if (err) {
-													logger.error(err);
-													res.status(500).send(errorResponses.db.error);
-													return;
-												} else {
-													settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
-														if (err) {
-															logger.error(err);
-															res.status(500).send(errorResponses.db.error);
-															return;
-														} else {
-															logger.debug("Enter delete() for azure/providers/%s", req.params.providerId);
-															res.send({
-																deleteCount: deleteCount
-															});
-														}
-													})
-												}
-											})
-										} else {
-											res.send(400);
-										}
-									});
-								});
-							});
-						}
-					});
-				}
-			});
-		}); //
-	});
-
-	//Create Openstack provider
-	app.post('/openstack/providers', function(req, res) {
-		logger.debug("Enter post() for /providers.", typeof req.body.fileName);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var openstackusername = req.body.openstackusername;
-		var openstackpassword = req.body.openstackpassword;
-		var openstackhost = req.body.openstackhost;
-		var openstacktenantid = req.body.openstacktenantid;
-		var openstacktenantname = req.body.openstacktenantname;
-		var openstackprojectname = req.body.openstackprojectname;
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType;
-		var openstackkeyname = req.body.openstackkeyname;
-		var pemFileName = req.files.openstackinstancepem.originalFilename;
-		var orgId = req.body.orgId;
-
-		var serviceendpoints = {
-			compute: req.body.openstackendpointcompute,
-			network: req.body.openstackendpointnetwork,
-			image: req.body.openstackendpointimage,
-			ec2: req.body.openstackendpointec2,
-			identity: req.body.openstackendpointidentity,
-		};
-
-		if (typeof openstackusername === 'undefined' || openstackusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		if (typeof openstackpassword === 'undefined' || openstackpassword.length === 0) {
-			res.status(400).send("Please Enter Password.");
-			return;
-		}
-		if (typeof openstackhost === 'undefined' || openstackhost.length === 0) {
-			res.status(400).send("Please Enter a Host.");
-			return;
-		}
-		if (typeof openstacktenantid === 'undefined' || openstacktenantid.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof pemFileName === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please upload openstack subscription pem file");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400).send("Please Select Any Organization.");
-			return;
-		}
-		if (typeof openstacktenantname === 'undefined' || openstacktenantname.length === 0) {
-			res.status(400).send("Please Enter Tenant Name.");
-			return;
-		}
-		if (typeof openstackprojectname === 'undefined' || openstackprojectname.length === 0) {
-			res.status(400).send("Please Enter Project Name.");
-			return;
-		}
-		if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
-			res.status(400).send("Please Enter Compute Endpoint Name.");
-			return;
-		}
-		if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
-			res.status(400).send("Please Enter Identity Endpoint Name.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.status(400).send("You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-					return;
-				}
-				logger.debug("LoggedIn User: ", JSON.stringify(anUser));
-				if (anUser) {
-
-					var providerData = {
-						id: 9,
-						username: openstackusername,
-						password: openstackpassword,
-						host: openstackhost,
-						providerName: providerName,
-						providerType: providerType,
-						tenantid: openstacktenantid,
-						tenantname: openstacktenantname,
-						projectname: openstackprojectname,
-						serviceendpoints: serviceendpoints,
-						keyname: openstackkeyname,
-						pemFileName: pemFileName,
-						orgId: orgId
-					};
-					openstackProvider.getopenstackProviderByName(providerData.providerName, providerData.orgId, function(err, prov) {
-						if (err) {
-							logger.debug("err.....", err);
-						}
-						if (prov) {
-							logger.debug("err.....", err);
-							res.status(409).send("Provider name already exist.");
-							return;
-						}
-						openstackProvider.createNew(req, providerData, function(err, provider) {
-							if (err) {
-								logger.debug("err.....", err);
-								res.status(500).send("Failed to create Provider.");
-								return;
-							}
-
-							masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-								if (err) {
-									res.status(500).send("Not able to fetch org.");
-									return;
-								}
-								trackSettingWizard(providerData.orgId,function(err,data) {
-									if (err) {
-										res.status(500).send("Not able to update wizards.");
-										return;
-									}
-									if (orgs.length > 0) {
-										var dommyProvider = {
-											_id: provider._id,
-											id: 9,
-											username: openstackusername,
-											//password: openstackpassword,
-											host: openstackhost,
-											providerName: provider.providerName,
-											providerType: provider.providerType,
-											orgId: orgs[0].rowid,
-											orgName: orgs[0].orgname,
-											pemFileName: pemFileName,
-											tenantid: openstacktenantid,
-											__v: provider.__v,
-
-										};
-										res.send(dommyProvider);
-										return;
-									}
-								});
-							});
-							logger.debug("Exit post() for /providers");
-						});
-					});
-
-				} //end anuser
-			});
-		});
-
-	});
-
-	// Return list of all available AWS Providers.
-	app.get('/openstack/providers', function(req, res) {
-		logger.debug("Enter get() for /providers");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						openstackProvider.getopenstackProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (providers != null) {
-								if (providers.length > 0) {
-									for (var i = 0; i < providers.length; i++) {
-										providers[i].password = undefined;
-									}
-									res.send(providers);
-									return;
-								}
-							} else {
-								res.status(200).send([]);
-								return;
-							}
-						});
-					} else {
-						res.status(500).send([]);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						openstackProvider.getopenstackProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers === null) {
-								res.send(providersList);
-								return;
-							}
-							if (providers.length > 0) {
-								for (var i = 0; i < providers.length; i++) {
-									providers[i].password = undefined;
-								}
-								res.send(providers);
-								return;
-							} else {
-								res.send(providersList);
-								return;
-							}
-						});
-					} else {
-						res.status(200).send([]);
-						return;
-					}
-				});
-			}
-		});
-	});
-
-	// Return AWS Provider respect to id.
-	app.get('/openstack/providers/:providerId', function(req, res) {
-		logger.debug("Enter get() for /providers/%s", req.params.providerId);
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-		openstackProvider.getopenstackProviderById(providerId, function(err, aProvider) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (aProvider) {
-
-				masterUtil.getOrgByRowId(aProvider.orgId[0], function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					aProvider.orgname = orgs[0].orgname;
-
-					if (orgs.length > 0) {
-						aProvider.password = undefined;
-						res.send(aProvider);
-						return;
-					}
-				});
-
-			} else {
-				res.status(404).send("Provider not found.");
-			}
-		});
-	});
-
-	// Update a particular AWS Provider
-	app.post('/openstack/providers/:providerId/update', function(req, res) {
-		logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'modify';
-		var openstackusername = req.body.openstackusername;
-		var openstackpassword = req.body.openstackpassword;
-		var openstackhost = req.body.openstackhost;
-		var openstacktenantid = req.body.openstacktenantid;
-		var openstacktenantname = req.body.openstacktenantname;
-		var openstackprojectname = req.body.openstackprojectname;
-		var providerName = req.body.providerName.trim();
-		var providerId = req.params.providerId.trim();
-		var openstackkeyname = req.body.openstackkeyname;
-		var orgId = req.body.orgId;
-		var providerId = req.params.providerId;
-
-		var serviceendpoints = {
-			compute: req.body.openstackendpointcompute,
-			network: req.body.openstackendpointnetwork,
-			image: req.body.openstackendpointimage,
-			ec2: req.body.openstackendpointec2,
-			identity: req.body.openstackendpointidentity
-
-		};
-
-		if (typeof openstackusername === 'undefined' || openstackusername.length === 0) {
-			res.status(400).send("Please Enter Username.");
-			return;
-		}
-		// if (typeof openstackpassword === 'undefined' || openstackpassword.length === 0) {
-		// 	res.status(400).send("Please Enter Password.");
-		// 	return;
-		// }
-		if (typeof openstackhost === 'undefined' || openstackhost.length === 0) {
-			res.status(400).send("Please Enter a Host");
-			return;
-		}
-		if (typeof openstacktenantid === 'undefined' || openstacktenantid.length === 0) {
-			res.status(400).send("Please Enter a Tenant ID");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof openstacktenantname === 'undefined' || openstacktenantname.length === 0) {
-			res.status(400).send("Please Enter Tenant Name.");
-			return;
-		}
-		if (typeof openstackprojectname === 'undefined' || openstackprojectname.length === 0) {
-			res.status(400).send("Please Enter Project Name.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400).send("Please Select Any Organization.");
-			return;
-		}
-		if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
-			res.status(400).send("Please Enter Compute Endpoint Name.");
-			return;
-		}
-		if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
-			res.status(400).send("Please Enter Identity Endpoint Name.");
-			return;
-		}
-
-		function updateDB(providerData) {
-			openstackProvider.updateopenstackProviderById(providerId, providerData, function(err, updateCount) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				}
-				masterUtil.getOrgByRowId(providerData.orgId, function(err, orgs) {
-					if (err) {
-						res.status(500).send("Not able to fetch org.");
-						return;
-					}
-					if (orgs.length > 0) {
-						var dommyProvider = {
-							_id: providerId,
-							id: 9,
-							username: openstackusername,
-							//password: openstackpassword,
-							host: openstackhost,
-							providerName: providerData.providerName,
-							orgId: orgs[0].rowid,
-							orgName: orgs[0].orgname
-						};
-						res.send(dommyProvider);
-						return;
-					}
-				});
-			});
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.status(401).send("You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-
-					logger.debug("Able to get AWS Keypairs. %s", JSON.stringify(data));
-
-					if (openstackpassword) {
-						var providerData = {
-							id: 9,
-							username: openstackusername,
-							password: openstackpassword,
-							host: openstackhost,
-							tenantid: openstacktenantid,
-							tenantname: openstacktenantname,
-							projectname: openstackprojectname,
-							providerName: providerName,
-							serviceendpoints: serviceendpoints,
-							keyname: openstackkeyname,
-							orgId: orgId
-						};
-						updateDB(providerData);
-					} else {
-
-						openstackProvider.getopenstackProviderById(providerId, function(err, aProvider) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (aProvider) {
-								var providerData = {
-									id: 9,
-									username: openstackusername,
-									password: aProvider.password,
-									host: openstackhost,
-									tenantid: openstacktenantid,
-									tenantname: openstacktenantname,
-									projectname: openstackprojectname,
-									providerName: providerName,
-									serviceendpoints: serviceendpoints,
-									keyname: openstackkeyname,
-									orgId: orgId
-								};
-								updateDB(providerData);
-
-							} else {
-								res.status(404).send("Provider not found");
-							}
-						});
-
-
-					}
-				} else {
-					res.status(403).send("Forbidden");
-				}
-			});
-		});
-	});
-
-	// Delete a particular AWS Provider.
-	app.delete('/openstack/providers/:providerId', function(req, res) {
-		logger.debug("Enter delete() for /openstack/providers/%s", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var providerId = req.params.providerId.trim();
-
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-					openstackProvider.getopenstackProviderById(providerId, function (err, aProvider) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							if (aProvider) {
-								VMImage.getImageByProviderId(providerId, function (err, anImage) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (anImage.length) {
-										res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
-										return;
-									}
-									blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (providers.length > 0) {
-											res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
-											return;
-										}
-										openstackProvider.removeopenstackProviderById(providerId, function (err, deleteCount) {
-											if (err) {
-												logger.error(err);
-												res.status(500).send(errorResponses.db.error);
-												return;
-											}
-											if (deleteCount) {
-												instanceService.removeInstancesByProviderId(providerId, function (err, data) {
-													if (err) {
-														logger.error(err);
-														res.status(500).send(errorResponses.db.error);
-														return;
-													} else {
-														settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
-															if (err) {
-																logger.error(err);
-																res.status(500).send(errorResponses.db.error);
-																return;
-															} else {
-																logger.debug("Enter delete() for openStack/providers/%s", req.params.providerId);
-																res.send({
-																	deleteCount: deleteCount
-																});
-															}
-														})
-													}
-												})
-											} else {
-												res.send(400);
-												return;
-											}
-										});
-									});
-								});
-							}
-						});
-				}
-			});
-		});
-	});
-
-
-	// Create AWS Provider.
-	// TODO Use async to reduce callbacks
-	app.post('/aws/providers', function(req, res) {
-		logger.debug("Enter post() for /providers.", typeof req.body.fileName);
-		logger.debug("Req Body for providers ", JSON.stringify(req.body));
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'create';
-		var accessKey = req.body.accessKey;
-		var secretKey = req.body.secretKey;
-		var providerName = req.body.providerName;
-		var providerType = req.body.providerType;
-		var orgId = req.body.orgId;
-		var s3BucketName=req.body.s3BucketName;
-		var plannedCost=req.body.plannedCost;
-		if(plannedCost === null || plannedCost ===''){
-			plannedCost=0.0;
-		}
-		var isDefault = (req.body.isDefault === 'true') ? true : false;
-		var hasDefaultProvider = false;
-
-		if ((typeof accessKey === 'undefined' || accessKey.length === 0) && !isDefault) {
-			res.status(400).send("Please Enter AccessKey.");
-			return;
-		}
-		if ((typeof secretKey === 'undefined' || secretKey.length === 0) && !isDefault) {
-			res.status(400).send("Please Enter SecretKey.");
-			return;
-		}
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("Please Enter Name.");
-			return;
-		}
-		if (typeof providerType === 'undefined' || providerType.length === 0) {
-			res.status(400).send("Please Enter ProviderType.");
-			return;
-		}
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(400);
-			res.send("Please Select Any Organization.");
-			return;
-		}
-		AWSProvider.hasDefault(orgId, function (err, result) {
-			if (err) {
-				logger.debug("Error trying to get default user");
-				res.status(500).send("Internal error.");
-				return;
-			} else if (result && isDefault) {
-				logger.debug("Default user already exists");
-				res.status(400).send("Cannot add multiple providers without access credentials for the same organization");
-				return;
-			} else {
-				logger.debug("Adding provider");
-
-				var region;
-				if (typeof req.body.region === 'string') {
-					logger.debug("inside single region: ", req.body.region);
-					region = req.body.region;
-				} else {
-					region = req.body.region[0];
-				}
-				logger.debug("Final Region:  ", region);
-
-				var providerData = {
-					id: 9,
-					providerName: providerName,
-					providerType: providerType,
-					orgId: orgId,
-					isDefault: isDefault,
-					s3BucketName:s3BucketName,
-					plannedCost:plannedCost
-				};
-				var ec2;
-				if (isDefault == true) {
-					ec2 = new EC2({
-						"isDefault": true,
-						"region": region
-					});
-				} else {
-					ec2 = new EC2({
-						"access_key": accessKey,
-						"secret_key": secretKey,
-						"region": region
-					});
-
-					providerData.accessKey = cryptography.encryptText(accessKey, cryptoConfig.encryptionEncoding,
-						cryptoConfig.decryptionEncoding);
-					providerData.secretKey = cryptography.encryptText(secretKey, cryptoConfig.encryptionEncoding,
-						cryptoConfig.decryptionEncoding);
-				}
-
-				usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset,
-					function (err, data) {
-						if (!err) {
-							if (data == false) {
-								logger.debug('No permission to ' + permissionto + ' on ' + category);
-								res.send(401, "You don't have permission to perform this operation.");
-								return;
-							}
-						} else {
-							logger.error("Hit and error in haspermission:", err);
-							res.send(500);
-							return;
-						}
-
-						masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
-							if (err) {
-								res.status(500).send("Failed to fetch User.");
-								return;
-							}
-							if (anUser) {
-								ec2.describeKeyPairs(function (err, data) {
-									if(err && isDefault) {
-										logger.debug("Unable to get AWS Keypairs");
-										res.status(500).send("Not able to get catalyst instance metadata.");
-										return;
-									} else if (err) {
-										logger.debug("Unable to get AWS Keypairs");
-										res.status(500).send("Invalid AccessKey or SecretKey.");
-										return;
-									}  else {
-										logger.debug("Able to get AWS Keypairs. %s", JSON.stringify(data));
-										AWSProvider.getAWSProviderByName(providerData.providerName, providerData.orgId,
-											function (err, prov) {
-												if (err) {
-													logger.error("err. ", err);
-												}
-												if (prov) {
-													logger.debug("getAWSProviderByName: ", JSON.stringify(prov));
-													res.status(409).send("Provider name already exist.");
-													return;
-												}
-												AWSProvider.createNew(providerData, function (err, provider) {
-													if (err) {
-														logger.error("err. ", err);
-														res.status(500).send("Failed to create Provider.");
-														return;
-													}
-													AWSKeyPair.createNew(req, provider._id, function (err, keyPair) {
-														masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
-															if (err) {
-																res.status(500).send("Not able to fetch org.");
-																return;
-															}
-															trackSettingWizard(providerData.orgId,function(err,data) {
-																if (err) {
-																	res.status(500).send("Not able to update wizards.");
-																	return;
-																}
-																if (orgs.length > 0) {
-																	if (keyPair) {
-																		var dommyProvider = {
-																			_id: provider._id,
-																			id: 9,
-																			//accessKey: provider.accessKey,
-																			//secretKey: provider.secretKey,
-																			providerName: provider.providerName,
-																			providerType: provider.providerType,
-																			s3BucketName: provider.s3BucketName,
-																			orgId: orgs[0].rowid,
-																			orgName: orgs[0].orgname,
-																			plannedCost: provider.plannedCost,
-																			__v: provider.__v,
-																			keyPairs: keyPair
-																		};
-																		res.send(dommyProvider);
-																		return;
-																	}
-																}
-															});
-														})
-													});
-													logger.debug("Exit post() for /providers");
-												});
-											});
-									}
-								});
-							}
-						});
-					});
-			}
-		});
-	});
-
-	// Return list of all available AWS Providers.
-	app.get('/aws/providers', function(req, res) {
-		logger.debug("Enter get() for /providers");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						AWSProvider.getAWSProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers && providers.length > 0) {
-								for (var i = 0; i < providers.length; i++) {
-
-									providersList.push(providers[i]);
-									if (providers.length === providersList.length) {
-										res.send(providersList);
-										return;
-									}
-
-									/*var keys = [];
-									 keys.push(providers[i].accessKey);
-									 keys.push(providers[i].secretKey);
-									 cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-									 cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-									 if (err) {
-									 res.status(500).send("Failed to decrypt accessKey or secretKey");
-									 return;
-									 }
-									 providers[i].accessKey = decryptedKeys[0];
-									 providers[i].secretKey = decryptedKeys[1];
-
-									 });*/
-								}
-							} else {
-								res.send(200, []);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						AWSProvider.getAWSProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = [];
-							if (providers === null) {
-								res.send(providersList);
-								return;
-							}
-							if (providers.length > 0) {
-								for (var i = 0; i < providers.length; i++) {
-
-									providersList.push(providers[i]);
-									if (providers.length === providersList.length) {
-										res.send(providersList);
-										return;
-									}
-									/*var keys = [];
-									 keys.push(providers[i].accessKey);
-									 keys.push(providers[i].secretKey);
-									 cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-									 cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-									 if (err) {
-									 res.sned(500, "Failed to decrypt accessKey or secretKey");
-									 return;
-									 }
-									 //providers[i].accessKey = decryptedKeys[0];
-									 //providers[i].secretKey = decryptedKeys[1];
-									 providersList.push(providers[i]);
-									 if (providers.length === providersList.length) {
-									 res.send(providersList);
-									 return;
-									 }
-									 });*/
-								}
-							} else {
-								res.send(providersList);
-								return;
-							}
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			}
-		});
-	});
-
-	// Update a particular AWS Provider
-	app.post('/aws/providers/:providerId/update', function(req, res) {
-		logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
-		logger.debug("Req Body for providers ", JSON.stringify(req.body));
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'modify';
-		if (req.body.accessKey != undefined)
-			var accessKey = req.body.accessKey.trim();
-
-		if (req.body.secretKey != undefined)
-			var secretKey = req.body.secretKey.trim();
-		var providerName = req.body.providerName.trim();
-		var providerId = req.params.providerId.trim();
-		var orgId = req.body.orgId;
-		var s3BucketName = req.body.s3BucketName;
-		var plannedCost = req.body.plannedCost;
-		if(plannedCost === null || plannedCost ===''){
-			plannedCost=0.0;
-		}
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(400).send("{Please Enter ProviderId.}");
-			return;
-		}
-		// if (typeof accessKey === 'undefined' || accessKey.length === 0) {
-		// 	res.status(400).send("{Please Enter AccessKey.}");
-		// 	return;
-		// }
-		// if (typeof secretKey === 'undefined' || secretKey.length === 0) {
-		// 	res.status(400).send("{Please Enter SecretKey.}");
-		// 	return;
-		// }
-		if (typeof providerName === 'undefined' || providerName.length === 0) {
-			res.status(400).send("{Please Enter Name.}");
-			return;
-		}
-
-		function encryptKeys(keys) {
-			cryptography.encryptMultipleText(keys, cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding, function(err, encryptedKeys) {
-				if (err) {
-					res.status(500).send("Failed to encrypt accessKey or secretKey");
-					return;
-				}
-				var providerData = {
-					id: 9,
-					accessKey: encryptedKeys[0],
-					secretKey: encryptedKeys[1],
-					providerName: providerName,
-					orgId: orgId,
-					s3BucketName:s3BucketName,
-					plannedCost:plannedCost
-				};
-				updateInDb(providerData);
-			});
-		}
-
-		function updateInDb(providerData) {
-			AWSProvider.updateAWSProviderById(providerId, providerData, function(err, updateCount) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				}
-				if (typeof req.body.keyPairName === 'undefined') {
-					res.send({
-						updateCount: updateCount
-					});
-					return;
-				} else {
-					AWSKeyPair.createNew(req, providerId, function(err, keyPair) {
-						if (updateCount) {
-							res.send({
-								updateCount: updateCount
-							});
-						} else {
-							res.send(400);
-						}
-					});
-				}
-			});
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-
-					if (accessKey && secretKey) {
-						var keys = [];
-						keys.push(accessKey);
-						keys.push(secretKey);
-						encryptKeys(keys)
-					} else {
-						AWSProvider.getAWSProviderById(providerId, function(err, aProvider) {
-							if (err) {
-								res.status(500).send("Failed to fetch Keypairs.");
-								return;
-							}
-							var providerData = {
-								id: 9,
-								accessKey: aProvider.accessKey,
-								secretKey: aProvider.secretKey,
-								s3BucketName: s3BucketName,
-								providerName: providerName,
-								plannedCost:plannedCost,
-								orgId: orgId
-							};
-
-							updateInDb(providerData);
-						});
-
-					}
-				}
-			});
-		});
-
-
-	});
-
-	// Delete a particular AWS Provider.
-	app.delete('/aws/providers/:providerId', function(req, res) {
-		logger.debug("Enter delete() for /providers/%s", req.params.providerId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var providerId = req.params.providerId.trim();
-		if (typeof providerId === 'undefined' || providerId.length === 0) {
-			res.status(500).send("Please Enter ProviderId.");
-			return;
-		}
-
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-					AWSProvider.getAWSProviderById(providerId, function(err, aProvider) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						if (aProvider) {
-							VMImage.getImageByProviderId(providerId, function (err, anImage) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-								if (anImage.length > 0) {
-									res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
-									return;
-								}
-								blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (providers.length > 0) {
-										res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
-										return;
-									}
-									AWSProvider.removeAWSProviderById(providerId, function (err, deleteCount) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (deleteCount) {
-											instanceService.removeInstancesByProviderId(providerId, function (err, data) {
-												if (err) {
-													logger.error(err);
-													res.status(500).send(errorResponses.db.error);
-													return;
-												} else {
-													settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
-														if (err) {
-															logger.error(err);
-															res.status(500).send(errorResponses.db.error);
-															return;
-														} else {
-															logger.debug("Enter delete() for aws/providers/%s", req.params.providerId);
-															res.send({
-																deleteCount: deleteCount
-															});
-														}
-													})
-												}
-											})
-										} else {
-											res.send(400);
-										}
-									});
-								});
-							});
-						}
-					});
-				}
-			});
-		});
-	});
-
-	// Delete a particular AWS Provider.
-	app.delete('/aws/providers/keypairs/:keyPairId', function(req, res) {
-		logger.debug("Enter delete() for /aws/providers/keypairs/%s", req.params.keyPairId);
-		var user = req.session.user;
-		var category = configmgmtDao.getCategoryFromID("9");
-		var permissionto = 'delete';
-		var keyPairId = req.params.keyPairId.trim();
-		if (typeof keyPairId === 'undefined' || keyPairId.length === 0) {
-			res.status(500).send("Please Enter keyPairId.");
-			return;
-		}
-		usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function(err, data) {
-			if (!err) {
-				logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
-				if (data == false) {
-					logger.debug('No permission to ' + permissionto + ' on ' + category);
-					res.send(401, "You don't have permission to perform this operation.");
-					return;
-				}
-			} else {
-				logger.error("Hit and error in haspermission:", err);
-				res.send(500);
-				return;
-			}
-
-			masterUtil.getLoggedInUser(user.cn, function(err, anUser) {
-				if (err) {
-					res.status(500).send("Failed to fetch User.");
-				}
-				if (anUser) {
-					if (data && anUser.orgname_rowid[0] !== "") {
-						logger.debug("Inside check not authorized.");
-						res.send(401, "You don't have permission to perform this operation.");
-						return;
-					}
-					blueprints.getBlueprintByKeyPairId(keyPairId, function(err, aBluePrint) {
-						if (err) {
-							logger.error(err);
-							res.status(500).send(errorResponses.db.error);
-							return;
-						}
-						if (aBluePrint.length) {
-							res.send(403, "KeyPair already used by Some BluePrints.To delete KeyPair please delete respective BluePrints First.");
-							return;
-						} else {
-							instances.getInstanceByKeyPairId(keyPairId, function(err, anInstance) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-								if (anInstance.length) {
-									res.status(403).send("KeyPair is already used by Instance.");
-								} else {
-									AWSKeyPair.removeAWSKeyPairById(keyPairId, function(err, deleteCount) {
-										if (deleteCount) {
-											logger.debug("KeyPair deleted", keyPairId);
-											res.send({
-												deleteCount: deleteCount
-											});
-										}
-									});
-								}
-							});
-						}
-					});
-				}
-			});
-		});
-	});
-	// Return all available security groups from AWS.
-	app.post('/aws/providers/securitygroups', function(req, res) {
-		logger.debug("Get security groups");
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.getSecurityGroups(function (err, data) {
-				if (err) {
-					logger.error("Unable to get securitygroups Keypairs: ", err);
-					res.status(500).send("Invalid AccessKey or SecretKey.");
-					return;
-				}
-				res.send(data);
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-	});
-
-	// Return all available keypairs from AWS.
-	app.post('/aws/providers/keypairs/list', function(req, res) {
-		logger.debug("Get provider keypairs for a region");
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.describeKeyPairs(function(err, data) {
-				if(err && isDefault) {
-					logger.error("Unable to get AWS Keypairs: ", err);
-					// res.status(500).send('Invalid credentials \n' + 'ERROR: ' + err.message);
-					res.status(500).send(err.message);
-					return;
-				} else if (err) {
-					logger.error("Unable to get AWS Keypairs: ", err);
-					// res.status(500).send('Invalid credentials \n' + ' ERROR: ' + err.message);
-					res.status(500).send(err.message);
-					return;
-				} else {
-					res.send(data);
-				}
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-	});
-
-	// Return all available security groups from AWS for VPC.
-	app.post('/aws/providers/vpc/:vpcId/securitygroups', function(req, res) {
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.getSecurityGroupsForVPC(req.params.vpcId, function(err, data) {
-				if (err) {
-					logger.error("Unable to get AWS Security Groups for VPC.");
-					// res.status(500).send("Unable to get AWS Security Groups for VPC.");
-					res.status(500).send(err.message);
-					return;
-				}
-				res.send(data);
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-
-	});
-
-	// Return all VPCs w.r.t. region
-	app.post('/aws/providers/describe/vpcs', function(req, res) {
-		logger.debug("Enter describeVpcs ");
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.describeVpcs(function(err, data) {
-				if (err) {
-					logger.error("Unable to describe Vpcs from AWS.", err);
-					// res.status(500).send("Unable to Describe Vpcs from AWS.");
-					res.status(500).send(err.message);
-					return;
-				}
-				res.send(data);
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-	});
-
-	// Return all Subnets w.r.t. vpc
-	app.post('/aws/providers/vpc/:vpcId/subnets', function(req, res) {
-		logger.debug("Enter describeSubnets ");
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.describeSubnets(req.params.vpcId, function(err, data) {
-				if (err) {
-					logger.error("Unable to describeSubnets from AWS.", err);
-					// res.status(500).send("Unable to describeSubnets from AWS.");
-					res.status(500).send(err.message);
-					return;
-				}
-				res.send(data);
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-	});
-
-	app.get('/aws/providers/permission/set', function(req, res) {
-		masterUtil.checkPermission(req.session.user.cn, function(err, permissionSet) {
-			if (err) {
-				res.status(500).send("Error for permissionSet.");
-			}
-			if (permissionSet) {
-				res.send(permissionSet);
-			} else {
-				res.send([]);
-			}
-		});
-	});
-
-	// Return AWS Providers respect to orgid.
-	app.get('/aws/providers/org/:orgId', function(req, res) {
-		logger.debug("Enter get() for /providers/org/%s", req.params.orgId);
-		var orgId = req.params.orgId.trim();
-		if (typeof orgId === 'undefined' || orgId.length === 0) {
-			res.status(500).send("Please Enter orgId.");
-			return;
-		}
-		AWSProvider.getAWSProvidersByOrgId(orgId, function(err, providers) {
-			if (err) {
-				logger.error(err);
-				res.status(500).send(errorResponses.db.error);
-				return;
-			}
-			if (providers) {
-				for (var i = 0; i < providers.length; i++) {
-					delete providers[i].accessKey;
-					delete providers[i].secretKey;
-				}
-				res.send(providers);
-				return;
-			} else {
-				res.send([]);
-				return;
-			}
-		});
-	});
-
-
-	// Return list of all types of available providers.
-	app.get('/allproviders/list', function(req, res) {
-		logger.debug("Enter get() for /allproviders/list");
-		var loggedInUser = req.session.user.cn;
-		masterUtil.getLoggedInUser(loggedInUser, function(err, anUser) {
-			if (err) {
-				res.status(500).send("Failed to fetch User.");
-				return;
-			}
-			if (!anUser) {
-				res.status(500).send("Invalid User.");
-				return;
-			}
-			if (anUser.orgname_rowid[0] === "") {
-				masterUtil.getAllActiveOrg(function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						AWSProvider.getAWSProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = {};
-							if (providers && providers.length > 0) {
-								var awsProviderList = [];
-								for (var i = 0; i < providers.length; i++) {
-									awsProviderList.push(providers[i]);
-								}
-								providersList.awsProviders = awsProviderList;
-							} else {
-								providersList.awsProviders = [];
-							}
-
-							openstackProvider.getopenstackProvidersForOrg(orgList, function(err, openstackProviders) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-
-								if (openstackProviders != null) {
-									if (openstackProviders.length > 0) {
-										for (var i = 0; i < openstackProviders.length; i++) {
-											openstackProviders[i].password = undefined;
-										}
-										providersList.openstackProviders = openstackProviders;
-									}
-								} else {
-									providersList.openstackProviders = [];
-								}
-
-								vmwareProvider.getvmwareProvidersForOrg(orgList, function(err, vmwareProviders) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (vmwareProviders != null) {
-										if (vmwareProviders.length > 0) {
-											for (var i = 0; i < vmwareProviders.length; i++) {
-												vmwareProviders[i].password = undefined;
-											}
-											providersList.vmwareProviders = vmwareProviders;
-										}
-									} else {
-										providersList.vmwareProviders = [];
-									}
-
-									hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function(err, hpCloudProviders) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (hpCloudProviders != null) {
-											for (var i = 0; i < hpCloudProviders.length; i++) {
-												hpCloudProviders[i]['providerType'] = hpCloudProviders[i]['providerType'].toUpperCase();
-											}
-											if (hpCloudProviders.length > 0) {
-												providersList.hpPlublicCloudProviders = hpCloudProviders;
-											}
-										} else {
-											providersList.hpPlublicCloudProviders = [];
-										}
-
-										azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function(err, azureProviders) {
-
-											if (err) {
-												logger.error(err);
-												res.status(500).send(errorResponses.db.error);
-												return;
-											}
-											if (azureProviders != null) {
-
-												for (var i = 0; i < azureProviders.length; i++) {
-													azureProviders[i].clientId = undefined;
-													azureProviders[i].clientSecret = undefined;
-													azureProviders[i].tenant = undefined;
-													azureProviders[i]['providerType'] = azureProviders[i]['providerType'].toUpperCase();
-												}
-												if (azureProviders.length > 0) {
-													providersList.azureProviders = azureProviders;
-													res.send(providersList);
-													return;
-												}
-											} else {
-												providersList.azureProviders = [];
-												res.send(200, providersList);
-												return;
-											}
-										});
-
-									});
-
-								});
-
-							});
-
-						});
-					} else {
-						res.status(200).send([]);
-						return;
-					}
-				});
-			} else {
-				masterUtil.getOrgs(loggedInUser, function(err, orgList) {
-					if (err) {
-						res.status(500).send('Not able to fetch Orgs.');
-						return;
-					}
-					if (orgList) {
-						AWSProvider.getAWSProvidersForOrg(orgList, function(err, providers) {
-							if (err) {
-								logger.error(err);
-								res.status(500).send(errorResponses.db.error);
-								return;
-							}
-							var providersList = {};
-							if (providers.length > 0) {
-								var awsProviderList = [];
-								for (var i = 0; i < providers.length; i++) {
-									awsProviderList.push(providers[i]);
-								}
-								providersList.awsProviders = awsProviderList;
-							} else {
-								providersList.awsProviders = [];
-							}
-
-							openstackProvider.getopenstackProvidersForOrg(orgList, function(err, openstackProviders) {
-								if (err) {
-									logger.error(err);
-									res.status(500).send(errorResponses.db.error);
-									return;
-								}
-
-								if (openstackProviders != null) {
-									if (openstackProviders.length > 0) {
-										for (var i = 0; i < openstackProviders.length; i++) {
-											openstackProviders[i].password = undefined;
-										}
-										providersList.openstackProviders = openstackProviders;
-									}
-								} else {
-									providersList.openstackProviders = [];
-								}
-
-								vmwareProvider.getvmwareProvidersForOrg(orgList, function(err, vmwareProviders) {
-									if (err) {
-										logger.error(err);
-										res.status(500).send(errorResponses.db.error);
-										return;
-									}
-									if (vmwareProviders != null) {
-										if (vmwareProviders.length > 0) {
-											for (var i = 0; i < vmwareProviders.length; i++) {
-												vmwareProviders[i].password = undefined;
-											}
-											providersList.vmwareProviders = vmwareProviders;
-										}
-									} else {
-										providersList.vmwareProviders = [];
-									}
-
-									hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function(err, hpCloudProviders) {
-										if (err) {
-											logger.error(err);
-											res.status(500).send(errorResponses.db.error);
-											return;
-										}
-										if (hpCloudProviders != null) {
-											for (var i = 0; i < hpCloudProviders.length; i++) {
-												hpCloudProviders[i]['providerType'] = hpCloudProviders[i]['providerType'].toUpperCase();
-											}
-											if (hpCloudProviders.length > 0) {
-												providersList.hpPlublicCloudProviders = hpCloudProviders;
-											}
-										} else {
-											providersList.hpPlublicCloudProviders = [];
-										}
-
-										azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function(err, azureProviders) {
-											if (err) {
-												logger.error(err);
-												res.status(500).send(errorResponses.db.error);
-												return;
-											}
-											if (azureProviders != null) {
-												for (var i = 0; i < azureProviders.length; i++) {
-													azureProviders[i].clientId = undefined;
-													azureProviders[i].clientSecret = undefined;
-													azureProviders[i].tenant = undefined;
-													azureProviders[i]['providerType'] = azureProviders[i]['providerType'].toUpperCase();
-												}
-												if (azureProviders.length > 0) {
-													providersList.azureProviders = azureProviders;
-													res.send(providersList);
-													return;
-												}
-											} else {
-												providersList.azureProviders = [];
-												res.send(200, providersList);
-												return;
-											}
-										});
-
-									});
-
-								});
-
-							});
-
-						});
-					} else {
-						res.send(200, []);
-						return;
-					}
-				});
-			}
-		});
-	});
-
-
-	// List out all aws nodes.
-	app.post('/aws/providers/node/list', function(req, res) {
-		logger.debug("Enter List AWS Nodes: ");
-
-		var isDefault = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey, isDefault) {
-			if(isDefault) {
-				var ec2 = new EC2({
-					"isDefault": true,
-					"region": req.body.region
-				});
-			} else {
-				var ec2 = new EC2({
-					"access_key": accessKey,
-					"secret_key": secretKey,
-					"region": req.body.region
-				});
-			}
-
-			ec2.listInstances(function(err, nodes) {
-				if (err) {
-					logger.error("Unable to list nodes from AWS.", err);
-					// res.status(500).send("Unable to list nodes from AWS.");
-					res.status(500).send(err.message);
-					return;
-				}
-				logger.debug("Success to list nodes from AWS.");
-				var nodeList = [];
-				for (var i = 0; i < nodes.Reservations.length; i++) {
-					var instance = {
-						"instance": nodes.Reservations[i].Instances[0].InstanceId,
-						"privateIp": nodes.Reservations[i].Instances[0].PrivateIpAddress,
-						"publicIp": nodes.Reservations[i].Instances[0].PublicIpAddress,
-						"privateDnsName": nodes.Reservations[i].Instances[0].PrivateDnsName
-					};
-					nodeList.push(instance);
-				}
-				var nodeListLength = nodeList.length;
-				logger.debug("I am in count of Total Instances", nodeListLength);
-				res.send(nodeList);
-			});
-		}
-
-		if(isDefault) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-
-
-	});
-	// List out all Active AWS nodes.
-	app.post('/aws/providers/activenode/list', function(req, res) {
-		logger.debug("Enter List Active AWS Nodes: ");
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey) {
-			var ec2 = new EC2({
-				"access_key": accessKey,
-				"secret_key": secretKey,
-				"region": req.body.region
-			});
-
-			ec2.listActiveInstances(function(err, nodes) {
-				if (err) {
-					logger.debug("Unable to list nodes from AWS.", err);
-					// res.send("Unable to list nodes from AWS.", 500);
-					res.status(500).send(err.message);
-					return;
-				}
-				logger.debug("Success to list nodes from AWS.");
-				var nodeList = [];
-				for (var i = 0; i < nodes.Reservations.length; i++) {
-					var instance = {
-						"instance": nodes.Reservations[i].Instances[0].InstanceId,
-						"privateIp": nodes.Reservations[i].Instances[0].PrivateIpAddress,
-						"publicIp": nodes.Reservations[i].Instances[0].PublicIpAddress,
-						"privateDnsName": nodes.Reservations[i].Instances[0].PrivateDnsName
-					};
-					nodeList.push(instance);
-				}
-				var nodeListLength = nodeList.length;
-				logger.debug("I am in count of Active Instances", nodeListLength);
-				res.send(nodeList);
-			});
-		}
-
-		if(defaultProvider) {
-			makeRequest(null, null, true);
-		} else if (req.body.providerId) {
-			AWSProvider.getAWSProviderById(req.body.providerId, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				} else if(aProvider && aProvider.isDefault) {
-					makeRequest(null, null, true);
-				} else if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
-						cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-							if (err) {
-								logger.error("Failed to decrypt accessKey or secretKey: ", err);
-								res.status(500).send("Failed to decrypt accessKey or secretKey");
-								return;
-							}
-							makeRequest(decryptedKeys[0], decryptedKeys[1], false);
-						});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey, false);
-		}
-	});
-
-	app.get('/aws/dashboard/providers/:id', function(req, res) {
-		var client = new rc();
-		var id = req.params.id;
-
-		var defaultProvider = (req.body.isDefault === 'true')?true:false;
-
-		function makeRequest(accessKey, secretKey) {
-			cost.getcost(accessKey, secretKey, function(err, cost) {
-				res.status(200).send(cost);
-			});
-		}
-
-		if (id) {
-			AWSProvider.getAWSProviderById(id, function(err, aProvider) {
-				if (err) {
-					logger.error(err);
-					res.status(500).send(errorResponses.db.error);
-					return;
-				}
-				if (aProvider) {
-					var keys = [];
-					keys.push(aProvider.accessKey);
-					keys.push(aProvider.secretKey);
-					cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
-						if (err) {
-							logger.error("Failed to decrypt accessKey or secretKey: ", err);
-							res.status(500).send("Failed to decrypt accessKey or secretKey");
-							return;
-						}
-						makeRequest(decryptedKeys[0], decryptedKeys[1]);
-					});
-				} else {
-					res.status(404).send("Provider not found");
-				}
-			});
-
-		} else {
-			makeRequest(req.body.accessKey, req.body.secretKey);
-		}
-	});
+module.exports.setRoutes = function (app, sessionVerificationFunc) {
+
+
+    // Return AWS Provider respect to id.
+    app.get('/aws/providers/list', function (req, res) {
+
+        AWSProvider.getAWSProviders(function (err, providers) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            logger.debug("Provider list: ", JSON.stringify(providers));
+            if (providers) {
+                var providerList = [];
+                var count = 0;
+                for (var i = 0; i < providers.length; i++) {
+                    (function (i) {
+
+                        AWSKeyPair.getAWSKeyPairByProviderId(providers[i]._id, function (err, keyPair) {
+                            count++;
+
+                            if (keyPair) {
+                                var dommyProvider = {
+                                    _id: providers[i]._id,
+                                    id: 9,
+                                    providerName: providers[i].providerName,
+                                    providerType: providers[i].providerType,
+                                    orgId: providers[i].orgId,
+                                    __v: providers[i].__v,
+                                    keyPairs: keyPair,
+                                    isDefault: providers[i].isDefault
+                                };
+
+                                var cryptoConfig = appConfig.cryptoSettings;
+                                var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+
+                                if (!providers[i].isDefault) {
+                                    var cryptoConfig = appConfig.cryptoSettings;
+                                    var cryptography = new Cryptography(cryptoConfig.algorithm,
+                                        cryptoConfig.password);
+
+                                    dommyProvider.accessKey = cryptography.decryptText(providers[i].accessKey,
+                                        cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
+                                    dommyProvider.secretKey = cryptography.decryptText(providers[i].secretKey,
+                                        cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding);
+                                }
+                                getMonitorDetail(providers[i], function (data) {
+                                    dommyProvider.monitor = data.monitor;
+                                    providerList.push(dommyProvider);
+                                    logger.debug("count: ", count);
+                                    if (providers.length === providers.length) {
+                                        res.send(providerList);
+                                        return;
+                                    }
+                                });
+
+                            }
+
+                        });
+                    })(i);
+                }
+            } else {
+                res.send(404);
+            }
+        });
+    });
+
+    // Return AWS Provider respect to id.
+    app.get('/aws/providers/:providerId', function (req, res) {
+        logger.debug("Enter get() for /providers/%s", req.params.providerId);
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+        AWSProvider.getAWSProviderById(providerId, function (err, aProvider) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (aProvider) {
+                AWSKeyPair.getAWSKeyPairByProviderId(aProvider._id, function (err, keyPair) {
+                    masterUtil.getOrgByRowId(aProvider.orgId[0], function (err, orgs) {
+                        if (err) {
+                            res.status(500).send("Not able to fetch org.");
+                            return;
+                        }
+                        if (orgs.length > 0) {
+                            getMonitorDetail(aProvider, function (data) {
+                                aProvider = data;
+                                if (keyPair.length > 0) {
+                                    var results = [];
+                                    var dummyProvider = {
+                                        _id: aProvider._id,
+                                        id: 9,
+                                        providerName: aProvider.providerName,
+                                        providerType: aProvider.providerType,
+                                        s3BucketName: aProvider.s3BucketName,
+                                        orgId: aProvider.orgId,
+                                        plannedCost: aProvider.plannedCost,
+                                        orgName: orgs[0].orgname,
+                                        __v: aProvider.__v,
+                                        keyPairs: keyPair,
+                                        monitor: aProvider.monitor,
+                                        isDefault: aProvider.isDefault
+                                    };
+                                    for (var i = 0; i < keyPair.length; i++) {
+                                        var regionList = appConfig.aws.regions;
+                                        results.push(keyPair[i]);
+                                        for (var j = 0; j < regionList.length; j++) {
+                                            if (regionList[j].region === keyPair[i].region) {
+                                                dummyProvider.providerRegion = regionList[j];
+                                            }
+                                        }
+                                    }
+                                    if (keyPair.length === results.length) {
+                                        res.send(dummyProvider);
+                                    }
+                                } else {
+                                    var dummyProvider = {
+                                        _id: aProvider._id,
+                                        id: 9,
+                                        providerName: aProvider.providerName,
+                                        providerType: aProvider.providerType,
+                                        s3BucketName: aProvider.s3BucketName,
+                                        orgId: aProvider.orgId,
+                                        plannedCost: aProvider.plannedCost,
+                                        orgName: orgs[0].orgname,
+                                        __v: aProvider.__v,
+                                        monitor: aProvider.monitor,
+                                        isDefault: aProvider.isDefault
+                                    };
+                                    res.send(dummyProvider);
+                                }
+                            });
+
+                        }
+                    });
+                });
+            } else {
+                res.send(404);
+            }
+        });
+    });
+
+    app.all("/aws/providers/*", sessionVerificationFunc);
+    var cryptoConfig = appConfig.cryptoSettings;
+    var cryptography = new Cryptography(cryptoConfig.algorithm, cryptoConfig.password);
+
+    //Create VMWare Provider
+    app.post('/vmware/providers', function (req, res) {
+        logger.debug("Enter post() for /vmware.providers.", typeof req.body.fileName);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var vmwareusername = req.body.vmwareusername;
+        var vmwarepassword = req.body.vmwarepassword;
+        var vmwarehost = req.body.vmwarehost;
+        var vmwaredc = req.body.vmwaredc;
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType;
+        var pemFileName = null;
+        if (req.files && req.files.azurepem)
+            pemFileName = req.files.azurepem.originalFilename;
+        var keyFileName = null;
+        if (req.files && req.files.azurekey)
+            keyFileName = req.files.azurekey.originalFilename;
+        var orgId = req.body.orgId;
+
+        if (typeof vmwareusername === 'undefined' || vmwareusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        if (typeof vmwarepassword === 'undefined' || vmwarepassword.length === 0) {
+            res.status(400).send("Please Enter Password.");
+            return;
+        }
+        if (typeof vmwarehost === 'undefined' || vmwarehost.length === 0) {
+            res.status(400).send("Please Enter a Host.");
+            return;
+        }
+        if (typeof vmwaredc === 'undefined' || vmwaredc.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400).send("Please Select Any Organization.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.status(400).send("You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+
+                    var providerData = {
+                        id: 9,
+                        username: vmwareusername,
+                        password: vmwarepassword,
+                        host: vmwarehost,
+                        providerName: providerName,
+                        providerType: providerType,
+                        dc: vmwaredc,
+                        orgId: orgId
+                    };
+                    vmwareProvider.getvmwareProviderByName(providerData.providerName, providerData.orgId, function (err, prov) {
+                        if (err) {
+                            logger.error("Error while fetching vmware: ", err);
+                            res.status(500).send("Error while fetching vmware");
+                            return;
+                        }
+                        if (prov) {
+                            logger.error("Provider name already exist: ");
+                            res.status(409).send("Provider name already exist.");
+                            return;
+                        }
+                        vmwareProvider.createNew(providerData, function (err, provider) {
+                            if (err) {
+                                logger.error("Failed to create Provider: ", err);
+                                res.status(500).send("Failed to create Provider.");
+                                return;
+                            }
+                            masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                                if (err) {
+                                    res.status(500).send("Not able to fetch org.");
+                                    return;
+                                }
+                                trackSettingWizard(providerData.orgId, function (err, data) {
+                                    if (err) {
+                                        res.status(500).send("Not able to update wizards.");
+                                        return;
+                                    }
+                                    if (orgs.length > 0) {
+                                        var dommyProvider = {
+                                            _id: provider._id,
+                                            id: 9,
+                                            username: vmwareusername,
+                                            //password: vmwarepassword,
+                                            host: vmwarehost,
+                                            dc: vmwaredc,
+                                            providerName: provider.providerName,
+                                            providerType: provider.providerType,
+                                            orgId: orgs[0].rowid,
+                                            orgName: orgs[0].orgname,
+                                            __v: provider.__v,
+                                        };
+                                        res.send(dommyProvider);
+                                        return;
+                                    }
+                                });
+                            });
+
+                            logger.debug("Exit post() for /providers");
+                        });
+                    });
+
+                } //end anuser
+            });
+        });
+
+    });
+
+    //get vmware providers
+    app.get('/vmware/providers', function (req, res) {
+        logger.debug("Enter get() for vmware/providers");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        vmwareProvider.getvmwareProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            if (providers != null) {
+                                if (providers.length > 0) {
+                                    for (var i = 0; i < providers.length; i++) {
+                                        providers[i].password = undefined;
+                                    }
+                                    res.send(providers);
+                                    return;
+                                }
+                            } else {
+                                res.send(200, []);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        vmwareProvider.getvmwareProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers === null) {
+                                res.send(providersList);
+                                return;
+                            }
+                            if (providers.length > 0) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    providers[i].password = undefined;
+                                }
+                                res.send(providers);
+                                return;
+                            } else {
+                                res.send(providersList);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    //start: get azure provider by id
+    app.get('/vmware/providers/:providerId', function (req, res) {
+
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+        vmwareProvider.getvmwareProviderById(providerId, function (err, aProvider) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (aProvider) {
+                masterUtil.getOrgByRowId(aProvider.orgId[0], function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    aProvider.orgname = orgs[0].orgname;
+                    if (orgs.length > 0) {
+                        aProvider.password = undefined;
+                        res.send(aProvider);
+                        return;
+                    }
+                });
+
+            } else {
+                res.send(404);
+                return;
+            }
+        });
+    }); //end: get azure provider by id
+
+    //start: removes azure provider
+    app.delete('/vmware/providers/:providerId', function (req, res) {
+        logger.debug("Enter delete for vmware/providers/%s", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    vmwareProvider.getvmwareProviderById(providerId, function (err, aProvider) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aProvider) {
+                            VMImage.getImageByProviderId(providerId, function (err, anImage) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+                                if (anImage.length > 0) {
+                                    res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
+                                    return;
+                                }
+                                logger.debug('Providerid: ', providerId);
+                                blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (providers.length > 0) {
+                                        res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
+                                        return;
+                                    }
+                                    vmwareProvider.removevmwareProviderById(providerId, function (err, deleteCount) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (deleteCount) {
+                                            instanceService.removeInstancesByProviderId(providerId, function (err, data) {
+                                                if (err) {
+                                                    logger.error(err);
+                                                    res.status(500).send(errorResponses.db.error);
+                                                    return;
+                                                } else {
+                                                    settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
+                                                        if (err) {
+                                                            logger.error(err);
+                                                            res.status(500).send(errorResponses.db.error);
+                                                            return;
+                                                        } else {
+                                                            logger.debug("Enter delete() for vmware/providers/%s", req.params.providerId);
+                                                            res.send({
+                                                                deleteCount: deleteCount
+                                                            });
+                                                        }
+                                                    })
+                                                }
+                                            })
+                                        } else {
+                                            res.send(400);
+                                        }
+                                    });
+                                });
+                            });
+                        }
+                    });
+                }
+            });
+        }); //
+    });
+
+
+    app.post('/vmware/providers/:providerId/update', function (req, res) {
+        logger.debug("Enter post() for /providers/vmware/%s/update", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var vmwareusername = req.body.vmwareusername;
+        var vmwarepassword = req.body.vmwarepassword;
+        var vmwarehost = req.body.vmwarehost;
+        var vmwaredc = req.body.vmwaredc;
+        var providerName = req.body.providerName;
+        var orgId = req.body.orgId;
+
+        if (typeof vmwareusername === 'undefined' || vmwareusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        // if (typeof vmwarepassword === 'undefined' || vmwarepassword.length === 0) {
+        // 	res.status(400).send("Please Enter Password.");
+        // 	return;
+        // }
+        if (typeof vmwarehost === 'undefined' || vmwarehost.length === 0) {
+            res.status(400).send("Please Enter a Host.");
+            return;
+        }
+        if (typeof vmwaredc === 'undefined' || vmwaredc.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please Select Any Organization.");
+            return;
+        }
+
+
+        function updateDb(providerData) {
+            vmwareProvider.updatevmwareProviderById(req.params.providerId, providerData, function (err, updateCount) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                }
+                masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    if (orgs.length > 0) {
+                        var dommyProvider = {
+                            _id: req.params.providerId,
+                            id: 9,
+                            username: vmwareusername,
+                            //password: vmwarepassword,
+                            host: vmwarehost,
+                            providerName: providerName,
+                            dc: vmwaredc,
+                            orgId: orgs[0].rowid,
+                            orgName: orgs[0].orgname
+                        };
+                        res.send(dommyProvider);
+                        return;
+                    }
+                });
+            });
+        }
+
+
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    if (vmwarepassword) {
+                        var providerData = {
+                            id: 9,
+                            username: vmwareusername,
+                            password: vmwarepassword,
+                            host: vmwarehost,
+                            providerName: providerName,
+                            tenantid: vmwaredc,
+                            orgId: orgId
+                        };
+                        logger.debug("provider data %s", JSON.stringify(providerData));
+                        updateDb(providerData);
+                    } else {
+                        vmwareProvider.getvmwareProviderById(req.params.providerId, function (err, aProvider) {
+                            if (err) {
+                                res.status(500).send("Not able to fetch org.");
+                                return;
+                            }
+                            var providerData = {
+                                id: 9,
+                                username: vmwareusername,
+                                password: aProvider.password,
+                                host: vmwarehost,
+                                providerName: providerName,
+                                tenantid: vmwaredc,
+                                orgId: orgId
+                            };
+                            logger.debug("provider data %s", JSON.stringify(providerData));
+                            updateDb(providerData);
+                        });
+
+                    }
+                }
+            });
+        });
+    });
+
+
+    app.post('/hppubliccloud/providers', function (req, res) {
+        logger.debug("Enter post() for /hppubliccloud.", typeof req.files.hppubliccloudinstancepem);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var hppubliccloudusername = req.body.openstackusername;
+        var hppubliccloudpassword = req.body.openstackpassword;
+        var hppubliccloudhost = req.body.openstackhost;
+        var hppubliccloudtenantid = req.body.openstacktenantid;
+        var hppubliccloudtenantname = req.body.openstacktenantname;
+        var hppubliccloudprojectname = req.body.openstackprojectname;
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType.toLowerCase();
+        var hppubliccloudkeyname = req.body.hppubliccloudkeyname;
+        var hppubliccloudregion = req.body.hppubliccloudregion;
+        var hpFileName = req.files.hpFileName.originalFilename;
+        var orgId = req.body.orgId;
+
+        var serviceendpoints = {
+            compute: req.body.openstackendpointcompute,
+            network: req.body.openstackendpointnetwork,
+            image: req.body.openstackendpointimage,
+            ec2: req.body.openstackendpointec2,
+            identity: req.body.openstackendpointidentity,
+        };
+
+        if (typeof hppubliccloudusername === 'undefined' || hppubliccloudusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        if (typeof hppubliccloudpassword === 'undefined' || hppubliccloudpassword.length === 0) {
+            res.status(400).send("Please Enter Password.");
+            return;
+        }
+        if (typeof hppubliccloudhost === 'undefined' || hppubliccloudhost.length === 0) {
+            res.status(400).send("Please Enter a Host.");
+            return;
+        }
+        if (typeof hppubliccloudtenantid === 'undefined' || hppubliccloudtenantid.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof hppubliccloudregion === 'undefined' || hppubliccloudregion.length === 0) {
+            res.status(400).send("Please Enter Region.");
+            return;
+        }
+        if (typeof hppubliccloudkeyname === 'undefined' || hppubliccloudkeyname.length === 0) {
+            res.status(400).send("Please Enter a Key name.");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please Select Any Organization.");
+            return;
+        }
+        if (typeof hppubliccloudtenantname === 'undefined' || hppubliccloudtenantname.length === 0) {
+            res.status(400).send("Please Enter Tenant Name.");
+            return;
+        }
+        if (typeof hppubliccloudprojectname === 'undefined' || hppubliccloudprojectname.length === 0) {
+            res.status(400).send("Please Enter Project Name.");
+            return;
+        }
+        if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
+            res.status(400).send("Please Enter Compute Endpoint Name.");
+            return;
+        }
+        if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
+            res.status(400).send("Please Enter Identity Endpoint Name.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                if (anUser) {
+                    var providerData = {
+                        id: 9,
+                        username: hppubliccloudusername,
+                        password: hppubliccloudpassword,
+                        host: hppubliccloudhost,
+                        providerName: providerName,
+                        providerType: providerType,
+                        tenantid: hppubliccloudtenantid,
+                        tenantname: hppubliccloudtenantname,
+                        projectname: hppubliccloudprojectname,
+                        serviceendpoints: serviceendpoints,
+                        region: hppubliccloudregion,
+                        keyname: hppubliccloudkeyname,
+                        hpFileName: hpFileName,
+                        orgId: orgId
+                    };
+                    hppubliccloudProvider.gethppubliccloudProviderByName(providerData.providerName, providerData.orgId, function (err, prov) {
+                        if (err) {
+                            logger.error("err. ", err);
+                            res.status(500).send("Error to fetch Provider: ", err);
+                        }
+                        if (prov) {
+                            logger.debug("Provider name already exist");
+                            res.status(409).send("Provider name already exist.");
+                            return;
+                        }
+                        hppubliccloudProvider.createNew(req, providerData, function (err, provider) {
+                            if (err) {
+                                logger.error("Failed to create Provider: ", err);
+                                res.status(500).send("Failed to create Provider.");
+                                return;
+                            }
+
+                            masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                                if (err) {
+                                    res.status(500).send("Not able to fetch org.");
+                                    return;
+                                }
+                                if (orgs.length > 0) {
+
+                                    var dommyProvider = {
+                                        _id: provider._id,
+                                        id: 9,
+                                        username: hppubliccloudusername,
+                                        password: hppubliccloudpassword,
+                                        host: hppubliccloudhost,
+                                        providerName: provider.providerName,
+                                        providerType: provider.providerType,
+                                        hpFileName: provider.hpFileName,
+                                        orgId: orgs[0].rowid,
+                                        orgName: orgs[0].orgname,
+                                        tenantid: hppubliccloudtenantid,
+                                        __v: provider.__v,
+
+                                    };
+                                    res.send(dommyProvider);
+                                    return;
+
+                                }
+                            });
+
+                            logger.debug("Exit post() for /providers");
+                        });
+                    });
+
+                } //end anuser
+            });
+        });
+
+    });
+
+    app.get('/hppubliccloud/providers', function (req, res) {
+        logger.debug("Enter get() for /hppubliccloud/providers");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            if (providers != null) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    providers[i]['providerType'] = providers[i]['providerType'].toUpperCase();
+                                }
+                                logger.debug("providers>>> ", JSON.stringify(providers));
+                                if (providers.length > 0) {
+                                    res.send(providers);
+                                    return;
+                                }
+                            } else {
+                                res.send(200, []);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers === null) {
+                                res.send(providersList);
+                                return;
+                            }
+                            if (providers.length > 0) {
+                                res.send(providers);
+                                return;
+                            } else {
+                                res.send(providersList);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    app.get('/hppubliccloud/providers/:providerId', function (req, res) {
+        logger.debug("Enter get() for /hppubliccloud/providers//%s", req.params.providerId);
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+        hppubliccloudProvider.gethppubliccloudProviderById(providerId, function (err, aProvider) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (aProvider) {
+
+                masterUtil.getOrgByRowId(aProvider.orgId[0], function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    aProvider.orgname = orgs[0].orgname;
+
+                    if (orgs.length > 0) {
+                        res.send(aProvider);
+                        return;
+                    }
+                });
+
+            } else {
+                res.status(404).send("Provider not found.");
+                return;
+            }
+        });
+    });
+
+
+    app.post('/hppubliccloud/providers/:providerId/update', function (req, res) {
+        logger.debug("Enter post() for /providers/hppubliccloud/%s/update", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var hppubliccloudusername = req.body.openstackusername;
+        var hppubliccloudpassword = req.body.openstackpassword;
+        var hppubliccloudhost = req.body.openstackhost;
+        var hppubliccloudtenantid = req.body.openstacktenantid;
+        var hppubliccloudtenantname = req.body.openstacktenantname;
+        var hppubliccloudprojectname = req.body.openstackprojectname;
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType.toLowerCase();
+        var hppubliccloudkeyname = req.body.hppubliccloudkeyname;
+        var hpFileName = req.files.hpFileName.originalFilename;
+        var hppubliccloudregion = req.body.hppubliccloudregion;
+        var providerId = req.params.providerId;
+
+        var serviceendpoints = {
+            compute: req.body.openstackendpointcompute,
+            network: req.body.openstackendpointnetwork,
+            image: req.body.openstackendpointimage,
+            ec2: req.body.openstackendpointec2,
+            identity: req.body.openstackendpointidentity,
+
+        };
+
+        var orgId = req.body.orgId;
+        if (typeof hppubliccloudusername === 'undefined' || hppubliccloudusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        if (typeof hppubliccloudpassword === 'undefined' || hppubliccloudpassword.length === 0) {
+            res.status(400).send("Please Enter Password.");
+            return;
+        }
+        if (typeof hppubliccloudhost === 'undefined' || hppubliccloudhost.length === 0) {
+            res.status(400).send("Please Enter a Host.");
+            return;
+        }
+        if (typeof hppubliccloudtenantid === 'undefined' || hppubliccloudtenantid.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof hppubliccloudregion === 'undefined' || hppubliccloudregion.length === 0) {
+            res.status(400).send("Please Enter Region.");
+            return;
+        }
+        if (typeof hppubliccloudkeyname === 'undefined' || hppubliccloudkeyname.length === 0) {
+            res.status(400).send("Please Enter a Key name.");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof hppubliccloudtenantname === 'undefined' || hppubliccloudtenantname.length === 0) {
+            res.status(400).send("Please Enter Tenant Name.");
+            return;
+        }
+        if (typeof hppubliccloudprojectname === 'undefined' || hppubliccloudprojectname.length === 0) {
+            res.status(400).send("Please Enter Project Name.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please Select Any Organization.");
+            return;
+        }
+        if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
+            res.status(400).send("Please Enter Compute Endpoint Name.");
+            return;
+        }
+        if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
+            res.status(400).send("Please Enter Identity Endpoint Name.");
+            return;
+        }
+
+
+        var providerData = {
+            id: 9,
+            username: hppubliccloudusername,
+            password: hppubliccloudpassword,
+            host: hppubliccloudhost,
+            providerName: providerName,
+            providerType: providerType,
+            tenantid: hppubliccloudtenantid,
+            tenantname: hppubliccloudtenantname,
+            projectname: hppubliccloudprojectname,
+            serviceendpoints: serviceendpoints,
+            region: hppubliccloudregion,
+            hpFileName: hpFileName,
+            keyname: hppubliccloudkeyname,
+            orgId: orgId
+        };
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+                    hppubliccloudProvider.updatehppubliccloudProviderById(providerId, providerData, function (err, updateCount) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                            if (err) {
+                                res.status(500).send("Not able to fetch org.");
+                                return;
+                            }
+                            if (orgs.length > 0) {
+                                var dommyProvider = {
+                                    _id: providerId,
+                                    id: 9,
+                                    username: hppubliccloudusername,
+                                    password: hppubliccloudpassword,
+                                    host: hppubliccloudhost,
+                                    providerName: providerData.providerName,
+                                    providerType: providerData.providerType,
+                                    orgId: orgs[0].rowid,
+                                    orgName: orgs[0].orgname
+                                };
+                                res.send(dommyProvider);
+                                return;
+                            }
+                        });
+                    });
+
+                }
+            });
+        });
+    });
+
+    //start: removes azure provider
+    app.delete('/hppubliccloud/providers/:providerId', function (req, res) {
+        logger.debug("Enter delete() for hppubliccloud/providers/%s", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var providerId = req.params.providerId.trim();
+
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                if (anUser) {
+                    hppubliccloudProvider.gethppubliccloudProviderById(providerId, function (err, aProvider) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aProvider) {
+                            VMImage.getImageByProviderId(providerId, function (err, anImage) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+                                if (anImage) {
+                                    res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
+                                    return;
+                                }
+                                blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (providers.length > 0) {
+                                        res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
+                                        return;
+                                    }
+                                    hppubliccloudProvider.removehppubliccloudProviderById(providerId, function (err, deleteCount) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (deleteCount) {
+                                            instanceService.removeInstancesByProviderId(providerId, function (err, data) {
+                                                if (err) {
+                                                    logger.error(err);
+                                                    res.status(500).send(errorResponses.db.error);
+                                                    return;
+                                                } else {
+                                                    settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
+                                                        if (err) {
+                                                            logger.error(err);
+                                                            res.status(500).send(errorResponses.db.error);
+                                                            return;
+                                                        } else {
+                                                            logger.debug("Enter delete() for hppubliccloud/providers/%s", req.params.providerId);
+                                                            res.send({
+                                                                deleteCount: deleteCount
+                                                            });
+                                                        }
+                                                    })
+                                                }
+                                            })
+                                        } else {
+                                            res.send(400);
+                                        }
+                                    });
+                                });
+                            });
+                        }
+                    });
+                }
+            });
+        });
+    });
+
+
+    //Creates Azure Provider
+    app.post('/azure/providers', function (req, res) {
+
+        logger.debug("Enter post() for Azure.");
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var azureSubscriptionId = req.body.azureSubscriptionId;
+        var azureClientId = req.body.azureClientId;
+        var azureClientSecret = req.body.azureClientSecret;
+        var azureTenantId = req.body.azureTenantId;
+
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType;
+        var pemFileName = null;
+        if (req.files && req.files.azurepem)
+            pemFileName = req.files.azurepem.originalFilename;
+        var keyFileName = null;
+        if (req.files && req.files.azurekey)
+            keyFileName = req.files.azurekey.originalFilename;
+        var orgId = req.body.orgId;
+
+        if (typeof azureSubscriptionId === 'undefined' || azureSubscriptionId.length === 0) {
+            res.status(400).send("Please Enter SubscriptionId.");
+            return;
+        }
+
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof pemFileName === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please upload azure subscription pem file");
+            return;
+        }
+        if (typeof keyFileName === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please upload azure subscription key file");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please Select Any Organization.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+
+                    var providerData = {
+                        id: 9,
+                        subscriptionId: azureSubscriptionId,
+                        providerName: providerName,
+                        providerType: providerType,
+                        pemFileName: pemFileName,
+                        keyFileName: keyFileName,
+                        orgId: orgId,
+                        clientId: azureClientId,
+                        clientSecret: azureClientSecret,
+                        tenant: azureTenantId
+                    };
+                    azurecloudProvider.getAzureCloudProviderByName(providerData.providerName, providerData.orgId, function (err, prov) {
+                        if (err) {
+                            logger.debug("Failed to fetch Azure provider. ", err);
+                            res.status(500).send("Failed to fetch Azure provider.");
+                            return;
+                        }
+                        if (prov) {
+                            res.status(409).send("Provider name already exist.");
+                            return;
+                        }
+                        azurecloudProvider.createNew(req, providerData, function (err, provider) {
+                            if (err) {
+                                logger.debug("Failed to create Provider.", err);
+                                res.status(500).send("Failed to create Provider.");
+                                return;
+                            }
+
+                            masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                                if (err) {
+                                    res.status(500).send("Not able to fetch org.");
+                                    return;
+                                }
+                                trackSettingWizard(providerData.orgId, function (err, data) {
+                                    if (err) {
+                                        res.status(500).send("Not able to update wizards.");
+                                        return;
+                                    }
+                                    if (orgs.length > 0) {
+                                        var dommyProvider = {
+                                            _id: provider._id,
+                                            id: 9,
+                                            subscriptionId: azureSubscriptionId,
+                                            providerName: provider.providerName,
+                                            providerType: provider.providerType,
+                                            pemFileName: pemFileName,
+                                            keyFileName: keyFileName,
+                                            orgId: orgs[0].rowid,
+                                            orgName: orgs[0].orgname,
+                                            __v: provider.__v,
+
+                                        };
+                                        res.send(dommyProvider);
+                                        return;
+                                    }
+                                });
+                            });
+
+                            logger.debug("Exit post() for /providers");
+                        });
+                    });
+
+                } //end anuser
+            });
+        });
+
+    }); //ends :create Azure provider
+
+    //starts: get azure providers
+    app.get('/azure/providers', function (req, res) {
+        logger.debug("Enter get() for /azure/providers");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            if (providers != null) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    providers[i]['providerType'] = providers[i]['providerType'].toUpperCase();
+                                }
+                                if (providers.length > 0) {
+                                    for (var i = 0; i < providers.length; i++) {
+                                        providers[i].clientId = undefined;
+                                        providers[i].clientSecret = undefined;
+                                        providers[i].tenant = undefined;
+                                    }
+                                    res.send(providers);
+                                    return;
+                                }
+                            } else {
+                                res.status(200).send([]);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.status(200).send([]);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers === null) {
+                                res.send(providersList);
+                                return;
+                            }
+                            if (providers.length > 0) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    providers[i].clientId = undefined;
+                                    providers[i].clientSecret = undefined;
+                                    providers[i].tenant = undefined;
+                                }
+                                res.send(providers);
+                                return;
+                            } else {
+                                res.send(providersList);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.status(200).send([]);
+                        return;
+                    }
+                });
+            }
+        });
+    }); //end: get azure providers
+
+    //start: get azure provider by id
+    app.get('/azure/providers/:providerId', function (req, res) {
+        logger.debug("Enter get() for /azure/providers//%s", req.params.providerId);
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+        azurecloudProvider.getAzureCloudProviderById(providerId, function (err, aProvider) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (aProvider) {
+                logger.debug(aProvider);
+                aProvider = JSON.parse(aProvider)
+                logger.debug(aProvider.orgId);
+                masterUtil.getOrgByRowId(aProvider.orgId[0], function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    aProvider.orgname = orgs[0].orgname;
+
+                    if (orgs.length > 0) {
+
+                        aProvider.clientId = undefined;
+                        aProvider.clientSecret = undefined;
+                        aProvider.tenant = undefined;
+                        res.send(aProvider);
+                        return;
+                    }
+                });
+
+            } else {
+                res.status(500).send("Not Found Provider.");
+            }
+        });
+    }); //end: get azure provider by id
+
+    //start: update azure provider
+    app.post('/azure/providers/:providerId/update', function (req, res) {
+        logger.debug("Enter post() for /providers/azure/%s/update", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+
+        var azureSubscriptionId = req.body.azureSubscriptionId;
+        var azureClientId = req.body.azureClientId;
+        var azureClientSecret = req.body.azureClientSecret;
+        var azureTenantId = req.body.azureTenantId;
+        var providerName = req.body.providerName;
+        var providerId = req.params.providerId;
+        var orgId = req.body.orgId;
+
+        if (typeof azureSubscriptionId === 'undefined' || azureSubscriptionId.length === 0) {
+            res.status(400).send("Please Enter Subscription Id.");
+            return;
+        }
+
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+
+        function updateDb(providerData) {
+            azurecloudProvider.updateAzureCloudProviderById(providerId, providerData, function (err, updateCount) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                }
+                masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    if (orgs.length > 0) {
+                        var dommyProvider = {
+                            _id: providerId,
+                            id: 9,
+                            subscriptionId: azureSubscriptionId,
+                            providerName: providerData.providerName,
+                            orgId: orgs[0].rowid,
+                            orgName: orgs[0].orgname
+                        };
+                        res.send(dommyProvider);
+                        return;
+                    }
+                });
+            });
+        }
+
+
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+
+                    if (azureClientId && azureClientSecret && azureTenantId) {
+                        var providerData = {
+                            id: 9,
+                            azureSubscriptionId: azureSubscriptionId,
+                            providerName: providerName,
+                            orgId: orgId,
+                            clientId: azureClientId,
+                            clientSecret: azureClientSecret,
+                            tenant: azureTenantId
+                        };
+                        updateDb(providerData);
+                    } else {
+                        azurecloudProvider.getAzureCloudProviderById(providerId, function (err, aProvider) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            aProvider = JSON.parse(aProvider);
+
+                            var providerData = {
+                                id: 9,
+                                azureSubscriptionId: azureSubscriptionId,
+                                providerName: providerName,
+                                orgId: orgId,
+                                clientId: azureClientId || aProvider.clientId,
+                                clientSecret: azureClientSecret || aProvider.clientSecret,
+                                tenant: azureTenantId || aProvider.tenant
+                            };
+                            updateDb(providerData);
+
+                        });
+
+                    }
+                } else {
+                    res.status(403).send('User does not exist');
+                }
+            });
+        });
+    }); //end: update azure provider
+
+    //start: removes azure provider
+    app.delete('/azure/providers/:providerId', function (req, res) {
+        logger.debug("Enter delete() for /providers/%s", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.status(401).send("You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+                    azurecloudProvider.getAzureCloudProviderById(providerId, function (err, aProvider) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aProvider) {
+                            VMImage.getImageByProviderId(providerId, function (err, anImage) {
+                                if (err) {
+                                    logger.error(errorResponses.db.error);
+                                    res.status(500).send("Failed to get Image.");
+                                    return;
+                                }
+                                if (anImage.length > 0) {
+                                    res.status(403).send("Provider already used by Some Images.To delete provider please delete respective Images first.");
+                                    return;
+                                }
+                                blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (providers.length > 0) {
+                                        res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
+                                        return;
+                                    }
+                                    azurecloudProvider.removeAzureCloudProviderById(providerId, function (err, deleteCount) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send("Failed to get Provider.");
+                                            return;
+                                        }
+                                        if (deleteCount) {
+                                            instanceService.removeInstancesByProviderId(providerId, function (err, data) {
+                                                if (err) {
+                                                    logger.error(err);
+                                                    res.status(500).send(errorResponses.db.error);
+                                                    return;
+                                                } else {
+                                                    settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
+                                                        if (err) {
+                                                            logger.error(err);
+                                                            res.status(500).send(errorResponses.db.error);
+                                                            return;
+                                                        } else {
+                                                            logger.debug("Enter delete() for azure/providers/%s", req.params.providerId);
+                                                            res.send({
+                                                                deleteCount: deleteCount
+                                                            });
+                                                        }
+                                                    })
+                                                }
+                                            })
+                                        } else {
+                                            res.send(400);
+                                        }
+                                    });
+                                });
+                            });
+                        }
+                    });
+                }
+            });
+        }); //
+    });
+
+    //Create Openstack provider
+    app.post('/openstack/providers', function (req, res) {
+        logger.debug("Enter post() for /providers.", typeof req.body.fileName);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var openstackusername = req.body.openstackusername;
+        var openstackpassword = req.body.openstackpassword;
+        var openstackhost = req.body.openstackhost;
+        var openstacktenantid = req.body.openstacktenantid;
+        var openstacktenantname = req.body.openstacktenantname;
+        var openstackprojectname = req.body.openstackprojectname;
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType;
+        var openstackkeyname = req.body.openstackkeyname;
+        var pemFileName = req.files.openstackinstancepem.originalFilename;
+        var orgId = req.body.orgId;
+
+        var serviceendpoints = {
+            compute: req.body.openstackendpointcompute,
+            network: req.body.openstackendpointnetwork,
+            image: req.body.openstackendpointimage,
+            ec2: req.body.openstackendpointec2,
+            identity: req.body.openstackendpointidentity,
+        };
+
+        if (typeof openstackusername === 'undefined' || openstackusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        if (typeof openstackpassword === 'undefined' || openstackpassword.length === 0) {
+            res.status(400).send("Please Enter Password.");
+            return;
+        }
+        if (typeof openstackhost === 'undefined' || openstackhost.length === 0) {
+            res.status(400).send("Please Enter a Host.");
+            return;
+        }
+        if (typeof openstacktenantid === 'undefined' || openstacktenantid.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof pemFileName === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please upload openstack subscription pem file");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400).send("Please Select Any Organization.");
+            return;
+        }
+        if (typeof openstacktenantname === 'undefined' || openstacktenantname.length === 0) {
+            res.status(400).send("Please Enter Tenant Name.");
+            return;
+        }
+        if (typeof openstackprojectname === 'undefined' || openstackprojectname.length === 0) {
+            res.status(400).send("Please Enter Project Name.");
+            return;
+        }
+        if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
+            res.status(400).send("Please Enter Compute Endpoint Name.");
+            return;
+        }
+        if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
+            res.status(400).send("Please Enter Identity Endpoint Name.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.status(400).send("You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                    return;
+                }
+                logger.debug("LoggedIn User: ", JSON.stringify(anUser));
+                if (anUser) {
+
+                    var providerData = {
+                        id: 9,
+                        username: openstackusername,
+                        password: openstackpassword,
+                        host: openstackhost,
+                        providerName: providerName,
+                        providerType: providerType,
+                        tenantid: openstacktenantid,
+                        tenantname: openstacktenantname,
+                        projectname: openstackprojectname,
+                        serviceendpoints: serviceendpoints,
+                        keyname: openstackkeyname,
+                        pemFileName: pemFileName,
+                        orgId: orgId
+                    };
+                    openstackProvider.getopenstackProviderByName(providerData.providerName, providerData.orgId, function (err, prov) {
+                        if (err) {
+                            logger.debug("err.....", err);
+                        }
+                        if (prov) {
+                            logger.debug("err.....", err);
+                            res.status(409).send("Provider name already exist.");
+                            return;
+                        }
+                        openstackProvider.createNew(req, providerData, function (err, provider) {
+                            if (err) {
+                                logger.debug("err.....", err);
+                                res.status(500).send("Failed to create Provider.");
+                                return;
+                            }
+
+                            masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                                if (err) {
+                                    res.status(500).send("Not able to fetch org.");
+                                    return;
+                                }
+                                trackSettingWizard(providerData.orgId, function (err, data) {
+                                    if (err) {
+                                        res.status(500).send("Not able to update wizards.");
+                                        return;
+                                    }
+                                    if (orgs.length > 0) {
+                                        var dommyProvider = {
+                                            _id: provider._id,
+                                            id: 9,
+                                            username: openstackusername,
+                                            //password: openstackpassword,
+                                            host: openstackhost,
+                                            providerName: provider.providerName,
+                                            providerType: provider.providerType,
+                                            orgId: orgs[0].rowid,
+                                            orgName: orgs[0].orgname,
+                                            pemFileName: pemFileName,
+                                            tenantid: openstacktenantid,
+                                            __v: provider.__v,
+
+                                        };
+                                        res.send(dommyProvider);
+                                        return;
+                                    }
+                                });
+                            });
+                            logger.debug("Exit post() for /providers");
+                        });
+                    });
+
+                } //end anuser
+            });
+        });
+
+    });
+
+    // Return list of all available AWS Providers.
+    app.get('/openstack/providers', function (req, res) {
+        logger.debug("Enter get() for /providers");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        openstackProvider.getopenstackProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            if (providers != null) {
+                                if (providers.length > 0) {
+                                    for (var i = 0; i < providers.length; i++) {
+                                        providers[i].password = undefined;
+                                    }
+                                    res.send(providers);
+                                    return;
+                                }
+                            } else {
+                                res.status(200).send([]);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.status(500).send([]);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        openstackProvider.getopenstackProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers === null) {
+                                res.send(providersList);
+                                return;
+                            }
+                            if (providers.length > 0) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    providers[i].password = undefined;
+                                }
+                                res.send(providers);
+                                return;
+                            } else {
+                                res.send(providersList);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.status(200).send([]);
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    // Return AWS Provider respect to id.
+    app.get('/openstack/providers/:providerId', function (req, res) {
+        logger.debug("Enter get() for /providers/%s", req.params.providerId);
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+        openstackProvider.getopenstackProviderById(providerId, function (err, aProvider) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (aProvider) {
+
+                masterUtil.getOrgByRowId(aProvider.orgId[0], function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    aProvider.orgname = orgs[0].orgname;
+
+                    if (orgs.length > 0) {
+                        aProvider.password = undefined;
+                        res.send(aProvider);
+                        return;
+                    }
+                });
+
+            } else {
+                res.status(404).send("Provider not found.");
+            }
+        });
+    });
+
+    // Update a particular AWS Provider
+    app.post('/openstack/providers/:providerId/update', function (req, res) {
+        logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'modify';
+        var openstackusername = req.body.openstackusername;
+        var openstackpassword = req.body.openstackpassword;
+        var openstackhost = req.body.openstackhost;
+        var openstacktenantid = req.body.openstacktenantid;
+        var openstacktenantname = req.body.openstacktenantname;
+        var openstackprojectname = req.body.openstackprojectname;
+        var providerName = req.body.providerName.trim();
+        var providerId = req.params.providerId.trim();
+        var openstackkeyname = req.body.openstackkeyname;
+        var orgId = req.body.orgId;
+        var providerId = req.params.providerId;
+
+        var serviceendpoints = {
+            compute: req.body.openstackendpointcompute,
+            network: req.body.openstackendpointnetwork,
+            image: req.body.openstackendpointimage,
+            ec2: req.body.openstackendpointec2,
+            identity: req.body.openstackendpointidentity
+
+        };
+
+        if (typeof openstackusername === 'undefined' || openstackusername.length === 0) {
+            res.status(400).send("Please Enter Username.");
+            return;
+        }
+        // if (typeof openstackpassword === 'undefined' || openstackpassword.length === 0) {
+        // 	res.status(400).send("Please Enter Password.");
+        // 	return;
+        // }
+        if (typeof openstackhost === 'undefined' || openstackhost.length === 0) {
+            res.status(400).send("Please Enter a Host");
+            return;
+        }
+        if (typeof openstacktenantid === 'undefined' || openstacktenantid.length === 0) {
+            res.status(400).send("Please Enter a Tenant ID");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof openstacktenantname === 'undefined' || openstacktenantname.length === 0) {
+            res.status(400).send("Please Enter Tenant Name.");
+            return;
+        }
+        if (typeof openstackprojectname === 'undefined' || openstackprojectname.length === 0) {
+            res.status(400).send("Please Enter Project Name.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400).send("Please Select Any Organization.");
+            return;
+        }
+        if (typeof serviceendpoints.compute === 'undefined' || serviceendpoints.compute.length === 0) {
+            res.status(400).send("Please Enter Compute Endpoint Name.");
+            return;
+        }
+        if (typeof serviceendpoints.identity === 'undefined' || serviceendpoints.identity.length === 0) {
+            res.status(400).send("Please Enter Identity Endpoint Name.");
+            return;
+        }
+
+        function updateDB(providerData) {
+            openstackProvider.updateopenstackProviderById(providerId, providerData, function (err, updateCount) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                }
+                masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                    if (err) {
+                        res.status(500).send("Not able to fetch org.");
+                        return;
+                    }
+                    if (orgs.length > 0) {
+                        var dommyProvider = {
+                            _id: providerId,
+                            id: 9,
+                            username: openstackusername,
+                            //password: openstackpassword,
+                            host: openstackhost,
+                            providerName: providerData.providerName,
+                            orgId: orgs[0].rowid,
+                            orgName: orgs[0].orgname
+                        };
+                        res.send(dommyProvider);
+                        return;
+                    }
+                });
+            });
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.status(401).send("You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+
+                    logger.debug("Able to get AWS Keypairs. %s", JSON.stringify(data));
+
+                    if (openstackpassword) {
+                        var providerData = {
+                            id: 9,
+                            username: openstackusername,
+                            password: openstackpassword,
+                            host: openstackhost,
+                            tenantid: openstacktenantid,
+                            tenantname: openstacktenantname,
+                            projectname: openstackprojectname,
+                            providerName: providerName,
+                            serviceendpoints: serviceendpoints,
+                            keyname: openstackkeyname,
+                            orgId: orgId
+                        };
+                        updateDB(providerData);
+                    } else {
+
+                        openstackProvider.getopenstackProviderById(providerId, function (err, aProvider) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            if (aProvider) {
+                                var providerData = {
+                                    id: 9,
+                                    username: openstackusername,
+                                    password: aProvider.password,
+                                    host: openstackhost,
+                                    tenantid: openstacktenantid,
+                                    tenantname: openstacktenantname,
+                                    projectname: openstackprojectname,
+                                    providerName: providerName,
+                                    serviceendpoints: serviceendpoints,
+                                    keyname: openstackkeyname,
+                                    orgId: orgId
+                                };
+                                updateDB(providerData);
+
+                            } else {
+                                res.status(404).send("Provider not found");
+                            }
+                        });
+
+
+                    }
+                } else {
+                    res.status(403).send("Forbidden");
+                }
+            });
+        });
+    });
+
+    // Delete a particular AWS Provider.
+    app.delete('/openstack/providers/:providerId', function (req, res) {
+        logger.debug("Enter delete() for /openstack/providers/%s", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var providerId = req.params.providerId.trim();
+
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    openstackProvider.getopenstackProviderById(providerId, function (err, aProvider) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aProvider) {
+                            VMImage.getImageByProviderId(providerId, function (err, anImage) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+                                if (anImage.length) {
+                                    res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
+                                    return;
+                                }
+                                blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (providers.length > 0) {
+                                        res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
+                                        return;
+                                    }
+                                    openstackProvider.removeopenstackProviderById(providerId, function (err, deleteCount) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (deleteCount) {
+                                            instanceService.removeInstancesByProviderId(providerId, function (err, data) {
+                                                if (err) {
+                                                    logger.error(err);
+                                                    res.status(500).send(errorResponses.db.error);
+                                                    return;
+                                                } else {
+                                                    settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
+                                                        if (err) {
+                                                            logger.error(err);
+                                                            res.status(500).send(errorResponses.db.error);
+                                                            return;
+                                                        } else {
+                                                            logger.debug("Enter delete() for openStack/providers/%s", req.params.providerId);
+                                                            res.send({
+                                                                deleteCount: deleteCount
+                                                            });
+                                                        }
+                                                    })
+                                                }
+                                            })
+                                        } else {
+                                            res.send(400);
+                                            return;
+                                        }
+                                    });
+                                });
+                            });
+                        }
+                    });
+                }
+            });
+        });
+    });
+
+
+    // Create AWS Provider.
+    // TODO Use async to reduce callbacks
+    app.post('/aws/providers', function (req, res) {
+        logger.debug("Enter post() for /providers.", typeof req.body.fileName);
+        logger.debug("Req Body for providers ", JSON.stringify(req.body));
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'create';
+        var accessKey = req.body.accessKey;
+        var secretKey = req.body.secretKey;
+        var providerName = req.body.providerName;
+        var providerType = req.body.providerType;
+        var orgId = req.body.orgId;
+        var s3BucketName = req.body.s3BucketName;
+        var plannedCost = req.body.plannedCost;
+        var monitorId = req.body.monitorId;
+        if (plannedCost === null || plannedCost === '') {
+            plannedCost = 0.0;
+        }
+        var isDefault = (req.body.isDefault === 'true') ? true : false;
+        var hasDefaultProvider = false;
+
+        if ((typeof accessKey === 'undefined' || accessKey.length === 0) && !isDefault) {
+            res.status(400).send("Please Enter AccessKey.");
+            return;
+        }
+        if ((typeof secretKey === 'undefined' || secretKey.length === 0) && !isDefault) {
+            res.status(400).send("Please Enter SecretKey.");
+            return;
+        }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("Please Enter Name.");
+            return;
+        }
+        if (typeof providerType === 'undefined' || providerType.length === 0) {
+            res.status(400).send("Please Enter ProviderType.");
+            return;
+        }
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(400);
+            res.send("Please Select Any Organization.");
+            return;
+        }
+        AWSProvider.hasDefault(orgId, function (err, result) {
+            if (err) {
+                logger.debug("Error trying to get default user");
+                res.status(500).send("Internal error.");
+                return;
+            } else if (result && isDefault) {
+                logger.debug("Default user already exists");
+                res.status(400).send("Cannot add multiple providers without access credentials for the same organization");
+                return;
+            } else {
+                logger.debug("Adding provider");
+
+                var region;
+                if (typeof req.body.region === 'string') {
+                    logger.debug("inside single region: ", req.body.region);
+                    region = req.body.region;
+                } else {
+                    region = req.body.region[0];
+                }
+                logger.debug("Final Region:  ", region);
+
+                var providerData = {
+                    id: 9,
+                    providerName: providerName,
+                    providerType: providerType,
+                    orgId: orgId,
+                    isDefault: isDefault,
+                    s3BucketName: s3BucketName,
+                    plannedCost: plannedCost,
+                    monitorId: monitorId
+                };
+                var ec2;
+                if (isDefault == true) {
+                    ec2 = new EC2({
+                        "isDefault": true,
+                        "region": region
+                    });
+                } else {
+                    ec2 = new EC2({
+                        "access_key": accessKey,
+                        "secret_key": secretKey,
+                        "region": region
+                    });
+
+                    providerData.accessKey = cryptography.encryptText(accessKey, cryptoConfig.encryptionEncoding,
+                        cryptoConfig.decryptionEncoding);
+                    providerData.secretKey = cryptography.encryptText(secretKey, cryptoConfig.encryptionEncoding,
+                        cryptoConfig.decryptionEncoding);
+                }
+
+                usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset,
+                    function (err, data) {
+                        if (!err) {
+                            if (data == false) {
+                                logger.debug('No permission to ' + permissionto + ' on ' + category);
+                                res.send(401, "You don't have permission to perform this operation.");
+                                return;
+                            }
+                        } else {
+                            logger.error("Hit and error in haspermission:", err);
+                            res.send(500);
+                            return;
+                        }
+
+                        masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                            if (err) {
+                                res.status(500).send("Failed to fetch User.");
+                                return;
+                            }
+                            if (anUser) {
+                                ec2.describeKeyPairs(function (err, data) {
+                                    if (err && isDefault) {
+                                        logger.debug("Unable to get AWS Keypairs");
+                                        res.status(500).send("Not able to get catalyst instance metadata.");
+                                        return;
+                                    } else if (err) {
+                                        logger.debug("Unable to get AWS Keypairs");
+                                        res.status(500).send("Invalid AccessKey or SecretKey.");
+                                        return;
+                                    } else {
+                                        logger.debug("Able to get AWS Keypairs. %s", JSON.stringify(data));
+                                        AWSProvider.getAWSProviderByName(providerData.providerName, providerData.orgId,
+                                            function (err, prov) {
+                                                if (err) {
+                                                    logger.error("err. ", err);
+                                                }
+                                                if (prov) {
+                                                    logger.debug("getAWSProviderByName: ", JSON.stringify(prov));
+                                                    res.status(409).send("Provider name already exist.");
+                                                    return;
+                                                }
+                                                AWSProvider.createNew(providerData, function (err, provider) {
+                                                    if (err) {
+                                                        logger.error("err. ", err);
+                                                        res.status(500).send("Failed to create Provider.");
+                                                        return;
+                                                    }
+                                                    AWSKeyPair.createNew(req, provider._id, function (err, keyPair) {
+                                                        masterUtil.getOrgByRowId(providerData.orgId, function (err, orgs) {
+                                                            if (err) {
+                                                                res.status(500).send("Not able to fetch org.");
+                                                                return;
+                                                            }
+                                                            trackSettingWizard(providerData.orgId, function (err, data) {
+                                                                if (err) {
+                                                                    res.status(500).send("Not able to update wizards.");
+                                                                    return;
+                                                                }
+                                                                if (orgs.length > 0) {
+                                                                    if (keyPair) {
+                                                                        var dommyProvider = {
+                                                                            _id: provider._id,
+                                                                            id: 9,
+                                                                            //accessKey: provider.accessKey,
+                                                                            //secretKey: provider.secretKey,
+                                                                            providerName: provider.providerName,
+                                                                            providerType: provider.providerType,
+                                                                            s3BucketName: provider.s3BucketName,
+                                                                            orgId: orgs[0].rowid,
+                                                                            orgName: orgs[0].orgname,
+                                                                            plannedCost: provider.plannedCost,
+                                                                            monitorId: provider.monitorId,
+                                                                            __v: provider.__v,
+                                                                            keyPairs: keyPair
+                                                                        };
+                                                                        res.send(dommyProvider);
+                                                                        return;
+                                                                    }
+                                                                }
+                                                            });
+                                                        })
+                                                    });
+                                                    logger.debug("Exit post() for /providers");
+                                                });
+                                            });
+                                    }
+                                });
+                            }
+                        });
+                    });
+            }
+        });
+    });
+
+    // Return list of all available AWS Providers.
+    app.get('/aws/providers', function (req, res) {
+        logger.debug("Enter get() for /providers");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        AWSProvider.getAWSProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers && providers.length > 0) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    getMonitorDetail(providers[i], function (data) {
+                                        providersList.push(data);
+                                        if (providers.length === providersList.length) {
+                                            res.send(providersList);
+                                            return;
+                                        }
+                                    });
+
+
+                                    /*var keys = [];
+                                     keys.push(providers[i].accessKey);
+                                     keys.push(providers[i].secretKey);
+                                     cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                                     cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
+                                     if (err) {
+                                     res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                     return;
+                                     }
+                                     providers[i].accessKey = decryptedKeys[0];
+                                     providers[i].secretKey = decryptedKeys[1];
+                                     
+                                     });*/
+                                }
+                            } else {
+                                res.send(200, []);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        AWSProvider.getAWSProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = [];
+                            if (providers === null) {
+                                res.send(providersList);
+                                return;
+                            }
+                            if (providers.length > 0) {
+                                for (var i = 0; i < providers.length; i++) {
+                                    getMonitorDetail(providers[i], function (data) {
+                                        providers[i] = data;
+                                        providersList.push(providers[i]);
+                                        if (providers.length === providersList.length) {
+                                            res.send(providersList);
+                                            return;
+                                        }
+                                    });
+
+                                    /*var keys = [];
+                                     keys.push(providers[i].accessKey);
+                                     keys.push(providers[i].secretKey);
+                                     cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                                     cryptoConfig.encryptionEncoding, function(err, decryptedKeys) {
+                                     if (err) {
+                                     res.sned(500, "Failed to decrypt accessKey or secretKey");
+                                     return;
+                                     }
+                                     //providers[i].accessKey = decryptedKeys[0];
+                                     //providers[i].secretKey = decryptedKeys[1];
+                                     providersList.push(providers[i]);
+                                     if (providers.length === providersList.length) {
+                                     res.send(providersList);
+                                     return;
+                                     }
+                                     });*/
+                                }
+                            } else {
+                                res.send(providersList);
+                                return;
+                            }
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+    // Update a particular AWS Provider
+    app.post('/aws/providers/:providerId/update', function (req, res) {
+        logger.debug("Enter post() for /providers/%s/update", req.params.providerId);
+        logger.debug("Req Body for providers ", JSON.stringify(req.body));
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'modify';
+        if (req.body.accessKey != undefined)
+            var accessKey = req.body.accessKey.trim();
+
+        if (req.body.secretKey != undefined)
+            var secretKey = req.body.secretKey.trim();
+        var providerName = req.body.providerName.trim();
+        var providerId = req.params.providerId.trim();
+        var orgId = req.body.orgId;
+        var s3BucketName = req.body.s3BucketName;
+        var plannedCost = req.body.plannedCost;
+        var monitorId = req.body.monitorId;
+        if (plannedCost === null || plannedCost === '') {
+            plannedCost = 0.0;
+        }
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(400).send("{Please Enter ProviderId.}");
+            return;
+        }
+
+        // if (typeof accessKey === 'undefined' || accessKey.length === 0) {
+        // 	res.status(400).send("{Please Enter AccessKey.}");
+        // 	return;
+        // }
+        // if (typeof secretKey === 'undefined' || secretKey.length === 0) {
+        // 	res.status(400).send("{Please Enter SecretKey.}");
+        // 	return;
+        // }
+        if (typeof providerName === 'undefined' || providerName.length === 0) {
+            res.status(400).send("{Please Enter Name.}");
+            return;
+        }
+
+        function encryptKeys(keys) {
+            cryptography.encryptMultipleText(keys, cryptoConfig.encryptionEncoding, cryptoConfig.decryptionEncoding, function (err, encryptedKeys) {
+                if (err) {
+                    res.status(500).send("Failed to encrypt accessKey or secretKey");
+                    return;
+                }
+                var providerData = {
+                    id: 9,
+                    accessKey: encryptedKeys[0],
+                    secretKey: encryptedKeys[1],
+                    providerName: providerName,
+                    orgId: orgId,
+                    s3BucketName: s3BucketName,
+                    plannedCost: plannedCost,
+                    monitorId: monitorId
+                };
+                updateInDb(providerData);
+            });
+        }
+
+        function updateInDb(providerData) {
+            AWSProvider.updateAWSProviderById(providerId, providerData, function (err, updateCount) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                }
+                if (typeof req.body.keyPairName === 'undefined') {
+                    res.send({
+                        updateCount: updateCount
+                    });
+                    return;
+                } else {
+                    AWSKeyPair.createNew(req, providerId, function (err, keyPair) {
+                        if (updateCount) {
+                            res.send({
+                                updateCount: updateCount
+                            });
+                        } else {
+                            res.send(400);
+                        }
+                    });
+                }
+            });
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+
+                    if (accessKey && secretKey) {
+                        var keys = [];
+                        keys.push(accessKey);
+                        keys.push(secretKey);
+                        encryptKeys(keys)
+                    } else {
+                        AWSProvider.getAWSProviderById(providerId, function (err, aProvider) {
+                            if (err) {
+                                res.status(500).send("Failed to fetch Keypairs.");
+                                return;
+                            }
+                            var providerData = {
+                                id: 9,
+                                accessKey: aProvider.accessKey,
+                                secretKey: aProvider.secretKey,
+                                s3BucketName: s3BucketName,
+                                providerName: providerName,
+                                plannedCost: plannedCost,
+                                monitorId: monitorId,
+                                orgId: orgId
+                            };
+
+                            updateInDb(providerData);
+                        });
+
+                    }
+                }
+            });
+        });
+
+
+    });
+
+    // Delete a particular AWS Provider.
+    app.delete('/aws/providers/:providerId', function (req, res) {
+        logger.debug("Enter delete() for /providers/%s", req.params.providerId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var providerId = req.params.providerId.trim();
+        if (typeof providerId === 'undefined' || providerId.length === 0) {
+            res.status(500).send("Please Enter ProviderId.");
+            return;
+        }
+
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    AWSProvider.getAWSProviderById(providerId, function (err, aProvider) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aProvider) {
+                            VMImage.getImageByProviderId(providerId, function (err, anImage) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+                                if (anImage.length > 0) {
+                                    res.send(403, "Provider already used by Some Images.To delete provider please delete respective Images first.");
+                                    return;
+                                }
+                                blueprintModel.getBlueprintsByProviderId(providerId, function (err, providers) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (providers.length > 0) {
+                                        res.send(403, "Provider already used by Some Blueprints.To delete provider please delete respective Blueprints first.");
+                                        return;
+                                    }
+                                    AWSProvider.removeAWSProviderById(providerId, function (err, deleteCount) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (deleteCount) {
+                                            instanceService.removeInstancesByProviderId(providerId, function (err, data) {
+                                                if (err) {
+                                                    logger.error(err);
+                                                    res.status(500).send(errorResponses.db.error);
+                                                    return;
+                                                } else {
+                                                    settingsService.trackSettingWizard('provider', aProvider.orgId[0], function (err, results) {
+                                                        if (err) {
+                                                            logger.error(err);
+                                                            res.status(500).send(errorResponses.db.error);
+                                                            return;
+                                                        } else {
+                                                            logger.debug("Enter delete() for aws/providers/%s", req.params.providerId);
+                                                            res.send({
+                                                                deleteCount: deleteCount
+                                                            });
+                                                        }
+                                                    })
+                                                }
+                                            })
+                                        } else {
+                                            res.send(400);
+                                        }
+                                    });
+                                });
+                            });
+                        }
+                    });
+                }
+            });
+        });
+    });
+
+    // Delete a particular AWS Provider.
+    app.delete('/aws/providers/keypairs/:keyPairId', function (req, res) {
+        logger.debug("Enter delete() for /aws/providers/keypairs/%s", req.params.keyPairId);
+        var user = req.session.user;
+        var category = configmgmtDao.getCategoryFromID("9");
+        var permissionto = 'delete';
+        var keyPairId = req.params.keyPairId.trim();
+        if (typeof keyPairId === 'undefined' || keyPairId.length === 0) {
+            res.status(500).send("Please Enter keyPairId.");
+            return;
+        }
+        usersDao.haspermission(user.cn, category, permissionto, null, req.session.user.permissionset, function (err, data) {
+            if (!err) {
+                logger.debug('Returned from haspermission : ' + data + ' : ' + (data == false));
+                if (data == false) {
+                    logger.debug('No permission to ' + permissionto + ' on ' + category);
+                    res.send(401, "You don't have permission to perform this operation.");
+                    return;
+                }
+            } else {
+                logger.error("Hit and error in haspermission:", err);
+                res.send(500);
+                return;
+            }
+
+            masterUtil.getLoggedInUser(user.cn, function (err, anUser) {
+                if (err) {
+                    res.status(500).send("Failed to fetch User.");
+                }
+                if (anUser) {
+                    if (data && anUser.orgname_rowid[0] !== "") {
+                        logger.debug("Inside check not authorized.");
+                        res.send(401, "You don't have permission to perform this operation.");
+                        return;
+                    }
+                    blueprints.getBlueprintByKeyPairId(keyPairId, function (err, aBluePrint) {
+                        if (err) {
+                            logger.error(err);
+                            res.status(500).send(errorResponses.db.error);
+                            return;
+                        }
+                        if (aBluePrint.length) {
+                            res.send(403, "KeyPair already used by Some BluePrints.To delete KeyPair please delete respective BluePrints First.");
+                            return;
+                        } else {
+                            instances.getInstanceByKeyPairId(keyPairId, function (err, anInstance) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+                                if (anInstance.length) {
+                                    res.status(403).send("KeyPair is already used by Instance.");
+                                } else {
+                                    AWSKeyPair.removeAWSKeyPairById(keyPairId, function (err, deleteCount) {
+                                        if (deleteCount) {
+                                            logger.debug("KeyPair deleted", keyPairId);
+                                            res.send({
+                                                deleteCount: deleteCount
+                                            });
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        });
+    });
+    // Return all available security groups from AWS.
+    app.post('/aws/providers/securitygroups', function (req, res) {
+        logger.debug("Get security groups");
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.getSecurityGroups(function (err, data) {
+                if (err) {
+                    logger.error("Unable to get securitygroups Keypairs: ", err);
+                    res.status(500).send("Invalid AccessKey or SecretKey.");
+                    return;
+                }
+                res.send(data);
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+    });
+
+    // Return all available keypairs from AWS.
+    app.post('/aws/providers/keypairs/list', function (req, res) {
+        logger.debug("Get provider keypairs for a region");
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.describeKeyPairs(function (err, data) {
+                if (err && isDefault) {
+                    logger.error("Unable to get AWS Keypairs: ", err);
+                    // res.status(500).send('Invalid credentials \n' + 'ERROR: ' + err.message);
+                    res.status(500).send(err.message);
+                    return;
+                } else if (err) {
+                    logger.error("Unable to get AWS Keypairs: ", err);
+                    // res.status(500).send('Invalid credentials \n' + ' ERROR: ' + err.message);
+                    res.status(500).send(err.message);
+                    return;
+                } else {
+                    res.send(data);
+                }
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+    });
+
+    // Return all available security groups from AWS for VPC.
+    app.post('/aws/providers/vpc/:vpcId/securitygroups', function (req, res) {
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.getSecurityGroupsForVPC(req.params.vpcId, function (err, data) {
+                if (err) {
+                    logger.error("Unable to get AWS Security Groups for VPC.");
+                    // res.status(500).send("Unable to get AWS Security Groups for VPC.");
+                    res.status(500).send(err.message);
+                    return;
+                }
+                res.send(data);
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+
+    });
+
+    // Return all VPCs w.r.t. region
+    app.post('/aws/providers/describe/vpcs', function (req, res) {
+        logger.debug("Enter describeVpcs ");
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.describeVpcs(function (err, data) {
+                if (err) {
+                    logger.error("Unable to describe Vpcs from AWS.", err);
+                    // res.status(500).send("Unable to Describe Vpcs from AWS.");
+                    res.status(500).send(err.message);
+                    return;
+                }
+                res.send(data);
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+    });
+
+    // Return all Subnets w.r.t. vpc
+    app.post('/aws/providers/vpc/:vpcId/subnets', function (req, res) {
+        logger.debug("Enter describeSubnets ");
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.describeSubnets(req.params.vpcId, function (err, data) {
+                if (err) {
+                    logger.error("Unable to describeSubnets from AWS.", err);
+                    // res.status(500).send("Unable to describeSubnets from AWS.");
+                    res.status(500).send(err.message);
+                    return;
+                }
+                res.send(data);
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+    });
+
+    app.get('/aws/providers/permission/set', function (req, res) {
+        masterUtil.checkPermission(req.session.user.cn, function (err, permissionSet) {
+            if (err) {
+                res.status(500).send("Error for permissionSet.");
+            }
+            if (permissionSet) {
+                res.send(permissionSet);
+            } else {
+                res.send([]);
+            }
+        });
+    });
+
+    // Return AWS Providers respect to orgid.
+    app.get('/aws/providers/org/:orgId', function (req, res) {
+        logger.debug("Enter get() for /providers/org/%s", req.params.orgId);
+        var orgId = req.params.orgId.trim();
+        if (typeof orgId === 'undefined' || orgId.length === 0) {
+            res.status(500).send("Please Enter orgId.");
+            return;
+        }
+        AWSProvider.getAWSProvidersByOrgId(orgId, function (err, providers) {
+            if (err) {
+                logger.error(err);
+                res.status(500).send(errorResponses.db.error);
+                return;
+            }
+            if (providers) {
+                for (var i = 0; i < providers.length; i++) {
+                    delete providers[i].accessKey;
+                    delete providers[i].secretKey;
+                }
+                res.send(providers);
+                return;
+            } else {
+                res.send([]);
+                return;
+            }
+        });
+    });
+
+
+    // Return list of all types of available providers.
+    app.get('/allproviders/list', function (req, res) {
+        logger.debug("Enter get() for /allproviders/list");
+        var loggedInUser = req.session.user.cn;
+        masterUtil.getLoggedInUser(loggedInUser, function (err, anUser) {
+            if (err) {
+                res.status(500).send("Failed to fetch User.");
+                return;
+            }
+            if (!anUser) {
+                res.status(500).send("Invalid User.");
+                return;
+            }
+            if (anUser.orgname_rowid[0] === "") {
+                masterUtil.getAllActiveOrg(function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        AWSProvider.getAWSProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = {};
+                            if (providers && providers.length > 0) {
+                                var awsProviderList = [];
+                                for (var i = 0; i < providers.length; i++) {
+                                    awsProviderList.push(providers[i]);
+                                }
+                                providersList.awsProviders = awsProviderList;
+                            } else {
+                                providersList.awsProviders = [];
+                            }
+
+                            openstackProvider.getopenstackProvidersForOrg(orgList, function (err, openstackProviders) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+
+                                if (openstackProviders != null) {
+                                    if (openstackProviders.length > 0) {
+                                        for (var i = 0; i < openstackProviders.length; i++) {
+                                            openstackProviders[i].password = undefined;
+                                        }
+                                        providersList.openstackProviders = openstackProviders;
+                                    }
+                                } else {
+                                    providersList.openstackProviders = [];
+                                }
+
+                                vmwareProvider.getvmwareProvidersForOrg(orgList, function (err, vmwareProviders) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (vmwareProviders != null) {
+                                        if (vmwareProviders.length > 0) {
+                                            for (var i = 0; i < vmwareProviders.length; i++) {
+                                                vmwareProviders[i].password = undefined;
+                                            }
+                                            providersList.vmwareProviders = vmwareProviders;
+                                        }
+                                    } else {
+                                        providersList.vmwareProviders = [];
+                                    }
+
+                                    hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function (err, hpCloudProviders) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (hpCloudProviders != null) {
+                                            for (var i = 0; i < hpCloudProviders.length; i++) {
+                                                hpCloudProviders[i]['providerType'] = hpCloudProviders[i]['providerType'].toUpperCase();
+                                            }
+                                            if (hpCloudProviders.length > 0) {
+                                                providersList.hpPlublicCloudProviders = hpCloudProviders;
+                                            }
+                                        } else {
+                                            providersList.hpPlublicCloudProviders = [];
+                                        }
+
+                                        azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function (err, azureProviders) {
+
+                                            if (err) {
+                                                logger.error(err);
+                                                res.status(500).send(errorResponses.db.error);
+                                                return;
+                                            }
+                                            if (azureProviders != null) {
+
+                                                for (var i = 0; i < azureProviders.length; i++) {
+                                                    azureProviders[i].clientId = undefined;
+                                                    azureProviders[i].clientSecret = undefined;
+                                                    azureProviders[i].tenant = undefined;
+                                                    azureProviders[i]['providerType'] = azureProviders[i]['providerType'].toUpperCase();
+                                                }
+                                                if (azureProviders.length > 0) {
+                                                    providersList.azureProviders = azureProviders;
+                                                    res.send(providersList);
+                                                    return;
+                                                }
+                                            } else {
+                                                providersList.azureProviders = [];
+                                                res.send(200, providersList);
+                                                return;
+                                            }
+                                        });
+
+                                    });
+
+                                });
+
+                            });
+
+                        });
+                    } else {
+                        res.status(200).send([]);
+                        return;
+                    }
+                });
+            } else {
+                masterUtil.getOrgs(loggedInUser, function (err, orgList) {
+                    if (err) {
+                        res.status(500).send('Not able to fetch Orgs.');
+                        return;
+                    }
+                    if (orgList) {
+                        AWSProvider.getAWSProvidersForOrg(orgList, function (err, providers) {
+                            if (err) {
+                                logger.error(err);
+                                res.status(500).send(errorResponses.db.error);
+                                return;
+                            }
+                            var providersList = {};
+                            if (providers.length > 0) {
+                                var awsProviderList = [];
+                                for (var i = 0; i < providers.length; i++) {
+                                    awsProviderList.push(providers[i]);
+                                }
+                                providersList.awsProviders = awsProviderList;
+                            } else {
+                                providersList.awsProviders = [];
+                            }
+
+                            openstackProvider.getopenstackProvidersForOrg(orgList, function (err, openstackProviders) {
+                                if (err) {
+                                    logger.error(err);
+                                    res.status(500).send(errorResponses.db.error);
+                                    return;
+                                }
+
+                                if (openstackProviders != null) {
+                                    if (openstackProviders.length > 0) {
+                                        for (var i = 0; i < openstackProviders.length; i++) {
+                                            openstackProviders[i].password = undefined;
+                                        }
+                                        providersList.openstackProviders = openstackProviders;
+                                    }
+                                } else {
+                                    providersList.openstackProviders = [];
+                                }
+
+                                vmwareProvider.getvmwareProvidersForOrg(orgList, function (err, vmwareProviders) {
+                                    if (err) {
+                                        logger.error(err);
+                                        res.status(500).send(errorResponses.db.error);
+                                        return;
+                                    }
+                                    if (vmwareProviders != null) {
+                                        if (vmwareProviders.length > 0) {
+                                            for (var i = 0; i < vmwareProviders.length; i++) {
+                                                vmwareProviders[i].password = undefined;
+                                            }
+                                            providersList.vmwareProviders = vmwareProviders;
+                                        }
+                                    } else {
+                                        providersList.vmwareProviders = [];
+                                    }
+
+                                    hppubliccloudProvider.gethppubliccloudProvidersForOrg(orgList, function (err, hpCloudProviders) {
+                                        if (err) {
+                                            logger.error(err);
+                                            res.status(500).send(errorResponses.db.error);
+                                            return;
+                                        }
+                                        if (hpCloudProviders != null) {
+                                            for (var i = 0; i < hpCloudProviders.length; i++) {
+                                                hpCloudProviders[i]['providerType'] = hpCloudProviders[i]['providerType'].toUpperCase();
+                                            }
+                                            if (hpCloudProviders.length > 0) {
+                                                providersList.hpPlublicCloudProviders = hpCloudProviders;
+                                            }
+                                        } else {
+                                            providersList.hpPlublicCloudProviders = [];
+                                        }
+
+                                        azurecloudProvider.getAzureCloudProvidersForOrg(orgList, function (err, azureProviders) {
+                                            if (err) {
+                                                logger.error(err);
+                                                res.status(500).send(errorResponses.db.error);
+                                                return;
+                                            }
+                                            if (azureProviders != null) {
+                                                for (var i = 0; i < azureProviders.length; i++) {
+                                                    azureProviders[i].clientId = undefined;
+                                                    azureProviders[i].clientSecret = undefined;
+                                                    azureProviders[i].tenant = undefined;
+                                                    azureProviders[i]['providerType'] = azureProviders[i]['providerType'].toUpperCase();
+                                                }
+                                                if (azureProviders.length > 0) {
+                                                    providersList.azureProviders = azureProviders;
+                                                    res.send(providersList);
+                                                    return;
+                                                }
+                                            } else {
+                                                providersList.azureProviders = [];
+                                                res.send(200, providersList);
+                                                return;
+                                            }
+                                        });
+
+                                    });
+
+                                });
+
+                            });
+
+                        });
+                    } else {
+                        res.send(200, []);
+                        return;
+                    }
+                });
+            }
+        });
+    });
+
+
+    // List out all aws nodes.
+    app.post('/aws/providers/node/list', function (req, res) {
+        logger.debug("Enter List AWS Nodes: ");
+
+        var isDefault = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey, isDefault) {
+            if (isDefault) {
+                var ec2 = new EC2({
+                    "isDefault": true,
+                    "region": req.body.region
+                });
+            } else {
+                var ec2 = new EC2({
+                    "access_key": accessKey,
+                    "secret_key": secretKey,
+                    "region": req.body.region
+                });
+            }
+
+            ec2.listInstances(function (err, nodes) {
+                if (err) {
+                    logger.error("Unable to list nodes from AWS.", err);
+                    // res.status(500).send("Unable to list nodes from AWS.");
+                    res.status(500).send(err.message);
+                    return;
+                }
+                logger.debug("Success to list nodes from AWS.");
+                var nodeList = [];
+                for (var i = 0; i < nodes.Reservations.length; i++) {
+                    var instance = {
+                        "instance": nodes.Reservations[i].Instances[0].InstanceId,
+                        "privateIp": nodes.Reservations[i].Instances[0].PrivateIpAddress,
+                        "publicIp": nodes.Reservations[i].Instances[0].PublicIpAddress,
+                        "privateDnsName": nodes.Reservations[i].Instances[0].PrivateDnsName
+                    };
+                    nodeList.push(instance);
+                }
+                var nodeListLength = nodeList.length;
+                logger.debug("I am in count of Total Instances", nodeListLength);
+                res.send(nodeList);
+            });
+        }
+
+        if (isDefault) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+
+
+    });
+    // List out all Active AWS nodes.
+    app.post('/aws/providers/activenode/list', function (req, res) {
+        logger.debug("Enter List Active AWS Nodes: ");
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey) {
+            var ec2 = new EC2({
+                "access_key": accessKey,
+                "secret_key": secretKey,
+                "region": req.body.region
+            });
+
+            ec2.listActiveInstances(function (err, nodes) {
+                if (err) {
+                    logger.debug("Unable to list nodes from AWS.", err);
+                    // res.send("Unable to list nodes from AWS.", 500);
+                    res.status(500).send(err.message);
+                    return;
+                }
+                logger.debug("Success to list nodes from AWS.");
+                var nodeList = [];
+                for (var i = 0; i < nodes.Reservations.length; i++) {
+                    var instance = {
+                        "instance": nodes.Reservations[i].Instances[0].InstanceId,
+                        "privateIp": nodes.Reservations[i].Instances[0].PrivateIpAddress,
+                        "publicIp": nodes.Reservations[i].Instances[0].PublicIpAddress,
+                        "privateDnsName": nodes.Reservations[i].Instances[0].PrivateDnsName
+                    };
+                    nodeList.push(instance);
+                }
+                var nodeListLength = nodeList.length;
+                logger.debug("I am in count of Active Instances", nodeListLength);
+                res.send(nodeList);
+            });
+        }
+
+        if (defaultProvider) {
+            makeRequest(null, null, true);
+        } else if (req.body.providerId) {
+            AWSProvider.getAWSProviderById(req.body.providerId, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                } else if (aProvider && aProvider.isDefault) {
+                    makeRequest(null, null, true);
+                } else if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding,
+                        cryptoConfig.encryptionEncoding,
+                        function (err, decryptedKeys) {
+                            if (err) {
+                                logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                                res.status(500).send("Failed to decrypt accessKey or secretKey");
+                                return;
+                            }
+                            makeRequest(decryptedKeys[0], decryptedKeys[1], false);
+                        });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey, false);
+        }
+    });
+
+    app.get('/aws/dashboard/providers/:id', function (req, res) {
+        var client = new rc();
+        var id = req.params.id;
+
+        var defaultProvider = (req.body.isDefault === 'true') ? true : false;
+
+        function makeRequest(accessKey, secretKey) {
+            cost.getcost(accessKey, secretKey, function (err, cost) {
+                res.status(200).send(cost);
+            });
+        }
+
+        if (id) {
+            AWSProvider.getAWSProviderById(id, function (err, aProvider) {
+                if (err) {
+                    logger.error(err);
+                    res.status(500).send(errorResponses.db.error);
+                    return;
+                }
+                if (aProvider) {
+                    var keys = [];
+                    keys.push(aProvider.accessKey);
+                    keys.push(aProvider.secretKey);
+                    cryptography.decryptMultipleText(keys, cryptoConfig.decryptionEncoding, cryptoConfig.encryptionEncoding, function (err, decryptedKeys) {
+                        if (err) {
+                            logger.error("Failed to decrypt accessKey or secretKey: ", err);
+                            res.status(500).send("Failed to decrypt accessKey or secretKey");
+                            return;
+                        }
+                        makeRequest(decryptedKeys[0], decryptedKeys[1]);
+                    });
+                } else {
+                    res.status(404).send("Provider not found");
+                }
+            });
+
+        } else {
+            makeRequest(req.body.accessKey, req.body.secretKey);
+        }
+    });
+}
+
+function trackSettingWizard(orgId, callback) {
+    if (orgId.length > 0) {
+        settingWizard.getSettingWizardByOrgId(orgId, function (err, settingWizards) {
+            if (err) {
+                logger.error('Hit getting setting wizard error', err);
+                callback(err, null);
+                return;
+            }
+            if (settingWizards.currentStep.name === 'Provider Configuration') {
+                settingWizards.currentStep.nestedSteps[0].isCompleted = true;
+                settingWizard.updateSettingWizard(settingWizards, function (err, data) {
+                    if (err) {
+                        logger.error('Hit updating setting wizard error', err);
+                        callback(err, null);
+                        return;
+                    }
+                    callback(null, data);
+                    return;
+                });
+            } else {
+                callback(null, null);
+                return;
+            }
+        })
+    } else {
+        callback(null, null);
+        return;
+    }
 }
 
-function trackSettingWizard(orgId,callback) {
-	if (orgId.length > 0) {
-		settingWizard.getSettingWizardByOrgId(orgId, function (err, settingWizards) {
-			if (err) {
-				logger.error('Hit getting setting wizard error', err);
-				callback(err, null);
-				return;
-			}
-			if(settingWizards.currentStep.name === 'Provider Configuration') {
-				settingWizards.currentStep.nestedSteps[0].isCompleted = true;
-				settingWizard.updateSettingWizard(settingWizards, function (err, data) {
-					if (err) {
-						logger.error('Hit updating setting wizard error', err);
-						callback(err, null);
-						return;
-					}
-					callback(null, data);
-					return;
-				});
-			}else{
-				callback(null, null);
-				return;
-			}
-		})
-	} else {
-		callback(null, null);
-		return;
-	}
-}
\ No newline at end of file
+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'];
+                }
+            }
+            callback(data);
+        });
+    } else {
+        delete data['monitorId'];
+        data.monitor = null;
+        callback(data);
+    }
+}
diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js
index 5317034c1..081386118 100644
--- a/server/app/routes/v1.0/routes_providercommon.js
+++ b/server/app/routes/v1.0/routes_providercommon.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.
+ */
 
 var logger = require('_pr/logger')(module);
 var configmgmtDao = require('_pr/model/d4dmasters/configmgmt.js');
@@ -24,6 +24,7 @@ var MasterUtils = require('_pr/lib/utils/masterUtil.js');
 var waitForPort = require('wait-for-port');
 var uuid = require('node-uuid');
 var taskStatusModule = require('_pr/model/taskstatus');
+var Cryptography = require('_pr/lib/utils/cryptography');
 var credentialCryptography = require('_pr/lib/credentialcryptography');
 var fileIo = require('_pr/lib/utils/fileio');
 var logsDao = require('_pr/model/dao/logsdao.js');
@@ -41,12 +42,12 @@ var Docker = require('_pr/model/docker.js');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var SSHExec = require('_pr/lib/utils/sshexec');
 // @TODO Authorization to be checked for all end points
-module.exports.setRoutes = function(app, sessionVerificationFunc) {
+module.exports.setRoutes = function (app, sessionVerificationFunc) {
 
     app.all("/providers/*", sessionVerificationFunc);
     // @TODO To be refactored
-    app.get('/providers/:providerId', function(req, res) {
-        AWSProvider.getAWSProviderById(req.params.providerId, function(err, provider) {
+    app.get('/providers/:providerId', function (req, res) {
+        AWSProvider.getAWSProviderById(req.params.providerId, function (err, provider) {
             if (err) {
                 res.status(500).send({
                     message: "Server Behaved Unexpectedly"
@@ -60,7 +61,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 return;
             }
 
-            MasterUtils.getOrgByRowId(provider.orgId[0], function(err, orgs) {
+            MasterUtils.getOrgByRowId(provider.orgId[0], function (err, orgs) {
                 if (err) {
                     res.status(500).send({
                         message: "Server Behaved Unexpectedly"
@@ -98,7 +99,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 },
                 function (paginationReq, next) {
                     paginationReq['providerId'] = req.params.providerId;
-                    paginationReq['searchColumns'] = ['instanceIP', 'instanceState','platformId','hardware.os','projectName','environmentName'];
+                    paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName'];
                     apiUtil.databaseUtil(paginationReq, next);
                 },
                 function (queryObj, next) {
@@ -108,13 +109,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                     apiUtil.changeResponseForJqueryPagination(managedInstances, reqObj, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err)
                     next(err);
                 else
                     return res.status(200).send(results);
             });
-    };
+    }
+    ;
 
     app.get('/providers/:providerId/managedInstances', validate(instanceValidator.get), getManagedInstances);
 
@@ -127,7 +129,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 },
                 function (paginationReq, next) {
                     paginationReq['providerId'] = req.params.providerId;
-                    paginationReq['searchColumns'] = ['instanceIP', 'instanceState','platformId','hardware.os','projectName','environmentName'];
+                    paginationReq['searchColumns'] = ['instanceIP', 'instanceState', 'platformId', 'hardware.os', 'projectName', 'environmentName'];
                     reqData = paginationReq;
                     apiUtil.databaseUtil(paginationReq, next);
                 },
@@ -138,7 +140,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                     apiUtil.paginationResponse(managedInstances, reqData, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err)
                     next(err);
                 else
@@ -153,30 +155,31 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         var reqData = {};
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     apiUtil.paginationRequest(req.query, 'unmanagedInstances', next);
                 },
-                function(paginationReq, next) {
+                function (paginationReq, next) {
                     paginationReq['providerId'] = req.params.providerId;
-                    paginationReq['searchColumns'] = ['ip', 'platformId','os','state','projectName','environmentName','providerData.region'];
+                    paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region'];
                     reqData = paginationReq;
                     apiUtil.databaseUtil(paginationReq, next);
                 },
-                function(queryObj, next) {
+                function (queryObj, next) {
                     unManagedInstancesDao.getByProviderId(queryObj, next);
                 },
-                function(unmanagedInstances, next) {
+                function (unmanagedInstances, next) {
                     apiUtil.paginationResponse(unmanagedInstances, reqData, next);
                 }
 
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err)
                     next(err);
                 else
                     return res.status(200).send(results);
             });
-    };
+    }
+    ;
 
     app.get('/providers/:providerId/unmanagedInstanceList', validate(instanceValidator.get), getUnManagedInstancesList);
 
@@ -184,36 +187,37 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         var reqObj = {};
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     apiUtil.changeRequestForJqueryPagination(req.query, next);
                 },
-                function(reqData, next) {
+                function (reqData, next) {
                     reqObj = reqData;
                     apiUtil.paginationRequest(reqData, 'unmanagedInstances', next);
                 },
-                function(paginationReq, next) {
+                function (paginationReq, next) {
                     paginationReq['providerId'] = req.params.providerId;
-                    paginationReq['searchColumns'] = ['ip', 'platformId','os','state','projectName','environmentName','providerData.region'];
+                    paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'projectName', 'environmentName', 'providerData.region'];
                     apiUtil.databaseUtil(paginationReq, next);
                 },
-                function(queryObj, next) {
+                function (queryObj, next) {
                     unManagedInstancesDao.getByProviderId(queryObj, next);
                 },
-                function(unmanagedInstances, next) {
+                function (unmanagedInstances, next) {
                     apiUtil.changeResponseForJqueryPagination(unmanagedInstances, reqObj, next);
                 }
 
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err)
                     next(err);
                 else
                     return res.status(200).send(results);
             });
-    };
+    }
+    ;
     // @TODO To be refactored and API end point to be changed
-    app.post('/providers/:providerId/sync', function(req, res) {
-        AWSProvider.getAWSProviderById(req.params.providerId, function(err, provider) {
+    app.post('/providers/:providerId/sync', function (req, res) {
+        AWSProvider.getAWSProviderById(req.params.providerId, function (err, provider) {
             if (err) {
                 res.status(500).send({
                     message: "Server Behaved Unexpectedly"
@@ -227,7 +231,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 return;
             }
 
-            configmgmtDao.getEnvNameFromEnvId(req.body.envId, function(err, envName) {
+            configmgmtDao.getEnvNameFromEnvId(req.body.envId, function (err, envName) {
                 if (err) {
                     res.status(500).send({
                         message: "Server Behaved Unexpectedly"
@@ -239,7 +243,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                     var credentials = req.body.credentials;
                     if (req.body.credentials.pemFileData) {
                         credentials.pemFileLocation = appConfig.tempDir + uuid.v4();
-                        fileIo.writeFile(credentials.pemFileLocation, req.body.credentials.pemFileData, null, function(err) {
+                        fileIo.writeFile(credentials.pemFileLocation, req.body.credentials.pemFileData, null, function (err) {
                             if (err) {
                                 logger.error('unable to create pem file ', err);
                                 callback(err, null);
@@ -251,7 +255,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         callback(null, credentials);
                     }
                 }
-                getCredentialsFromReq(function(err, credentials) {
+                getCredentialsFromReq(function (err, credentials) {
                     if (err) {
                         res.status(500).send({
                             message: "Server Behaved Unexpectedly"
@@ -264,7 +268,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         });
                         return;
                     }
-                    MasterUtils.getCongifMgmtsById(req.body.configManagmentId, function(err, infraManagerDetails) {
+                    MasterUtils.getCongifMgmtsById(req.body.configManagmentId, function (err, infraManagerDetails) {
                         if (err) {
                             res.status(500).send({
                                 message: "Server Behaved Unexpectedly"
@@ -279,6 +283,8 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                             return;
                         }
 
+                        logger.debug("infraManagerDetails----------->>", JSON.stringify(infraManagerDetails));
+
                         if (infraManagerDetails.configType === 'chef') {
                             var chef = new Chef({
                                 userChefRepoLocation: infraManagerDetails.chefRepoLocation,
@@ -288,7 +294,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                 hostedChefUrl: infraManagerDetails.url
                             });
 
-                            chef.getEnvironment(envName, function(err, env) {
+                            chef.getEnvironment(envName, function (err, env) {
                                 if (err) {
                                     logger.error("Failed chef.getEnvironment", err);
                                     res.status(500).send({
@@ -299,7 +305,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 
                                 if (!env) {
                                     logger.debug("Blueprint env ID = ", req.query.envId);
-                                    chef.createEnvironment(envName, function(err) {
+                                    chef.createEnvironment(envName, function (err) {
                                         if (err) {
                                             logger.error("Failed chef.getEnvironment", err);
                                             res.status(500).send({
@@ -323,7 +329,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 
                             var ids = req.body.instanceIds;
 
-                            unManagedInstancesDao.getByIds(ids, function(err, unmanagedInstances) {
+                            unManagedInstancesDao.getByIds(ids, function (err, unmanagedInstances) {
                                 if (err) {
                                     res.status(500).send(unmanagedInstances);
                                     return;
@@ -341,7 +347,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                     appUrls = appUrls.concat(appConfig.appUrls);
                                 }
 
-                                credentialCryptography.encryptCredential(credentials, function(err, encryptedCredentials) {
+                                credentialCryptography.encryptCredential(credentials, function (err, encryptedCredentials) {
                                     if (err) {
                                         logger.error("unable to encrypt credentials", err);
                                         res.status(500).send({
@@ -369,21 +375,22 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                             taskstatus.updateTaskStatus(status);
                                         }
 
-                                    };
+                                    }
+                                    ;
 
-                                    taskStatusModule.getTaskStatus(null, function(err, obj) {
+                                    taskStatusModule.getTaskStatus(null, function (err, obj) {
                                         if (err) {
                                             res.send(500);
                                             return;
                                         }
                                         taskstatus = obj;
                                         for (var i = 0; i < unmanagedInstances.length; i++) {
-                                            (function(unmanagedInstance) {
+                                            (function (unmanagedInstance) {
                                                 var openport = 22;
                                                 if (unmanagedInstance.os === 'windows') {
                                                     openport = 5985;
                                                 }
-                                                waitForPort(unmanagedInstance.ip, openport, function(err) {
+                                                waitForPort(unmanagedInstance.ip, openport, function (err) {
                                                     if (err) {
                                                         logger.debug(err);
                                                         updateTaskStatusNode(unmanagedInstance.platformId, "Unable to ssh/winrm into instance " + unmanagedInstance.platformId + ". Cannot sync this node.", true, count);
@@ -395,7 +402,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                         nodeName: unmanagedInstance.platformId,
                                                         nodeEnv: req.body.environmentName
                                                     }
-                                                    checkNodeCredentials(credentials, nodeDetails, function(err, credentialStatus) {
+                                                    checkNodeCredentials(credentials, nodeDetails, function (err, credentialStatus) {
                                                         if (err) {
                                                             logger.error(err);
                                                             res.status(400).send({
@@ -460,7 +467,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                 }
                                                             }
 
-                                                            instancesDao.createInstance(instance, function(err, data) {
+                                                            instancesDao.createInstance(instance, function (err, data) {
                                                                 if (err) {
                                                                     logger.error('Unable to create Instance ', err);
                                                                     updateTaskStatusNode(unmanagedInstance.platformId, "server beahved unexpectedly while importing instance :" + unmanagedInstance.platformId + ". Cannot sync this node.", true, count);
@@ -499,19 +506,19 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                     providerType: "aws",
                                                                     action: "Imported From Provider",
                                                                     logs: [{
-                                                                        err: false,
-                                                                        log: "Bootstrapping instance",
-                                                                        timestamp: new Date().getTime()
-                                                                    }]
+                                                                            err: false,
+                                                                            log: "Bootstrapping instance",
+                                                                            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);
                                                                     }
                                                                 });
 
-                                                                credentialCryptography.decryptCredential(encryptedCredentials, function(err, decryptedCredentials) {
+                                                                credentialCryptography.decryptCredential(encryptedCredentials, function (err, decryptedCredentials) {
                                                                     if (err) {
                                                                         logger.error("unable to decrypt credentials", err);
                                                                         var timestampEnded = new Date().getTime();
@@ -530,7 +537,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                         };
                                                                         instanceLog.endedOn = new Date().getTime();
                                                                         instanceLog.actionStatus = "failed";
-                                                                        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);
                                                                             }
@@ -558,6 +565,34 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                             environment: envName,
                                                                             instanceOS: instance.hardware.os
                                                                         };
+
+
+                                                                        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));
+                                                                            runlist.push(sensuCookBook);
+                                                                            jsonAttributes['sensu-client'] = sensuAttributes;
+
+                                                                            bootstarpOption['runlist'] = runlist;
+                                                                            bootstarpOption['jsonAttributes'] = jsonAttributes;
+
+                                                                        }
                                                                         deleteOptions = {
                                                                             privateKey: decryptedCredentials.pemFileLocation,
                                                                             username: decryptedCredentials.username,
@@ -611,13 +646,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                     //removing files on node to facilitate re-bootstrap
                                                                     logger.debug("Node OS : %s", instance.hardware.os);
                                                                     logger.debug('Cleaning instance');
-                                                                    infraManager.cleanClient(deleteOptions, function(err, retCode) {
+                                                                    infraManager.cleanClient(deleteOptions, function (err, retCode) {
                                                                         logger.debug("Entering chef.bootstarp");
-                                                                        infraManager.bootstrapInstance(bootstarpOption, function(err, code, bootstrapData) {
+                                                                        infraManager.bootstrapInstance(bootstarpOption, function (err, code, bootstrapData) {
 
                                                                             if (err) {
                                                                                 logger.error("knife launch err ==>", err);
-                                                                                instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function(err, updateData) {
+                                                                                instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
 
                                                                                 });
                                                                                 if (err.message) {
@@ -634,7 +669,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                         log: err.message,
                                                                                         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);
                                                                                         }
@@ -656,14 +691,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                 };
                                                                                 instanceLog.actionStatus = "failed";
                                                                                 instanceLog.endedOn = 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);
                                                                                     }
                                                                                 });
                                                                             } else {
                                                                                 if (code == 0) {
-                                                                                    instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function(err, updateData) {
+                                                                                    instancesDao.updateInstanceBootstrapStatus(instance.id, 'success', function (err, updateData) {
                                                                                         if (err) {
                                                                                             logger.error("Unable to set instance bootstarp status. code 0");
                                                                                         } else {
@@ -674,7 +709,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                     // updating puppet node name
                                                                                     var nodeName;
                                                                                     if (bootstrapData && bootstrapData.puppetNodeName) {
-                                                                                        instancesDao.updateInstancePuppetNodeName(instance.id, bootstrapData.puppetNodeName, function(err, updateData) {
+                                                                                        instancesDao.updateInstancePuppetNodeName(instance.id, bootstrapData.puppetNodeName, function (err, updateData) {
                                                                                             if (err) {
                                                                                                 logger.error("Unable to set puppet node name");
                                                                                             } else {
@@ -702,7 +737,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                     };
                                                                                     instanceLog.actionStatus = "success";
                                                                                     instanceLog.endedOn = 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);
                                                                                         }
@@ -721,9 +756,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                             runOptions.password = decryptedCredentials.password;
                                                                                         }
 
-                                                                                        infraManager.runClient(runOptions, function(err, retCode) {
+                                                                                        infraManager.runClient(runOptions, function (err, retCode) {
                                                                                             if (decryptedCredentials.pemFileLocation) {
-                                                                                                fileIo.removeFile(decryptedCredentials.pemFileLocation, function(err) {
+                                                                                                fileIo.removeFile(decryptedCredentials.pemFileLocation, function (err) {
                                                                                                     if (err) {
                                                                                                         logger.debug("Unable to delete temp pem file =>", err);
                                                                                                     } else {
@@ -736,14 +771,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                                 return;
                                                                                             }
                                                                                             // waiting for 30 sec to update node data
-                                                                                            setTimeout(function() {
-                                                                                                infraManager.getNode(nodeName, function(err, nodeData) {
+                                                                                            setTimeout(function () {
+                                                                                                infraManager.getNode(nodeName, function (err, nodeData) {
                                                                                                     if (err) {
                                                                                                         logger.error(err);
                                                                                                         return;
                                                                                                     }
                                                                                                     instanceLog.platform = nodeData.facts.values.operatingsystem;
-                                                                                                    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);
                                                                                                         }
@@ -759,7 +794,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                                     hardwareData.memory.total = nodeData.facts.values.memorysize;
                                                                                                     hardwareData.memory.free = nodeData.facts.values.memoryfree;
                                                                                                     hardwareData.os = instance.hardware.os;
-                                                                                                    instancesDao.setHardwareDetails(instance.id, hardwareData, function(err, updateData) {
+                                                                                                    instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) {
                                                                                                         if (err) {
                                                                                                             logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
                                                                                                         } else {
@@ -771,13 +806,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                         });
 
                                                                                     } else {
-                                                                                        infraManager.getNode(nodeName, function(err, nodeData) {
+                                                                                        infraManager.getNode(nodeName, function (err, nodeData) {
                                                                                             if (err) {
                                                                                                 logger.error(err);
                                                                                                 return;
                                                                                             }
                                                                                             instanceLog.platform = nodeData.automatic.platform;
-                                                                                            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);
                                                                                                 }
@@ -794,7 +829,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                                 hardwareData.memory.free = nodeData.automatic.memory.free;
                                                                                             }
                                                                                             hardwareData.os = instance.hardware.os;
-                                                                                            instancesDao.setHardwareDetails(instance.id, hardwareData, function(err, updateData) {
+                                                                                            instancesDao.setHardwareDetails(instance.id, hardwareData, function (err, updateData) {
                                                                                                 if (err) {
                                                                                                     logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
                                                                                                 } else {
@@ -802,7 +837,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                                 }
                                                                                             });
                                                                                             if (decryptedCredentials.pemFilePath) {
-                                                                                                fileIo.removeFile(decryptedCredentials.pemFilePath, function(err) {
+                                                                                                fileIo.removeFile(decryptedCredentials.pemFilePath, function (err) {
                                                                                                     if (err) {
                                                                                                         logger.error("Unable to delete temp pem file =>", err);
                                                                                                     } else {
@@ -815,7 +850,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 
 
                                                                                     var _docker = new Docker();
-                                                                                    _docker.checkDockerStatus(instance.id, function(err, retCode) {
+                                                                                    _docker.checkDockerStatus(instance.id, function (err, retCode) {
                                                                                         if (err) {
                                                                                             logger.error("Failed _docker.checkDockerStatus", err);
                                                                                             return;
@@ -824,7 +859,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                         }
                                                                                         logger.debug('Docker Check Returned:' + retCode);
                                                                                         if (retCode == '0') {
-                                                                                            instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function(data) {
+                                                                                            instancesDao.updateInstanceDockerStatus(instance.id, "success", '', function (data) {
                                                                                                 logger.debug('Instance Docker Status set to Success');
                                                                                             });
 
@@ -832,7 +867,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                     });
 
                                                                                 } else {
-                                                                                    instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function(err, updateData) {
+                                                                                    instancesDao.updateInstanceBootstrapStatus(instance.id, 'failed', function (err, updateData) {
                                                                                         if (err) {
                                                                                             logger.error("Unable to set instance bootstarp status code != 0");
                                                                                         } else {
@@ -855,7 +890,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                     };
                                                                                     instanceLog.actionStatus = "failed";
                                                                                     instanceLog.endedOn = 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);
                                                                                         }
@@ -863,7 +898,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                 }
                                                                             }
 
-                                                                        }, function(stdOutData) {
+                                                                        }, function (stdOutData) {
 
                                                                             logsDao.insertLog({
                                                                                 referenceId: logsRefernceIds,
@@ -876,13 +911,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                 log: stdOutData.toString('ascii'),
                                                                                 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);
                                                                                 }
                                                                             });
 
-                                                                        }, function(stdErrData) {
+                                                                        }, function (stdErrData) {
 
                                                                             logsDao.insertLog({
                                                                                 referenceId: logsRefernceIds,
@@ -895,7 +930,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                                                 log: stdErrData.toString('ascii'),
                                                                                 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);
                                                                                 }
@@ -944,7 +979,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 }
                 var sshExec = new SSHExec(sshOptions);
 
-                sshExec.exec('echo Welcome', function(err, retCode) {
+                sshExec.exec('echo Welcome', function (err, retCode) {
                     if (err) {
                         callback(err, null);
                         return;
@@ -953,9 +988,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                     } else {
                         callback(null, false);
                     }
-                }, function(stdOut) {
+                }, function (stdOut) {
                     logger.debug(stdOut.toString('ascii'));
-                }, function(stdErr) {
+                }, function (stdErr) {
                     logger.error(stdErr.toString('ascii'));
                 });
             } else {
@@ -965,8 +1000,8 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
     });
 
     /*app.param('providerId', providerService.providerExists);
-    app.param('catalystEntityType', providerService.isValidCatalystEntityType);
-    app.param('catalystEntity', providerService.catalystEntityExists);*/
+     app.param('catalystEntityType', providerService.isValidCatalystEntityType);
+     app.param('catalystEntity', providerService.catalystEntityExists);*/
 
     /**
      * @api {get} /providers/:providerId/tags   Get tags list
@@ -1492,13 +1527,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
                 providerService.getTagsByProvider,
                 providerService.createTagsList
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1512,33 +1547,34 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         var reqData = {};
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     apiUtil.changeRequestForJqueryPagination(req.query, next);
                 },
-                function(reqData, next) {
+                function (reqData, next) {
                     apiUtil.paginationRequest(reqData, 'unassignedInstances', next);
                 },
-                function(paginationReq, next) {
+                function (paginationReq, next) {
                     paginationReq['providerId'] = req.params.providerId;
-                    paginationReq['searchColumns'] = ['ip', 'platformId','os','state','providerData.region'];
+                    paginationReq['searchColumns'] = ['ip', 'platformId', 'os', 'state', 'providerData.region'];
                     reqData = paginationReq;
                     apiUtil.databaseUtil(paginationReq, next);
                 },
-                function(queryObj, next) {
+                function (queryObj, next) {
                     instanceService.getUnassignedInstancesByProvider(queryObj, next);
                 },
-                function(unAssignedInstances, next) {
+                function (unAssignedInstances, next) {
                     apiUtil.changeResponseForJqueryPagination(unAssignedInstances, reqData, next);
                 }
 
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err)
                     next(err);
                 else
                     return res.status(200).send(results);
             });
-    };
+    }
+    ;
 
 
 
@@ -1546,15 +1582,15 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.getTagByNameAndProvider(provider._id, req.params.tagName, next);
                 },
                 providerService.createTagObject
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1571,10 +1607,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     var tagDetails = {
                         'name': req.params.tagName,
                         'description': req.body.description
@@ -1583,7 +1619,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 },
                 providerService.createTagObject
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1597,14 +1633,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.deleteTag(provider, req.params.tagName, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1618,13 +1654,13 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
                 providerService.getTagsByProvider,
                 providerService.createTagMappingList
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1638,16 +1674,16 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.getTagByCatalystEntityTypeAndProvider(provider._id,
                         req.params.catalystEntityType, next);
                 },
                 providerService.createTagMappingObject
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1661,15 +1697,15 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.addMultipleTagMappings(provider._id, req.body, next);
                 },
                 providerService.createTagMappingList
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1683,22 +1719,22 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
     function updateTagMapping(req, res, next) {
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.getTagByCatalystEntityTypeAndProvider(provider._id,
                         req.params.catalystEntityType, next);
                 },
-                function(tag, next) {
+                function (tag, next) {
                     providerService.updateTagMapping(tag, req.body, next);
                 },
-                function(tag, next) {
+                function (tag, next) {
                     providerService.getTagByNameAndProvider(req.params.providerId, tag.name, next);
                 },
                 providerService.createTagMappingObject
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1712,14 +1748,14 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.deleteTagMapping(provider._id, req.params.catalystEntityType, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1733,18 +1769,18 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         async.waterfall(
             [
 
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     providerService.getTagByCatalystEntityTypeAndProvider(provider._id,
                         req.params.catalystEntityType, next);
                 },
-                function(tag, next) {
+                function (tag, next) {
                     providerService.createCatalystEntityMappingObject(tag, req.params.catalystEntityId, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1757,17 +1793,17 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
     function updateUnassignedInstanceTags(req, res, next) {
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     instanceService.updateUnassignedInstanceProviderTags(provider, req.params.instanceId,
                         req.body.tags, next);
                 },
-                function(instance, next) {
+                function (instance, next) {
                     // @TODO Nested callback with anonymous function to be avoided.
                     providerService.getTagMappingsByProviderId(instance.providerId,
-                        function(err, tagMappingsList) {
+                        function (err, tagMappingsList) {
                             if (err) {
                                 next(err);
                             } else {
@@ -1779,7 +1815,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                 },
                 instanceService.createUnassignedInstanceObject
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
@@ -1792,10 +1828,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
     function bulkUpdateUnassignedInstances(req, res, next) {
         async.waterfall(
             [
-                function(next) {
+                function (next) {
                     providerService.checkIfProviderExists(req.params.providerId, next);
                 },
-                function(provider, next) {
+                function (provider, next) {
                     if ('instances' in req.body) {
                         instanceService.bulkUpdateInstanceProviderTags(provider, req.body.instances, next);
                     } else {
@@ -1804,11 +1840,11 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         next(err);
                     }
                 },
-                function(instances, next) {
+                function (instances, next) {
                     instanceService.bulkUpdateUnassignedInstanceTags(instances, next);
                 }
             ],
-            function(err, results) {
+            function (err, results) {
                 if (err) {
                     next(err);
                 } else {
diff --git a/server/app/services/monitorsService.js b/server/app/services/monitorsService.js
new file mode 100644
index 000000000..97f930ea5
--- /dev/null
+++ b/server/app/services/monitorsService.js
@@ -0,0 +1,278 @@
+/*
+ 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.
+ */
+
+const logger = require('_pr/logger')(module);
+const dateUtil = require('_pr/lib/utils/dateUtil');
+const monitorsModel = require('_pr/model/monitors');
+const appConfig = require('_pr/config');
+var fileUpload = require('_pr/model/file-upload/file-upload');
+
+var monitorsService = module.exports = {};
+
+
+monitorsService.checkIfMonitorExists = function (monitorId, callback) {
+    monitorsModel.getById(monitorId, function (err, monitor) {
+        if (err) {
+            var err = new Error('Internal server error');
+            err.status = 500;
+            return callback(err);
+        } else if (!monitor) {
+            var err = new Error('Monitor not found');
+            err.status = 404;
+            return callback(err);
+        } else {
+            return callback(null, monitor);
+        }
+    });
+};
+
+monitorsService.formatResponse = function (monitor, callback) {
+    var formatted = {};
+    switch (monitor.type) {
+        case 'sensu':
+        case 'Sensu':
+            formatted._id = monitor._id;
+            formatted.name = monitor.name;
+            formatted.type = monitor.type;
+            if (monitor.organization.length) {
+                formatted.organization = {
+                    id: monitor.organization[0].rowid,
+                    name: monitor.organization[0].orgname
+                };
+            }
+            formatted.parameters = monitor.parameters;
+            if (formatted.parameters.transportProtocolParameters['password']) {
+                delete formatted.parameters.transportProtocolParameters['password'];
+            }
+            if (monitor.parameters.transportProtocol === 'rabbitmq' && monitor.parameters.transportProtocolParameters.ssl) {
+                fileUpload.getReadStreamFileByFileId(monitor.parameters.transportProtocolParameters.ssl.certChainFileId, function (err, file) {
+                    var certChainFileId =  monitor.parameters.transportProtocolParameters.ssl.certChainFileId;
+                    delete formatted.parameters.transportProtocolParameters.ssl.certChainFileId;
+                    if (err) {
+                        formatted.parameters.transportProtocolParameters.ssl['certChainFile'] = null;
+                    } else {
+                        formatted.parameters.transportProtocolParameters.ssl['certChainFile'] = {};
+                        formatted.parameters.transportProtocolParameters.ssl['certChainFile']['id'] = certChainFileId;
+                        formatted.parameters.transportProtocolParameters.ssl['certChainFile']['name'] = file.fileName;
+                        formatted.parameters.transportProtocolParameters.ssl['certChainFile']['file'] = file.fileData;
+                    }
+                    fileUpload.getReadStreamFileByFileId(monitor.parameters.transportProtocolParameters.ssl.privateKeyFileId, function (err, file) {
+                        var privateKeyFileId =  monitor.parameters.transportProtocolParameters.ssl.privateKeyFileId;
+                        delete formatted.parameters.transportProtocolParameters.ssl.privateKeyFileId;
+                        if (err) {
+                            formatted.parameters.transportProtocolParameters.ssl['privateKeyFile'] = null;
+                        } else {
+                            formatted.parameters.transportProtocolParameters.ssl['privateKeyFile'] = {};
+                            formatted.parameters.transportProtocolParameters.ssl['privateKeyFile']['id'] = privateKeyFileId;
+                            formatted.parameters.transportProtocolParameters.ssl['privateKeyFile']['name'] = file.fileName;
+                            formatted.parameters.transportProtocolParameters.ssl['privateKeyFile']['file'] = file.fileData;
+                        }
+                        callback(formatted);
+                    });
+                });
+            } else {
+                callback(formatted);
+            }
+            break;
+        default:
+            callback(null);
+    }
+};
+
+
+monitorsService.createMonitor = function (monitorsObj, callback) {
+
+    switch (monitorsObj.type) {
+        case 'sensu':
+        case 'Sensu':
+            var saveobj = {};
+            saveobj['orgId'] = monitorsObj['orgId'];
+            saveobj['type'] = monitorsObj['type'];
+            saveobj['name'] = monitorsObj['name'];
+            saveobj['parameters'] = {};
+            saveobj['parameters']['url'] = monitorsObj['parameters']['url'];
+            saveobj['parameters']['transportProtocol'] = monitorsObj['parameters']['transportProtocol'];
+            saveobj['parameters']['transportProtocolParameters'] = {};
+            saveobj['parameters']['transportProtocolParameters']['host'] = monitorsObj['parameters']['transportProtocolParameters']['host'];
+            saveobj['parameters']['transportProtocolParameters']['port'] = monitorsObj['parameters']['transportProtocolParameters']['port'];
+            saveobj['parameters']['transportProtocolParameters']['password'] = monitorsObj['parameters']['transportProtocolParameters']['password'];
+            if (monitorsObj['parameters']['transportProtocol'] === 'rabbitmq') {
+                saveobj['parameters']['transportProtocolParameters']['vhost'] = monitorsObj['parameters']['transportProtocolParameters']['vhost'];
+                saveobj['parameters']['transportProtocolParameters']['user'] = monitorsObj['parameters']['transportProtocolParameters']['user'];
+                saveobj['parameters']['transportProtocolParameters']['heartbeat'] = monitorsObj['parameters']['transportProtocolParameters']['heartbeat'];
+                saveobj['parameters']['transportProtocolParameters']['prefetch'] = monitorsObj['parameters']['transportProtocolParameters']['prefetch'];
+                if (monitorsObj['parameters']['transportProtocolParameters']['ssl']) {
+                    saveobj['parameters']['transportProtocolParameters']['ssl'] = {};
+                    saveobj['parameters']['transportProtocolParameters']['ssl']['certChainFileId'] = monitorsObj['parameters']['transportProtocolParameters']['ssl']['certChainFileId'];
+                    saveobj['parameters']['transportProtocolParameters']['ssl']['privateKeyFileId'] = monitorsObj['parameters']['transportProtocolParameters']['ssl']['privateKeyFileId'];
+                }
+            }
+            monitorsModel.createNew(saveobj, function (err, monitor) {
+                //@TODO To be generalized
+                if (err && err.name === 'ValidationError') {
+                    var err = new Error('Bad Request');
+                    err.status = 400;
+                    callback(err);
+                } else if (err) {
+                    var err = new Error('Internal Server Error');
+                    err.status = 500;
+                    callback(err);
+                } else {
+                    callback(null, monitor);
+                }
+            });
+            break;
+        default:
+            var err = new Error('Bad request');
+            err.status = 400;
+            return callback(err);
+            break;
+    }
+
+};
+
+monitorsService.updateMonitor = function updateMonitor(monitorId, monitorsObj, callback) {
+    switch (monitorsObj.type) {
+        case 'sensu':
+        case 'Sensu':
+            var updateFields = {};
+            updateFields['orgId'] = monitorsObj['orgId'];
+            updateFields['type'] = monitorsObj['type'];
+            updateFields['name'] = monitorsObj['name'];
+            updateFields['parameters.url'] = monitorsObj['parameters']['url'];
+            updateFields['parameters.transportProtocol'] = monitorsObj['parameters']['transportProtocol'];
+            updateFields['parameters.transportProtocolParameters.host'] = monitorsObj['parameters']['transportProtocolParameters']['host'];
+            updateFields['parameters.transportProtocolParameters.port'] = monitorsObj['parameters']['transportProtocolParameters']['port'];
+            if (monitorsObj['parameters']['transportProtocolParameters']['password']) {
+                updateFields['parameters.transportProtocolParameters.password'] = monitorsObj['parameters']['transportProtocolParameters']['password'];
+            }
+            if (monitorsObj['parameters']['transportProtocol'] === 'rabbitmq') {
+                updateFields['parameters.transportProtocolParameters.vhost'] = monitorsObj['parameters']['transportProtocolParameters']['vhost'];
+                updateFields['parameters.transportProtocolParameters.user'] = monitorsObj['parameters']['transportProtocolParameters']['user'];
+                updateFields['parameters.transportProtocolParameters.heartbeat'] = monitorsObj['parameters']['transportProtocolParameters']['heartbeat'];
+                updateFields['parameters.transportProtocolParameters.prefetch'] = monitorsObj['parameters']['transportProtocolParameters']['prefetch'];
+                if (monitorsObj['parameters']['transportProtocolParameters']['ssl']) {
+                    if (monitorsObj['parameters']['transportProtocolParameters']['ssl']['certChainFileId']) {
+                        updateFields['parameters.transportProtocolParameters.ssl.certChainFileId'] = monitorsObj['parameters']['transportProtocolParameters']['ssl']['certChainFileId'];
+                    }
+                    if (monitorsObj['parameters']['transportProtocolParameters']['ssl']['privateKeyFileId']) {
+                        updateFields['parameters.transportProtocolParameters.ssl.privateKeyFileId'] = monitorsObj['parameters']['transportProtocolParameters']['ssl']['privateKeyFileId'];
+                    }
+
+                }
+            }
+            monitorsModel.updateMonitors(monitorId, updateFields, function (err, monitor) {
+                //@TODO To be generalized
+                if (err && err.name === 'ValidationError') {
+                    var err = new Error('Bad Request');
+                    err.status = 400;
+                    callback(err);
+                } else if (err) {
+                    var err = new Error('Internal Server Error');
+                    err.status = 500;
+                    callback(err);
+                } else {
+                    callback(null, monitor);
+                }
+            });
+            break;
+        default:
+            var err = new Error('Bad request');
+            err.status = 400;
+            return callback(err);
+            break;
+    }
+};
+
+monitorsService.deleteMonitors = function (monitorId, callback) {
+    monitorsModel.deleteMonitors(monitorId, function (err, monitor) {
+        if (err) {
+            var err = new Error('Internal server error');
+            err.status = 500;
+            return callback(err);
+        } else if (!monitor) {
+            var err = new Error('Monitor not found');
+            err.status = 404;
+            return callback(err);
+        } else {
+            // @TODO response to be decided
+            return callback(null, {});
+        }
+    });
+};
+
+monitorsService.getMonitors = function (query, callback) {
+    var params = {};
+    logger.debug('get monitors');
+    if ('filterBy' in query) {
+        params = monitorsService.parseFilterBy(query.filterBy);
+    }
+    monitorsModel.getMonitors(params, function (err, monitors) {
+        if (err) {
+            logger.error(err);
+            var err = new Error('Internal Server Error');
+            err.status = 500;
+            callback(err);
+        } else {
+            var res = [];
+            if (monitors.length > 0) {
+                for (i = 0; i < monitors.length; i++) {
+                    monitorsService.formatResponse(monitors[i], function (monitor) {
+                        res.push(monitor);
+                        if (res.length === monitors.length) {
+                            callback(null, res);
+                        }
+                    });
+                }
+            } else {
+                callback(null, res);
+            }
+        }
+    });
+};
+
+monitorsService.getMonitor = function (monitorId, callback) {
+    monitorsModel.getMonitor(monitorId, function (err, monitor) {
+        if (err) {
+            var err = new Error('Internal Server Error');
+            err.status = 500;
+            return callback(err);
+        } else if (!monitor) {
+            var err = new Error('Monitor not found');
+            err.status = 404;
+            return callback(err);
+        } else if (monitor) {
+            monitorsService.formatResponse(monitor, function (monitor) {
+                callback(null, monitor);
+            });
+        }
+    });
+};
+
+// @TODO Query builder to be made generic
+monitorsService.parseFilterBy = function (filterByString) {
+    var filterQuery = {};
+
+    var filters = filterByString.split('+');
+    for (var i = 0; i < filters.length; i++) {
+        var filter = filters[i].split(':');
+        var filterQueryValues = filter[1].split(",");
+
+        filterQuery[filter[0]] = {'$in': filterQueryValues};
+    }
+
+    return filterQuery;
+};
diff --git a/server/app/validators/monitorsValidator.js b/server/app/validators/monitorsValidator.js
new file mode 100644
index 000000000..88f46fe9c
--- /dev/null
+++ b/server/app/validators/monitorsValidator.js
@@ -0,0 +1,89 @@
+/*
+ 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.
+ */
+var Joi = require('joi');
+
+var monitorsValidator = module.exports = {};
+
+monitorsValidator.create = {
+    body: {
+        "orgId": Joi.string().max(40).required(),
+        "name": Joi.string().max(40).required(),
+        "type": Joi.valid('sensu', 'other'),
+        "parameters": Joi.object()
+            .keys({
+                "url": Joi.string(),
+                "transportProtocol": Joi.valid('rabbitmq', 'redis'),
+                "transportProtocolParameters": Joi.object().keys({
+                        "host": Joi.string().required(),
+                        "port": Joi.number().required(),
+                        "vhost": Joi.string(),
+                        "user": Joi.string(),
+                        "password": Joi.string().required(),
+                        "heartbeat": Joi.number(),
+                        "prefetch": Joi.number(),
+                        "ssl": Joi.object().keys({
+                            "certChainFileId": Joi.string().required(),
+                            "privateKeyFileId": Joi.string().required()
+                        })
+                    })
+                    .when('transportProtocol', {
+                        is: 'rabbitmq',
+                        then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() })
+                    })
+            })
+            .required()
+            .when('type', {
+                is: 'sensu',
+                then: Joi.object({ 'url': Joi.required(), 'transportProtocol': Joi.required(), 'transportProtocolParameters': Joi.required() })
+            })
+    }
+};
+
+monitorsValidator.update = {
+    body: {
+        "orgId": Joi.string().max(40).required(),
+        "name": Joi.string().max(40).required(),
+        "type": Joi.valid('sensu', 'other'),
+        "parameters": Joi.object()
+            .keys({
+                "url": Joi.string(),
+                "transportProtocol": Joi.valid('rabbitmq', 'redis'),
+                "transportProtocolParameters": Joi.object().keys({
+                        "host": Joi.string().required(),
+                        "port": Joi.number().required(),
+                        "vhost": Joi.string(),
+                        "user": Joi.string(),
+                        "password": Joi.string(),
+                        "heartbeat": Joi.number(),
+                        "prefetch": Joi.number(),
+                        "ssl": Joi.object().keys({
+                            "certChainFileId": Joi.string(),
+                            "privateKeyFileId": Joi.string()
+                        })
+                    })
+                    .when('transportProtocol', {
+                        is: 'rabbitmq',
+                        then: Joi.object({ 'vhost': Joi.required(), 'user': Joi.required(), 'heartbeat': Joi.required(), 'prefetch': Joi.required() })
+                    })
+            })
+            .required()
+            .when('type', {
+                is: 'sensu',
+                then: Joi.object({ 'url': Joi.required(), 'transportProtocol': Joi.required(), 'transportProtocolParameters': Joi.required() })
+            })
+    }
+};