From d019ef79d074e9c9831d00ee1167e8bc869f2a09 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 26 Aug 2016 18:23:22 +0530
Subject: [PATCH 1/4] CAT-2273 Fixed

---
 client/htmls/public/instanceLog.html          |  24 +--
 .../cronjobs/provider-sync/AWSProviderSync.js |   3 +-
 .../arm-template-blueprint.js                 |  14 +-
 .../cloud-formation-blueprint.js              |  12 +-
 server/app/model/classes/instance/instance.js |  52 ++++-
 server/app/model/log-trail/instanceLog.js     |   2 +-
 server/app/routes/v1.0/routes_arm.js          |  47 +++++
 .../app/routes/v1.0/routes_cloudformation.js  |  31 +--
 server/app/routes/v1.0/routes_instances.js    | 180 +++++++++++++++---
 server/app/services/instanceService.js        |  78 ++++++++
 10 files changed, 363 insertions(+), 80 deletions(-)

diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html
index e11ec4385..f83144e6f 100644
--- a/client/htmls/public/instanceLog.html
+++ b/client/htmls/public/instanceLog.html
@@ -262,14 +262,6 @@ <h4 class="modal-title" id="myModalLabel">
 						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/linux.png' alt='OS'/>");
 					} else if (managnedData[i].os == 'windows') {
 						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/windows.png' alt='OS'/>");
-					} else if (managnedData[i].platform == 'ubuntu' && managnedData[i].bootStrap == 'success') {
-						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/ubuntu.png' alt='OS'/>");
-					} else if (managnedData[i].platform == 'ubuntu' && managnedData[i].bootStrap != 'success') {
-						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/linux.png' alt='OS'/>");
-					} else if (managnedData[i].platform == 'centos' && managnedData[i].bootStrap != 'success') {
-						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/linux.png' alt='OS'/>");
-					} else if (managnedData[i].platform == 'centos' && managnedData[i].bootStrap == 'success') {
-						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/centos.png' alt='OS'/>");
 					} else if (managnedData[i].platform == 'unknown') {
 						$osImg = $("<img class ='imgStyle' src = '../private/img/osIcons/linux.png' alt='OS'/>");
 					} else if (managnedData[i].os == 'linux' && managnedData[i].platform == 'unknown') {
@@ -285,13 +277,17 @@ <h4 class="modal-title" id="myModalLabel">
 					$tr.append($tdOs);
 					if (managnedData[i].status == 'running') {
 						$tdStatus = $("<img title='running' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
-					} else if (managnedData[i].status == 'pending' || managnedData[i].status == 'unknown') {
+					} else if (managnedData[i].status == 'pending' || managnedData[i].status == 'unknown' || managnedData[i].status == 'waiting') {
 						$tdStatus = $("<img title='pending' class ='statusIcon' src = '../private/img/aws_logo_inactive.png' alt='statusType'/>");
 					} else if (managnedData[i].status == 'stopping' || managnedData[i].status == 'paused') {
 						$tdStatus = $("<img title='stopping' class ='statusIcon' src = '../private/img/aws_logo_paused.png' alt='statusType'/>");
-					} else if (managnedData[i].status == 'stopped' || managnedData[i].status == 'terminated') {
+					} else if (managnedData[i].status == 'stopped') {
 						$tdStatus = $("<img title='stopped' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
-					} else {
+					}else if (managnedData[i].status == 'terminated') {
+						$tdStatus = $("<img title='terminated' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+					}else if (managnedData[i].status == 'deleted') {
+						$tdStatus = $("<img title='deleted' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+					}else {
 						$tdStatus = $("<img title='unknown' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}
 					var $tdStatus = $('<td></td>').append($tdStatus);
@@ -325,11 +321,11 @@ <h4 class="modal-title" id="myModalLabel">
 					$tr.append($tdData);
 					if (managnedData[i].actionStatus == 'success') {
 						$tdActionStatus = $("<img title='success' class ='statusIcon' src = '../private/img/aws_logo_started.png' alt='statusType'/>");
-					} else if (managnedData[i].actionStatus == 'pending') {
+					}else if (managnedData[i].actionStatus == 'pending' || managnedData[i].actionStatus == 'waiting') {
 						$tdActionStatus = $("<img title='pending' class ='statusIcon' src = '../private/img/aws_logo_paused.png' alt='statusType'/>");
-					} else if (managnedData[i].actionStatus == 'failed') {
+					}else if (managnedData[i].actionStatus == 'failed') {
 						$tdActionStatus = $("<img title='failed' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
-					} else {
+					}else {
 						$tdActionStatus = $("<img title='failed' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}
 					var $tdActionStatus = $('<td></td>').append($tdActionStatus);
diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js
index 62d2fb201..e72749e3c 100644
--- a/server/app/cronjobs/provider-sync/AWSProviderSync.js
+++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js
@@ -5,6 +5,7 @@ var AWSProvider = require('_pr/model/classes/masters/cloudprovider/awsCloudProvi
 var MasterUtils = require('_pr/lib/utils/masterUtil.js');
 var async = require('async');
 var resourceService = require('_pr/services/resourceService');
+var instanceService = require('_pr/services/instanceService');
 var tagsModel = require('_pr/model/tags');
 var unassignedInstancesModel = require('_pr/model/unassigned-instances');
 var instancesDao = require('_pr/model/classes/instance/instance');
@@ -94,7 +95,7 @@ function saveEC2Data(ec2Info, callback){
                     count++;
                     return;
                 }else if (managedInstances.length > 0) {
-                    instancesDao.updateInstanceStatus(managedInstances[0]._id,ec2, function(err, updateInstanceData) {
+                    instanceService.instanceSyncWithAWS(managedInstances[0]._id,ec2, function(err, updateInstanceData) {
                         if (err) {
                             logger.error(err);
                             count++;
diff --git a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js
index d823ec153..fd668004f 100755
--- a/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/arm-template-blueprint/arm-template-blueprint.js
@@ -35,6 +35,7 @@ var AzureARM = require('_pr/model/azure-arm');
 var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 
+
 var CHEFInfraBlueprint = require('./chef-infra-manager/chef-infra-manager');
 
 var Schema = mongoose.Schema;
@@ -153,7 +154,6 @@ ARMTemplateBlueprintSchema.methods.launch = function(launchParams, callback) {
                     //Creating instance in catalyst
 
                     var instance = {
-
                         name: instanceData.name,
                         orgId: launchParams.orgId,
                         orgName: launchParams.orgName,
@@ -371,11 +371,6 @@ ARMTemplateBlueprintSchema.methods.launch = function(launchParams, callback) {
                                             };
                                             instanceLog.actionStatus = "success";
                                             instanceLog.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);
-                                                }
-                                            });
                                             launchParams.infraManager.getNode(instance.chefNodeName, function(err, nodeData) {
                                                 if (err) {
                                                     logger.error("Failed chef.getNode", err);
@@ -400,6 +395,13 @@ ARMTemplateBlueprintSchema.methods.launch = function(launchParams, callback) {
                                                     hardwareData.memory.free = nodeData.automatic.memory.free;
                                                 }
                                                 hardwareData.os = instance.hardware.os;
+                                                instanceLog.platform=nodeData.automatic.platform;
+                                                instanceLog.os=instance.hardware.os;
+                                                instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
+                                                    if (err) {
+                                                        logger.error("Failed to create or update instanceLog: ", err);
+                                                    }
+                                                });
                                                 instancesDao.setHardwareDetails(instance.id, hardwareData, function(err, updateData) {
                                                     if (err) {
                                                         logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
diff --git a/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js b/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
index 1054a52d2..f7fc57ebf 100755
--- a/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
+++ b/server/app/model/blueprint/blueprint-types/cloud-formation-blueprint/cloud-formation-blueprint.js
@@ -653,11 +653,6 @@ CloudFormationBlueprintSchema.methods.launch = function(launchParams, callback)
                                                                                     };
                                                                                     instanceLog.actionStatus = "success";
                                                                                     instanceLog.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);
-                                                                                        }
-                                                                                    });
 
                                                                                     launchParams.infraManager.getNode(instance.chefNodeName, function(err, nodeData) {
                                                                                         if (err) {
@@ -677,6 +672,13 @@ CloudFormationBlueprintSchema.methods.launch = function(launchParams, callback)
                                                                                             hardwareData.memory.free = nodeData.automatic.memory.free;
                                                                                         }
                                                                                         hardwareData.os = instance.hardware.os;
+                                                                                        instanceLog.platform=nodeData.automatic.platform;
+                                                                                        instanceLog.os=instance.hardware.os;
+                                                                                        instanceLogModel.createOrUpdate(actionLog._id, instance.id, instanceLog, function(err, logData) {
+                                                                                            if (err) {
+                                                                                                logger.error("Failed to create or update instanceLog: ", err);
+                                                                                            }
+                                                                                        });
                                                                                         instancesDao.setHardwareDetails(instance.id, hardwareData, function(err, updateData) {
                                                                                             if (err) {
                                                                                                 logger.error("Unable to set instance hardware details  code (setHardwareDetails)", err);
diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js
index 444b42d42..4e400ac72 100755
--- a/server/app/model/classes/instance/instance.js
+++ b/server/app/model/classes/instance/instance.js
@@ -23,7 +23,6 @@ var uniqueValidator = require('mongoose-unique-validator');
 var logger = require('_pr/logger')(module);
 var textSearch = require('mongoose-text-search');
 var apiUtils = require('_pr/lib/utils/apiUtil.js');
-var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 var Schema = mongoose.Schema;
 
@@ -41,6 +40,10 @@ var ACTION_LOG_TYPES = {
         type: 3,
         name: 'Start'
     },
+    DELETE: {
+        type: 10,
+        name: 'Start'
+    },
     STOP: {
         type: 4,
         name: 'Stop'
@@ -381,6 +384,7 @@ var InstancesDao = function() {
             orgId: orgId
         }
         queryObj['docker.dockerEngineStatus'] = 'success';
+        queryObj['isDeleted'] = false;
         Instances.find(queryObj, function(err, data) {
             if (err) {
                 logger.error("Failed getInstancesWithContainersByOrgId (%s)", orgId, err);
@@ -1513,6 +1517,21 @@ var InstancesDao = function() {
         return log;
     };
 
+    this.insertDeleteActionLog = function(instanceId, user, timestampStarted, callback) {
+        logger.debug("Enter insertDeleteActionLog ", instanceId, user, timestampStarted);
+        var log = {
+            type: ACTION_LOG_TYPES.DELETE.type,
+            name: ACTION_LOG_TYPES.DELETE.name,
+            completed: false,
+            success: false,
+            user: user,
+            timeStarted: timestampStarted,
+        };
+        var logId = insertActionLog(instanceId, log, callback);
+        log._id = logId;
+        return log;
+    };
+
     this.insertChefClientRunActionLog = function(instanceId, runlist, user, timestampStarted, callback) {
         logger.debug("Enter insertChefClientRunActionLog ", instanceId, runlist, user, timestampStarted);
         var log = {
@@ -1637,6 +1656,32 @@ var InstancesDao = function() {
         return log;
     };
 
+    this.insertInstanceStatusActionLog = function(instanceId,user,instanceState, timestampStarted, callback) {
+        logger.debug("Enter insertInstanceStatusActionLog ", instanceId,user,instanceState, timestampStarted);
+        var log = {
+            completed: true,
+            success: true,
+            user: user,
+            timeStarted: timestampStarted,
+            actionData: {
+                'instance-State': instanceState
+            }
+        };
+        if(instanceState === 'terminated'){
+            log.type = ACTION_LOG_TYPES.DELETE.type;
+            log.name = ACTION_LOG_TYPES.DELETE.name
+        }else if(instanceState === 'stopped'){
+            log.type = ACTION_LOG_TYPES.STOP.type;
+            log.name = ACTION_LOG_TYPES.STOP.name
+        }else{
+            log.type = ACTION_LOG_TYPES.START.type;
+            log.name = ACTION_LOG_TYPES.START.name  
+        }
+        var logId = insertActionLog(instanceId, log, callback);
+        log._id = logId;
+        return log;
+    };
+
     this.getInstanceByKeyPairId = function(keyPairId, callback) {
         logger.debug("Enter getInstanceByKeyPairId (%s)", keyPairId);
 
@@ -2031,11 +2076,6 @@ var InstancesDao = function() {
             updateObj['tags'] = instance.tags;
             updateObj['environmentTag'] = instance.environmentTag;
             updateObj['projectTag'] = instance.projectTag;
-            instanceLogModel.removeByInstanceId(instanceId, function(err, removed) {
-                if (err) {
-                    logger.error("Failed to remove instance Log: ", err);
-                }
-            });
         }else {
             updateObj['instanceState'] = instance.state;
             updateObj['isDeleted'] = false;
diff --git a/server/app/model/log-trail/instanceLog.js b/server/app/model/log-trail/instanceLog.js
index eb5c6b6bd..3f94b1433 100644
--- a/server/app/model/log-trail/instanceLog.js
+++ b/server/app/model/log-trail/instanceLog.js
@@ -150,7 +150,7 @@ var InstanceLog = function() {
                     error.status = 500;
                     return callback(error);
                 } else {
-                    databaseCall.queryObj['$or'] = [{ "status": "running" }, { "status": "stopped" }, { "status": "pending" }];
+                    databaseCall.queryObj['$or'] = [{ "status": "running" }, { "status": "stopped" }, { "status": "pending" },{ "status": "terminated" },{ "status": "waiting" },{ "status": "deleted" }];
                     InstanceLogs.paginate(databaseCall.queryObj, databaseCall.options, function(err, instanceActions) {
                         if (err) {
                             logger.error(err);
diff --git a/server/app/routes/v1.0/routes_arm.js b/server/app/routes/v1.0/routes_arm.js
index 1f7a0dbaa..b22e08041 100755
--- a/server/app/routes/v1.0/routes_arm.js
+++ b/server/app/routes/v1.0/routes_arm.js
@@ -29,6 +29,8 @@ var azureProvider = require('_pr/model/classes/masters/cloudprovider/azureCloudP
 var appConfig = require('_pr/config');
 var uuid = require('node-uuid');
 var azureTemplateFunctionEvaluater = require('_pr/lib/azureTemplateFunctionEvaluater');
+var logsDao = require('_pr/model/dao/logsdao.js');
+var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 
 module.exports.setRoutes = function(app, sessionVerificationFunc) {
@@ -316,6 +318,51 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                         }
                                         logger.debug("Successfully removed instance from db.");
                                     });
+                                    var instanceLog = {
+                                        actionId: "",
+                                        instanceId: instances[i]._id,
+                                        orgName: instances[i].orgName,
+                                        bgName: instances[i].bgName,
+                                        projectName: instances[i].projectName,
+                                        envName: instances[i].environmentName,
+                                        status: instances[i].instanceState,
+                                        actionStatus: "success",
+                                        platformId: instances[i].platformId,
+                                        blueprintName: instances[i].blueprintData.blueprintName,
+                                        data: instances[i].runlist,
+                                        platform: instances[i].hardware.platform,
+                                        os: instances[i].hardware.os,
+                                        size: instances[i].instanceType,
+                                        user: req.session.user.cn,
+                                        createdOn: new Date().getTime(),
+                                        startedOn: new Date().getTime(),
+                                        providerType: instances[i].providerType,
+                                        action: "Deleted",
+                                        logs: []
+                                    };
+                                    var timestampStarted = new Date().getTime();
+                                    var actionLog = instancesDao.insertDeleteActionLog(instances[i]._id, req.session.user.cn, timestampStarted);
+                                    var logReferenceIds = [instances[i]._id];
+                                    if (actionLog) {
+                                        logReferenceIds.push(actionLog._id);
+                                    }
+                                    logsDao.insertLog({
+                                        referenceId: logReferenceIds,
+                                        err: false,
+                                        log: "Instance Deleted",
+                                        timestamp: timestampStarted
+                                    });
+                                    instanceLog.actionId = actionLog._id;
+                                    instanceLog.logs = {
+                                        err: false,
+                                        log: "Instance Deleted",
+                                        timestamp: new Date().getTime()
+                                    };
+                                    instanceLogModel.createOrUpdate(actionLog._id, instances[i]._id, instanceLog, function(err, logData) {
+                                        if (err) {
+                                            logger.error("Failed to create or update instanceLog: ", err);
+                                        }
+                                    });
                                 }
 
                                 instancesDao.removeInstancebyArmId(azureArm.id, function(err, deletedData) {
diff --git a/server/app/routes/v1.0/routes_cloudformation.js b/server/app/routes/v1.0/routes_cloudformation.js
index 2c59f8939..653c4a707 100755
--- a/server/app/routes/v1.0/routes_cloudformation.js
+++ b/server/app/routes/v1.0/routes_cloudformation.js
@@ -28,7 +28,6 @@ var logger = require('_pr/logger')(module);
 var instancesDao = require('_pr/model/classes/instance/instance');
 var configmgmtDao = require('_pr/model/d4dmasters/configmgmt');
 var Chef = require('_pr/lib/chef.js');
-var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 var containerDao = require('_pr/model/container');
 
 module.exports.setRoutes = function(app, sessionVerificationFunc) {
@@ -146,13 +145,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                     logger.debug("Failed to delete node ", err);
                                                     return;
                                                 }
-                                                logger.debug("Successfully removed instance from db.");
-                                            });
-                                            instanceLogModel.removeByInstanceId(instance.id, function (err, removed) {
-                                                if (err) {
-                                                    logger.error("Failed to remove instance Log: ", err);
-                                                    return;
-                                                }
+                                                logger.debug("Successfully removed instance from chef Server.");
                                             });
                                             containerDao.deleteContainerByInstanceId(instance.id, function (err, container) {
                                                 if (err) {
@@ -163,29 +156,19 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                         })(instances[i]);
                                     }
                                 }
-                                instancesDao.removeInstancebyCloudFormationId(cloudFormation.id, function(err, deletedData) {
+                                CloudFormation.removeById(cloudFormation.id, function(err, deletedStack) {
                                     if (err) {
-                                        logger.error("Unable to delete stack instances from db", err);
+                                        logger.error("Unable to delete stack from db", err);
                                         res.status(500).send({
-                                            message: "Unable to delete stack from aws"
+                                            message: "Unable to delete stack from db"
                                         });
                                         return;
                                     }
-                                    CloudFormation.removeById(cloudFormation.id, function(err, deletedStack) {
-                                        if (err) {
-                                            logger.error("Unable to delete stack from db", err);
-                                            res.status(500).send({
-                                                message: "Unable to delete stack from db"
-                                            });
-                                            return;
-                                        }
-                                        res.send(200, {
-                                            message: "deleted",
-                                            instanceIds: instanceIds
-                                        });
+                                    res.send(200, {
+                                        message: "deleted",
+                                        instanceIds: instanceIds
                                     });
                                 });
-
                             });
                         });
                     });
diff --git a/server/app/routes/v1.0/routes_instances.js b/server/app/routes/v1.0/routes_instances.js
index 44e6e9153..c32047e70 100755
--- a/server/app/routes/v1.0/routes_instances.js
+++ b/server/app/routes/v1.0/routes_instances.js
@@ -291,14 +291,58 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                         return;
                     }
                     logger.debug('length ==>', tasks.length);
-                    if (tasks.length) {
+                    if (tasks.length > 0) {
                         res.status(400).send({
                             message: "Instance is associated with task"
                         });
                         return;
 
                     }
-
+                    var instanceLog = {
+                        actionId: "",
+                        instanceId: instances[0]._id,
+                        orgName: instances[0].orgName,
+                        bgName: instances[0].bgName,
+                        projectName: instances[0].projectName,
+                        envName: instances[0].environmentName,
+                        status: instances[0].instanceState,
+                        actionStatus: "pending",
+                        platformId: instances[0].platformId,
+                        blueprintName: instances[0].blueprintData.blueprintName,
+                        data: instances[0].runlist,
+                        platform: instances[0].hardware.platform,
+                        os: instances[0].hardware.os,
+                        size: instances[0].instanceType,
+                        user: req.session.user.cn,
+                        createdOn: new Date().getTime(),
+                        startedOn: new Date().getTime(),
+                        providerType: instances[0].providerType,
+                        action: "Deleted",
+                        logs: []
+                    };
+                    var timestampStarted = new Date().getTime();
+                    var actionLog = instancesDao.insertDeleteActionLog(req.params.instanceId, req.session.user.cn, timestampStarted);
+                    var logReferenceIds = [req.params.instanceId];
+                    if (actionLog) {
+                        logReferenceIds.push(actionLog._id);
+                    }
+                    logsDao.insertLog({
+                        referenceId: logReferenceIds,
+                        err: false,
+                        log: "Instance Deleting",
+                        timestamp: timestampStarted
+                    });
+                    instanceLog.actionId = actionLog._id;
+                    instanceLog.logs = {
+                        err: false,
+                        log: "Instance Deleting",
+                        timestamp: new Date().getTime()
+                    };
+                    instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                        if (err) {
+                            logger.error("Failed to create or update instanceLog: ", err);
+                        }
+                    });
                     if (req.query.chefRemove && req.query.chefRemove === 'true') {
                         var infraManagerData;
                         if (instance.chef && instance.chef.serverId) {
@@ -341,7 +385,27 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                     if (err) {
                                         logger.debug("Failed to delete node ", err);
                                         if (err.chefStatusCode && err.chefStatusCode === 404) {
-                                            removeInstanceFromDb();
+                                            logsDao.insertLog({
+                                                referenceId: logReferenceIds,
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            });
+                                            instanceLog.endedOn = new Date().getTime();
+                                            instanceLog.actionStatus = "success";
+                                            instanceLog.status = "deleted";
+                                            instanceLog.logs = {
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            };
+                                            instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                                                if (err) {
+                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                }
+                                                removeInstanceFromDb();
+                                                logger.debug("Successfully removed instance from db.");
+                                            })
                                         } else {
                                             res.send(500);
                                         }
@@ -352,8 +416,27 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                 callback(err, null);
                                                 return;
                                             }
-                                            removeInstanceFromDb();
-                                            logger.debug("Successfully removed instance from db.");
+                                            logsDao.insertLog({
+                                                referenceId: logReferenceIds,
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            });
+                                            instanceLog.endedOn = new Date().getTime();
+                                            instanceLog.actionStatus = "success";
+                                            instanceLog.status = "deleted";
+                                            instanceLog.logs = {
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            };
+                                            instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                                                if (err) {
+                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                }
+                                                removeInstanceFromDb();
+                                                logger.debug("Successfully removed instance from db.");
+                                            })
                                         });
                                     }
                                 });
@@ -373,20 +456,79 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                     if (err) {
                                         logger.debug("Failed to delete node ", err);
                                         if (typeof err.retCode !== 'undefined' && err.retCode === 24) {
-                                            removeInstanceFromDb();
+                                            logsDao.insertLog({
+                                                referenceId: logReferenceIds,
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            });
+                                            instanceLog.endedOn = new Date().getTime();
+                                            instanceLog.actionStatus = "success";
+                                            instanceLog.status = "deleted";
+                                            instanceLog.logs = {
+                                                err: false,
+                                                log: "Instance Deleted",
+                                                timestamp: new Date().getTime()
+                                            };
+                                            instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                                                if (err) {
+                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                }
+                                                removeInstanceFromDb();
+                                                logger.debug("Successfully removed instance from db.");
+                                            })
                                         } else {
                                             res.send(500);
                                         }
                                     } else {
-                                        removeInstanceFromDb();
-                                        logger.debug("Successfully removed instance from db.");
+                                        logsDao.insertLog({
+                                            referenceId: logReferenceIds,
+                                            err: false,
+                                            log: "Instance Deleted",
+                                            timestamp: new Date().getTime()
+                                        });
+                                        instanceLog.endedOn = new Date().getTime();
+                                        instanceLog.actionStatus = "success";
+                                        instanceLog.status = "deleted";
+                                        instanceLog.logs = {
+                                            err: false,
+                                            log: "Instance Deleted",
+                                            timestamp: new Date().getTime()
+                                        };
+                                        instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                                            if (err) {
+                                                logger.error("Failed to create or update instanceLog: ", err);
+                                            }
+                                            removeInstanceFromDb();
+                                            logger.debug("Successfully removed instance from db.");
+                                        })
                                     }
                                 });
 
                             }
                         });
                     } else {
-                        removeInstanceFromDb();
+                        logsDao.insertLog({
+                            referenceId: logReferenceIds,
+                            err: false,
+                            log: "Instance Deleted",
+                            timestamp: new Date().getTime()
+                        });
+                        instanceLog.endedOn = new Date().getTime();
+                        instanceLog.actionStatus = "success";
+                        instanceLog.status = "deleted";
+                        instanceLog.logs = {
+                            err: false,
+                            log: "Instance Deleted",
+                            timestamp: new Date().getTime()
+                        };
+                        instanceLogModel.createOrUpdate(actionLog._id, req.params.instanceId, instanceLog, function(err, logData) {
+                            if (err) {
+                                logger.error("Failed to create or update instanceLog: ", err);
+                            }
+                            removeInstanceFromDb();
+                            logger.debug("Successfully removed instance from db.");
+                        })
                     }
 
                 });
@@ -398,28 +540,20 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         });
 
         function removeInstanceFromDb() {
-            instanceLogModel.removeByInstanceId(req.params.instanceId, function (err, removed) {
+            containerDao.deleteContainerByInstanceId(req.params.instanceId, function (err, container) {
                 if (err) {
-                    logger.error("Failed to remove instance Log: ", err);
+                    logger.error("Container deletion Failed >> ", err);
                     res.status(500).send(errorResponses.db.error);
                     return;
                 } else {
-                    containerDao.deleteContainerByInstanceId(req.params.instanceId, function (err, container) {
+                    instancesDao.removeInstanceById(req.params.instanceId, function (err, data) {
                         if (err) {
-                            logger.error("Container deletion Failed >> ", err);
+                            logger.error("Instance deletion Failed >> ", err);
                             res.status(500).send(errorResponses.db.error);
                             return;
-                        } else {
-                            instancesDao.removeInstanceById(req.params.instanceId, function (err, data) {
-                                if (err) {
-                                    logger.error("Instance deletion Failed >> ", err);
-                                    res.status(500).send(errorResponses.db.error);
-                                    return;
-                                }
-                                logger.debug("Exit delete() for /instances/%s", req.params.instanceId);
-                                res.send(200);
-                            });
                         }
+                        logger.debug("Exit delete() for /instances/%s", req.params.instanceId);
+                        res.send(200);
                     });
                 }
             });
diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 7d9961c0c..2a4762655 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -36,6 +36,7 @@ var resources = require('_pr/model/resources/resources.js');
 
 var appConfig = require('_pr/config');
 var uuid = require('node-uuid');
+var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 var credentialCryptography = require('_pr/lib/credentialcryptography.js');
 
@@ -62,6 +63,7 @@ instanceService.createTrackedInstancesResponse = createTrackedInstancesResponse;
 instanceService.validateListInstancesQuery = validateListInstancesQuery;
 instanceService.removeInstanceById = removeInstanceById;
 instanceService.removeInstancesByProviderId = removeInstancesByProviderId;
+instanceService.instanceSyncWithAWS = instanceSyncWithAWS;
 
 function checkIfUnassignedInstanceExists(providerId, instanceId, callback) {
     unassignedInstancesModel.getById(instanceId,
@@ -1301,3 +1303,79 @@ function removeInstancesByProviderId(providerId, callback) {
         }
     })
 }
+
+function instanceSyncWithAWS(instanceId,instanceData,callback){
+    async.waterfall([
+        function(next){
+            instancesModel.getInstanceById(instanceId,next);
+        },
+        function(instances,next){
+            var instance = instances[0];
+            if(instance.instanceState !== instanceData.state) {
+                var timestampStarted = new Date().getTime();
+                var user = instance.catUser ? instance.catUser : 'superadmin';
+                var action ='';
+                if(instanceData.state === 'stopped'){
+                    action = 'Stop';
+                }else if(instanceData.state === 'terminated'){
+                    action ='Terminated'
+                }else{
+                    action ='Start';
+                };
+                var actionLog = instancesModel.insertInstanceStatusActionLog(instance._id, user,instanceData.state, timestampStarted);
+                var logReferenceIds = [instance._id, actionLog._id];
+                logsDao.insertLog({
+                    referenceId: logReferenceIds,
+                    err: false,
+                    log: "Instance :"+instanceData.state,
+                    timestamp: timestampStarted
+                });
+                var instanceLog = {
+                    actionId: actionLog._id,
+                    instanceId: instance._id,
+                    orgName: instance.orgName,
+                    bgName: instance.bgName,
+                    projectName: instance.projectName,
+                    envName: instance.environmentName,
+                    status: instanceData.state,
+                    actionStatus: "success",
+                    platformId: instance.platformId,
+                    blueprintName: instance.blueprintData.blueprintName,
+                    data: instance.runlist,
+                    platform: instance.hardware.platform,
+                    os: instance.hardware.os,
+                    size: instance.instanceType,
+                    user: user,
+                    createdOn: new Date().getTime(),
+                    startedOn: new Date().getTime(),
+                    providerType: instance.providerType,
+                    action: action,
+                    logs: []
+                };
+                instanceLog.logs.push({
+                    err: false,
+                    log: "Instance :"+instanceData.state,
+                    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);
+                        next(err,null);
+                    }
+                    next(null,logData);
+                });
+            }else{
+                next(null,instances);
+            }
+        },
+       function(instanceLogData,next) {
+           instancesModel.updateInstanceStatus(instanceId,instanceData, next);
+       }
+    ], function(err,results){
+        if (err) {
+            callback(err, null);
+        } else {
+            callback(null, results);
+        }
+    })
+}

From e962d9a990be6884dc8d51e7e2c399567269e996 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 26 Aug 2016 18:58:58 +0530
Subject: [PATCH 2/4] CAT-2268,2269 and 2271

---
 .../ajax/Settings/CreateProviders.html        |  8 ++++
 .../app/routes/v1.0/routes_cloudformation.js  | 47 +++++++++++++++++++
 server/app/services/instanceService.js        |  4 +-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html
index ebb1c7f0a..073d5d756 100755
--- a/client/htmls/private/ajax/Settings/CreateProviders.html
+++ b/client/htmls/private/ajax/Settings/CreateProviders.html
@@ -704,6 +704,14 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
         }
         $('#myForm54').ajaxForm({
             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})
+                }
+                if (location.toString().indexOf('?new') === -1 && $('#providertype').val() == 'AZURE') {
+                    var azureSubscriptionId = $('#azureSubscriptionId').val();
+                    arr.push({name:'azureSubscriptionId',value:orgValue,type:'text',required:false})
+                }
                 // return false to cancel submit
                 if ($('#providertype').val() == 'OPENSTACK' || $('#providertype').val() == 'HPPUBLICCLOUD') {
                     if (isFormValidOpenStack(null, 'cat-validation-openstack')) {
diff --git a/server/app/routes/v1.0/routes_cloudformation.js b/server/app/routes/v1.0/routes_cloudformation.js
index 653c4a707..fedfb6fec 100755
--- a/server/app/routes/v1.0/routes_cloudformation.js
+++ b/server/app/routes/v1.0/routes_cloudformation.js
@@ -29,6 +29,8 @@ var instancesDao = require('_pr/model/classes/instance/instance');
 var configmgmtDao = require('_pr/model/d4dmasters/configmgmt');
 var Chef = require('_pr/lib/chef.js');
 var containerDao = require('_pr/model/container');
+var logsDao = require('_pr/model/dao/logsdao.js');
+var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 module.exports.setRoutes = function(app, sessionVerificationFunc) {
 
@@ -153,6 +155,51 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                     return;
                                                 }
                                             });
+                                            var instanceLog = {
+                                                actionId: "",
+                                                instanceId: instance._id,
+                                                orgName: instance.orgName,
+                                                bgName: instance.bgName,
+                                                projectName: instance.projectName,
+                                                envName: instance.environmentName,
+                                                status: 'shutting-down',
+                                                actionStatus: "success",
+                                                platformId: instance.platformId,
+                                                blueprintName: instance.blueprintData.blueprintName,
+                                                data: instance.runlist,
+                                                platform: instance.hardware.platform,
+                                                os: instance.hardware.os,
+                                                size: instance.instanceType,
+                                                user: req.session.user.cn,
+                                                createdOn: new Date().getTime(),
+                                                startedOn: new Date().getTime(),
+                                                providerType: instance.providerType,
+                                                action: "Shutting-Down",
+                                                logs: []
+                                            };
+                                            var timestampStarted = new Date().getTime();
+                                            var actionLog = instancesDao.insertDeleteActionLog(instance._id, req.session.user.cn, timestampStarted);
+                                            var logReferenceIds = [instance._id];
+                                            if (actionLog) {
+                                                logReferenceIds.push(actionLog._id);
+                                            }
+                                            logsDao.insertLog({
+                                                referenceId: logReferenceIds,
+                                                err: false,
+                                                log: "Instance Shutting-Down",
+                                                timestamp: timestampStarted
+                                            });
+                                            instanceLog.actionId = actionLog._id;
+                                            instanceLog.logs = {
+                                                err: false,
+                                                log: "Instance Shutting-Down",
+                                                timestamp: new Date().getTime()
+                                            };
+                                            instanceLogModel.createOrUpdate(actionLog._id, instance, instanceLog, function(err, logData) {
+                                                if (err) {
+                                                    logger.error("Failed to create or update instanceLog: ", err);
+                                                }
+                                            });
                                         })(instances[i]);
                                     }
                                 }
diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 2a4762655..3d2c014d5 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -1315,10 +1315,12 @@ function instanceSyncWithAWS(instanceId,instanceData,callback){
                 var timestampStarted = new Date().getTime();
                 var user = instance.catUser ? instance.catUser : 'superadmin';
                 var action ='';
-                if(instanceData.state === 'stopped'){
+                if(instanceData.state === 'stopped' || instanceData.state === 'stopping'){
                     action = 'Stop';
                 }else if(instanceData.state === 'terminated'){
                     action ='Terminated'
+                }else if(instanceData.state === 'shutting-down'){
+                    action ='Shutting-Down'
                 }else{
                     action ='Start';
                 };

From 99e5293fe1cf064490fb4eaf811dbbf9df55dfa0 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Fri, 26 Aug 2016 19:09:40 +0530
Subject: [PATCH 3/4] CAT-2273 Fixed

---
 client/htmls/public/instanceLog.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html
index f83144e6f..f0dd4752e 100644
--- a/client/htmls/public/instanceLog.html
+++ b/client/htmls/public/instanceLog.html
@@ -287,6 +287,8 @@ <h4 class="modal-title" id="myModalLabel">
 						$tdStatus = $("<img title='terminated' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}else if (managnedData[i].status == 'deleted') {
 						$tdStatus = $("<img title='deleted' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
+					}else if (managnedData[i].status == 'shutting-down') {
+						$tdStatus = $("<img title='shutting-down' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}else {
 						$tdStatus = $("<img title='unknown' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}

From b0fa586f1d0fb39348e14d59bad9aff8af9d2449 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Sun, 28 Aug 2016 21:26:28 +0530
Subject: [PATCH 4/4] CAT-2274 Fixed

---
 client/htmls/public/instanceLog.html          |  18 +-
 client/htmls/public/orchestrationLog.html     |   2 +-
 .../cronjobs/provider-sync/AWSProviderSync.js | 205 +++++++++++++++++-
 server/app/model/classes/instance/instance.js |   6 +-
 .../unassigned-instances.js                   |  19 ++
 .../unmanaged-instance/unmanaged-instance.js  |   6 +-
 server/app/routes/v1.0/routes_audit_trails.js |   4 +-
 server/app/services/instanceService.js        |   5 -
 8 files changed, 235 insertions(+), 30 deletions(-)

diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html
index f0dd4752e..f847f9d2b 100644
--- a/client/htmls/public/instanceLog.html
+++ b/client/htmls/public/instanceLog.html
@@ -117,29 +117,29 @@ <h4 class="modal-title" id="myModalLabel">
 								$modalBody.empty();
 							}
 							var $table = $('<table></table>');
-							for (var i = 0; i < data.logs.length; i++) {
+							for (var i = 0; i < data.length; i++) {
 								var $rowDiv = $('<tr class="row rowSpacing"></tr>');
 								var timeString;
-								if(data.logs[i].timestamp){
-									timeString = new Date().setTime(data.logs[i].timestamp);
+								if(data[i].timestamp){
+									timeString = new Date().setTime(data[i].timestamp);
 								}
 								var date = new Date(timeString).toLocaleString();
 								var logStr ="";
-								if(data.logs[i].log){
-									logStr = data.logs[i].log;
+								if(data[i].log){
+									logStr = data[i].log;
 								}
-								if (data.logs[i].err) {
+								if (data[i].err) {
 									$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:red;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
 								} else {
 									$rowDiv.append($('<td class="col-lg-12 col-sm-12" style="color:DarkBlue;"></td>').append('<span class="textLogs">' + date + '</span>' + '&nbsp;&nbsp;&nbsp;' + '<span>' + logStr + '</span>'));
 								}
 								$table.append($rowDiv);
-								lastTimestamp = data.logs[i].timestamp;
-								if (data.logs[i]) {
+								lastTimestamp = data[i].timestamp;
+								if (data[i]) {
 									$modalBody.append($table);
 									$modalBody.scrollTop($modalBody[0].scrollHeight + 100);
 								}
-							 }
+							}
 							if ($instanceLogModalContainer.data()['bs.modal'].isShown) {
 								pollLogs(lastTimestamp, 10000, false);
 							} else {
diff --git a/client/htmls/public/orchestrationLog.html b/client/htmls/public/orchestrationLog.html
index dd097bbac..40c8a5a3a 100644
--- a/client/htmls/public/orchestrationLog.html
+++ b/client/htmls/public/orchestrationLog.html
@@ -217,7 +217,7 @@ <h4 class="modal-title" id="myModalLabel">
 										$modalBody.append($table);
 										$modalBody.scrollTop($modalBody[0].scrollHeight + 100);
 									}
-								 }
+								}
 								if ($taskLogModalContainer.data()['bs.modal'].isShown) {
 									pollLogs(lastTimestamp, 10000, false);
 								} else {
diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js
index e72749e3c..576a7f425 100644
--- a/server/app/cronjobs/provider-sync/AWSProviderSync.js
+++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js
@@ -10,6 +10,8 @@ var tagsModel = require('_pr/model/tags');
 var unassignedInstancesModel = require('_pr/model/unassigned-instances');
 var instancesDao = require('_pr/model/classes/instance/instance');
 var assignedInstancesDao = require('_pr/model/unmanaged-instance');
+var logsDao = require('_pr/model/dao/logsdao.js');
+var instanceLogModel = require('_pr/model/log-trail/instanceLog.js');
 
 
 var AWSProviderSync = Object.create(CatalystCronJob);
@@ -62,15 +64,36 @@ function awsProviderSyncForProvider(provider,orgName) {
         function (instances, next) {
             saveEC2Data(instances, next);
         },
-        function(instanceSaveData,next){
-            unassignedInstancesModel.getUnAssignedInstancesByProviderId(provider._id,next);
-        },
-        function(unassignedInstances,next){
-            tagMappingForInstances(unassignedInstances,provider,next);
+        function(instances,next){
+            async.parallel({
+                instanceSync: function(callback){
+                    instanceSyncWithAWS(instances,provider._id,callback);
+                },
+                assignedInstance: function(callback){
+                    async.waterfall([
+                        function(next){
+                            unassignedInstancesModel.getUnAssignedInstancesByProviderId(provider._id,next)
+                        },
+                        function(unassignedInstances,next){
+                            tagMappingForInstances(unassignedInstances,provider,next);
+                        },
+                        function(assignedInstances,next){
+                            saveAssignedInstances(assignedInstances,next);
+                        }
+                    ],function(err,results){
+                        if(err){
+                            callback(err,null);
+                        }
+                        callback(null,results);
+                    })
+                }
+            },function(err,results){
+                if(err){
+                    next(err,null);
+                }
+                next(null,results);
+            });
         },
-        function(assignedInstances,next){
-            saveAssignedInstances(assignedInstances,next);
-        }
     ],function (err, results) {
         if (err) {
             logger.error(err);
@@ -294,4 +317,170 @@ function saveAssignedInstances(assignedInstances,callback){
     }else{
         callback(null,assignedInstances);
     }
+}
+
+function instanceSyncWithAWS(ec2Instances,providerId,callback){
+    if(ec2Instances.length > 0){
+        var ec2InstanceIds = [];
+        for(var i = 0;i < ec2Instances.length;i++){
+            ec2InstanceIds.push(ec2Instances[i].platformId);
+        }
+        if(ec2InstanceIds.length === ec2Instances.length){
+            async.parallel({
+                instance:function(callback){
+                    instancesDao.getInstanceByProviderId(providerId,function(err,instances){
+                        if(err){
+                            callback(err,null);
+                        }else if(instances.length > 0){
+                            var instanceCount = 0;
+                            for(var j = 0;j < instances.length;j++){
+                                (function(instance){
+                                   if(ec2InstanceIds.indexOf(instance.platformId) !== -1){
+                                       instanceCount++;
+                                       if(instanceCount === instances.length){
+                                           callback(null,instances);
+                                           return;
+                                       }
+                                   }else{
+                                       instancesDao.removeTerminatedInstanceById(instance._id,function(err,data){
+                                           if(err){
+                                               instanceCount++;
+                                               logger.error(err);
+                                               return;
+                                           }
+                                           instanceCount++;
+                                           var timestampStarted = new Date().getTime();
+                                           var user = instance.catUser ? instance.catUser : 'superadmin';
+                                           var actionLog = instancesDao.insertInstanceStatusActionLog(instance._id, user,'terminated', timestampStarted);
+                                           var logReferenceIds = [instance._id, actionLog._id];
+                                           logsDao.insertLog({
+                                               referenceId: logReferenceIds,
+                                               err: false,
+                                               log: "Instance : terminated",
+                                               timestamp: timestampStarted
+                                           });
+                                           var instanceLog = {
+                                               actionId: actionLog._id,
+                                               instanceId: instance._id,
+                                               orgName: instance.orgName,
+                                               bgName: instance.bgName,
+                                               projectName: instance.projectName,
+                                               envName: instance.environmentName,
+                                               status: 'terminated',
+                                               actionStatus: "success",
+                                               platformId: instance.platformId,
+                                               blueprintName: instance.blueprintData.blueprintName,
+                                               data: instance.runlist,
+                                               platform: instance.hardware.platform,
+                                               os: instance.hardware.os,
+                                               size: instance.instanceType,
+                                               user: user,
+                                               createdOn: new Date().getTime(),
+                                               startedOn: new Date().getTime(),
+                                               providerType: instance.providerType,
+                                               action: 'Terminated',
+                                               logs: []
+                                           };
+                                           instanceLogModel.createOrUpdate(actionLog._id, instance._id, instanceLog, function(err, logData) {
+                                               if (err) {
+                                                   logger.error("Failed to create or update instanceLog: ", err);
+                                               }
+                                           });
+                                           if(instanceCount === instances.length){
+                                               callback(null,instances);
+                                               return;
+                                           }
+                                       })
+                                   }
+                                    
+                                })(instances[j]);
+                            }
+                        }else{
+                            callback(null,instances);
+                        }
+                    });
+                },
+                assignedInstance:function(callback){
+                    assignedInstancesDao.getInstanceByProviderId(providerId,function(err,assignedInstances){
+                        if(err){
+                            callback(err,null);
+                        }else if(assignedInstances.length > 0){
+                            var assignedInstanceCount = 0;
+                            for(var k = 0;k < assignedInstances.length;k++){
+                                (function(assignedInstance){
+                                    if(ec2InstanceIds.indexOf(assignedInstance.platformId) !== -1){
+                                        assignedInstanceCount++;
+                                        if(assignedInstanceCount === assignedInstances.length){
+                                            callback(null,assignedInstances);
+                                            return;
+                                        }
+                                    }else{
+                                        assignedInstancesDao.removeInstanceById(assignedInstance._id,function(err,data){
+                                            if(err){
+                                                assignedInstanceCount++;
+                                                logger.error(err);
+                                                return;
+                                            }
+                                            assignedInstanceCount++;
+                                            if(assignedInstanceCount === assignedInstances.length){
+                                                callback(null,assignedInstances);
+                                                return;
+                                            }
+                                        })
+                                    }
+
+                                })(assignedInstances[k]);
+                            }
+                        }else{
+                            callback(null,assignedInstances);
+                        }
+                    });
+                },
+                unassignedInstance:function(callback){
+                    unassignedInstancesModel.getUnAssignedInstancesByProviderId(providerId,function(err,unAssignedInstances){
+                        if(err){
+                            callback(err,null);
+                        }else if(unAssignedInstances.length > 0){
+                            var unAssignedInstanceCount = 0;
+                            for(var l = 0;l < unAssignedInstances.length;l++){
+                                (function(unAssignedInstance){
+                                    if(ec2InstanceIds.indexOf(unAssignedInstance.platformId) !== -1){
+                                        unAssignedInstanceCount++;
+                                        if(unAssignedInstanceCount === unAssignedInstances.length){
+                                            callback(null,unAssignedInstances);
+                                            return;
+                                        }
+                                    }else{
+                                        unassignedInstancesModel.removeTerminatedInstanceById(unAssignedInstance._id,function(err,data){
+                                            if(err){
+                                                unAssignedInstanceCount++;
+                                                logger.error(err);
+                                                return;
+                                            }
+                                            unAssignedInstanceCount++;
+                                            if(unAssignedInstanceCount === unAssignedInstances.length){
+                                                callback(null,unAssignedInstances);
+                                                return;
+                                            }
+                                        })
+                                    }
+
+                                })(unAssignedInstances[l]);
+                            }
+                        }else{
+                            callback(null,unAssignedInstances);
+                        }
+                    });
+                }
+            },function(err,results){
+                if(err){
+                    callback(err,null);
+                }
+                callback(null,results);
+            })
+        }
+    }else{
+        callback(null,ec2Instances);
+    }
+
 }
\ No newline at end of file
diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js
index 4e400ac72..80598521b 100755
--- a/server/app/model/classes/instance/instance.js
+++ b/server/app/model/classes/instance/instance.js
@@ -400,7 +400,8 @@ var InstancesDao = function() {
         logger.debug("Enter getInstanceByProviderId (%s)", providerId);
 
         Instances.find({
-            providerId: providerId
+            providerId: providerId,
+            isDeleted: false
         }, function(err, data) {
             if (err) {
                 logger.error("Failed getInstanceByProviderId (%s)", providerId, err);
@@ -1069,7 +1070,8 @@ var InstancesDao = function() {
             "_id": ObjectId(instanceId)
         }, {
             $set: {
-                isDeleted: true
+                isDeleted: true,
+                instanceState: 'terminated'
             }
         }, {
             upsert: false
diff --git a/server/app/model/unassigned-instances/unassigned-instances.js b/server/app/model/unassigned-instances/unassigned-instances.js
index 7df788c6a..fdc5c558c 100644
--- a/server/app/model/unassigned-instances/unassigned-instances.js
+++ b/server/app/model/unassigned-instances/unassigned-instances.js
@@ -290,6 +290,25 @@ UnassignedInstancesSchema.statics.getInstancesByProviderIdOrgIdAndPlatformId = f
         }
     );
 };
+UnassignedInstancesSchema.statics.removeTerminatedInstanceById = function(instanceId, callback) {
+    this.update({
+        "_id": ObjectId(instanceId)
+    }, {
+        $set: {
+            isDeleted: true,
+            state: 'terminated'
+        }
+    }, {
+        upsert: false
+    }, function(err, data) {
+        if (err) {
+            logger.error("Failed to removeTerminatedInstanceById (%s)", instanceId, err);
+            callback(err, null);
+            return;
+        }
+        callback(null, data);
+    });
+};
 
 var UnassignedInstances = mongoose.model('unassignedInstances', UnassignedInstancesSchema);
 module.exports = UnassignedInstances;
diff --git a/server/app/model/unmanaged-instance/unmanaged-instance.js b/server/app/model/unmanaged-instance/unmanaged-instance.js
index bfd84cec5..f97887ff3 100644
--- a/server/app/model/unmanaged-instance/unmanaged-instance.js
+++ b/server/app/model/unmanaged-instance/unmanaged-instance.js
@@ -157,7 +157,8 @@ UnmanagedInstanceSchema.statics.getByProviderId = function(jsonData, callback) {
 UnmanagedInstanceSchema.statics.getInstanceByProviderId = function(providerId, callback) {
 	logger.debug("Enter getInstanceByProviderId (%s)", providerId);
 	this.find({
-		providerId: providerId
+		providerId: providerId,
+		isDeleted:false
 	}, function(err, data) {
 		if (err) {
 			logger.error("Failed getInstanceByProviderId (%s)", providerId, err);
@@ -236,7 +237,8 @@ UnmanagedInstanceSchema.statics.removeInstanceById = function(instanceId, callba
 			"_id": ObjectId(instanceId)
 		}, {
 			$set: {
-				isDeleted: true
+				isDeleted: true,
+				state: 'terminated'
 			}
 		}, {
 			upsert: false
diff --git a/server/app/routes/v1.0/routes_audit_trails.js b/server/app/routes/v1.0/routes_audit_trails.js
index c3402290d..adb2506dc 100644
--- a/server/app/routes/v1.0/routes_audit_trails.js
+++ b/server/app/routes/v1.0/routes_audit_trails.js
@@ -122,12 +122,10 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
         if (timestamp) {
             timestamp = parseInt(timestamp);
         }
-
         async.waterfall(
             [
-
                 function(next) {
-                    instanceLogModel.pollInstanceActionLog(req.params.actionId, timestamp, next);
+                    logsDao.getLogsByReferenceId(req.params.actionId, timestamp, next);
                 }
             ],
             function(err, results) {
diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 3d2c014d5..7419f5d4e 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -1354,11 +1354,6 @@ function instanceSyncWithAWS(instanceId,instanceData,callback){
                     action: action,
                     logs: []
                 };
-                instanceLog.logs.push({
-                    err: false,
-                    log: "Instance :"+instanceData.state,
-                    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);