From 9dc3750ba3199bab0022c39193fb1998966f1241 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Thu, 15 Sep 2016 12:05:28 +0530
Subject: [PATCH 1/3] CAT-2333 Fixed

---
 client/htmls/private/ajax/Settings/CreateOrg.html | 2 +-
 server/app/routes/v1.0/routes_provider.js         | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/htmls/private/ajax/Settings/CreateOrg.html b/client/htmls/private/ajax/Settings/CreateOrg.html
index cc371df58..46b67c0dc 100755
--- a/client/htmls/private/ajax/Settings/CreateOrg.html
+++ b/client/htmls/private/ajax/Settings/CreateOrg.html
@@ -37,7 +37,7 @@ <h4 class="widget-margin" style="color:black;">Create Organization</h4>
 												<div class="col-lg-6 col-md-6">
 													<label for="name">Planned Cost:</label>
 													<span>
-														<img data-toggle="popover" data-html="true" data-placement="left" title="AWS Planned Cost for a Month." src="img/help.png"/>
+														<img data-toggle="popover" data-html="true" data-placement="left" title="Planned Cost for a Month." src="img/help.png"/>
 													</span>
 													<input name="ctl00$MainContent$plannedCost" value="" id="plannedCost" class="form-control" type="text"  cdata="catalyst" maxlength="35">
 													<span data-val-controltovalidate="plannedCost" id="MainContent_Req_plannedCost" data-val="true" data-val-evaluationfunction="RequiredFieldValidatorEvaluateIsValid" data-val-initialvalue="" style="visibility:hidden;">Required</span>
diff --git a/server/app/routes/v1.0/routes_provider.js b/server/app/routes/v1.0/routes_provider.js
index c0cee7cde..cd0ab9175 100644
--- a/server/app/routes/v1.0/routes_provider.js
+++ b/server/app/routes/v1.0/routes_provider.js
@@ -2162,6 +2162,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 		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;
 
@@ -2457,6 +2460,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
 		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;

From c417743204a07ca7890a31aaa24c405a56b0a637 Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Thu, 15 Sep 2016 16:55:36 +0530
Subject: [PATCH 2/3] CAT-2333/CAT-2335/CAT-2334 Fixed

---
 .../private/ajax/Settings/providerSync.html   | 34 +++++++++++++++--
 client/htmls/private/js/settingscommon.js     |  4 +-
 client/htmls/public/instanceLog.html          |  2 +-
 client/htmls/public/js/awsCapacity.js         | 37 +++++++++++++++----
 server/app/model/classes/instance/instance.js | 20 +++++-----
 .../unassigned-instances.js                   | 12 +++---
 .../unmanaged-instance/unmanaged-instance.js  | 14 +++----
 .../app/routes/v1.0/routes_cloudformation.js  |  2 +-
 server/app/services/instanceService.js        |  6 ++-
 9 files changed, 94 insertions(+), 37 deletions(-)

diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html
index bfb4727f6..48a1e19a7 100644
--- a/client/htmls/private/ajax/Settings/providerSync.html
+++ b/client/htmls/private/ajax/Settings/providerSync.html
@@ -780,7 +780,19 @@ <h4 class="modal-title">Importing Instances</h4>
             "columns": [
                 {"data": "platformId","orderable" : true  },
                 {"data": "hardware.os","orderable" : false  },
-                {"data": "instanceIP","orderable" : true  },
+                {"data": "instanceIP","orderable" : true,
+                    "render":function(data, type, full, meta) {
+                        if(full.instanceIP === null){
+                            if(full.privateIpAddress === null){
+                                return '-';
+                            }else{
+                                return full.privateIpAddress;
+                            }
+                        }else{
+                            return full.instanceIP;
+                        }
+                    }
+                },
                 {"data": "","orderable" : true,
                     "render":function(data, type, full, meta) {
                         return full.region?full.region:full.providerData?full.providerData.region:'-';
@@ -1697,7 +1709,15 @@ <h4 class="modal-title">Importing Instances</h4>
                     {"data": "os","orderable" : false  },
                     {"data": "","orderable" : true,
                         "render":function(data, type, full, meta) {
-                            return full.ip !== null ? full.ip:full.privateIpAddress;
+                            if(full.ip === null){
+                                if(full.privateIpAddress === null){
+                                    return '-';
+                                }else{
+                                    return full.privateIpAddress;
+                                }
+                            }else{
+                                return full.ip;
+                            }
                         }
                     },
                     {"data": "","orderable" : true,
@@ -1866,7 +1886,15 @@ <h4 class="modal-title">Importing Instances</h4>
                     {"data": "os","orderable" : false  },
                     {"data": "","orderable" : true,
                         "render":function(data, type, full, meta) {
-                            return full.ip !== null ? full.ip:full.privateIpAddress;
+                            if(full.ip === null){
+                                if(full.privateIpAddress === null){
+                                    return '-';
+                                }else{
+                                    return full.privateIpAddress;
+                                }
+                            }else{
+                                return full.ip;
+                            }
                         }
                     },
                     {"data": "state","orderable" : true  },
diff --git a/client/htmls/private/js/settingscommon.js b/client/htmls/private/js/settingscommon.js
index 2a258ad94..72feb9ac4 100755
--- a/client/htmls/private/js/settingscommon.js
+++ b/client/htmls/private/js/settingscommon.js
@@ -3441,11 +3441,11 @@ function isFormValid(formid) {
 							currCtrl.focus();
 						}
 
-						if (!/[!@#$%^&*]/.test(str)) {
+						/*if (!/[!@#$%^&*]/.test(str)) {
 							isValid = false;
 							errormessageforInput(currCtrl.attr('id'), "Atleast a special char is required.");
 							currCtrl.focus();
-						}
+						}*/
 					}
 					break;
 
diff --git a/client/htmls/public/instanceLog.html b/client/htmls/public/instanceLog.html
index dc1892ac7..4f13795fe 100644
--- a/client/htmls/public/instanceLog.html
+++ b/client/htmls/public/instanceLog.html
@@ -280,7 +280,7 @@ <h4 class="modal-title" id="myModalLabel">
 					} else if (managnedData[i].status == 'stopped') {
 						$tdStatus = $("<img title='stopped' class ='statusIcon' src = '../private/img/aws_logo_stopped.png' alt='statusType'/>");
 					}else if (managnedData[i].status == 'terminated') {
-						$tdStatus = $("<img title='terminated' class ='statusIcon' src = '../private/img/aws_iogo_inactive.png' alt='statusType'/>");
+						$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_iogo_inactive.png' alt='statusType'/>");
 					}else if (managnedData[i].status == 'shutting-down') {
diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js
index 5a285514a..d887a8374 100644
--- a/client/htmls/public/js/awsCapacity.js
+++ b/client/htmls/public/js/awsCapacity.js
@@ -254,8 +254,19 @@ $(document).ready(function() {
                     }
                 }
                 , {
-                "data": "instanceIP",
-                "orderable": true
+                "data": "",
+                "orderable": true,
+                    "render":function(data, type, full, meta) {
+                        if(full.instanceIP === null){
+                            if(full.privateIpAddress === null){
+                                return '-';
+                            }else{
+                                return full.privateIpAddress;
+                            }
+                        }else{
+                            return full.instanceIP;
+                        }
+                    }
             }, {
                 "data": "instanceState",
                 "orderable": true
@@ -302,11 +313,15 @@ $(document).ready(function() {
                  {
                 "data": "",
                 "orderable": true,
-                "render": function(data, type, full) {
-                    if(full.ip && full.ip !== null){
-                        return data;
+                "render": function(data, type, full,meta) {
+                    if(full.ip === null){
+                        if(full.privateIpAddress === null){
+                            return '-';
+                        }else{
+                            return full.privateIpAddress;
+                        }
                     }else{
-                        return full.privateIpAddress;
+                        return full.ip;
                     }
                 }
             }, {
@@ -376,7 +391,15 @@ $(document).ready(function() {
                 "data": "",
                 "orderable": true,
                 "render":function(data, type, full, meta) {
-                    return full.ip !== null ? full.ip:full.privateIpAddress;
+                    if(full.ip === null){
+                        if(full.privateIpAddress === null){
+                            return '-';
+                        }else{
+                            return full.privateIpAddress;
+                        }
+                    }else{
+                        return full.ip;
+                    }
                 }
             }, {
                 "data": "state",
diff --git a/server/app/model/classes/instance/instance.js b/server/app/model/classes/instance/instance.js
index 0d639e938..db7b94993 100755
--- a/server/app/model/classes/instance/instance.js
+++ b/server/app/model/classes/instance/instance.js
@@ -2118,18 +2118,20 @@ var InstancesDao = function() {
 
     this.updateInstanceStatus = function(instanceId, instance, callback) {
         var updateObj = {};
-        updateObj['instanceState'] = instance.state;
-        updateObj['subnetId']= instance.subnetId;
-        updateObj['instanceIP'] = instance.ip;
-        updateObj['vpcId'] = instance.vpcId;
-        updateObj['privateIpAddress'] = instance.privateIpAddress;
-        updateObj['tags'] = instance.tags;
         if(instance.status && instance.status === 'shutting-down'){
-            updateObj['isDeleted'] = false;
-        }else if (instance.state === 'terminated') {
+            updateObj['instanceState'] = instance.status;
+            updateObj['isDeleted'] = true;
+        }else if(instance.state === 'terminated' || instance.state === 'shutting-down'){
+            updateObj['instanceState'] = instance.state;
             updateObj['isDeleted'] = true;
-        }else {
+        }else{
+            updateObj['instanceState'] = instance.state;
             updateObj['isDeleted'] = false;
+            updateObj['subnetId']= instance.subnetId;
+            updateObj['instanceIP'] = instance.ip;
+            updateObj['vpcId'] = instance.vpcId;
+            updateObj['privateIpAddress'] = instance.privateIpAddress;
+            updateObj['tags'] = instance.tags;
         }
         Instances.update({
             "_id": ObjectId(instanceId)
diff --git a/server/app/model/unassigned-instances/unassigned-instances.js b/server/app/model/unassigned-instances/unassigned-instances.js
index 3c22fad2e..6108f11d1 100644
--- a/server/app/model/unassigned-instances/unassigned-instances.js
+++ b/server/app/model/unassigned-instances/unassigned-instances.js
@@ -187,15 +187,15 @@ UnassignedInstancesSchema.statics.updateInstance = function updateInstance(param
 UnassignedInstancesSchema.statics.updateInstanceStatus = function updateInstanceStatus(instanceId,instance,callback) {
     var updateObj={};
     updateObj['state'] = instance.state;
-    updateObj['subnetId']= instance.subnetId;
-    updateObj['ip'] = instance.ip;
-    updateObj['vpcId'] = instance.vpcId;
-    updateObj['privateIpAddress'] = instance.privateIpAddress;
-    updateObj['tags'] = instance.tags;
-    if(instance.state === 'terminated'){
+    if(instance.state === 'terminated' || instance.state === 'shutting-down'){
         updateObj['isDeleted'] = true;
     }else{
         updateObj['isDeleted'] = false;
+        updateObj['subnetId']= instance.subnetId;
+        updateObj['ip'] = instance.ip;
+        updateObj['vpcId'] = instance.vpcId;
+        updateObj['privateIpAddress'] = instance.privateIpAddress;
+        updateObj['tags'] = instance.tags;
     }
     UnassignedInstances.update({
         "_id": ObjectId(instanceId)
diff --git a/server/app/model/unmanaged-instance/unmanaged-instance.js b/server/app/model/unmanaged-instance/unmanaged-instance.js
index 4fdda1e63..f83182a5a 100644
--- a/server/app/model/unmanaged-instance/unmanaged-instance.js
+++ b/server/app/model/unmanaged-instance/unmanaged-instance.js
@@ -292,15 +292,15 @@ UnmanagedInstanceSchema.statics.getInstancesByProviderIdOrgIdAndPlatformId = fun
 UnmanagedInstanceSchema.statics.updateInstanceStatus = function updateInstanceStatus(instanceId,instance,callback) {
 	var updateObj={};
 	updateObj['state'] = instance.state;
-	updateObj['subnetId']= instance.subnetId;
-	updateObj['ip'] = instance.ip;
-	updateObj['vpcId'] = instance.vpcId;
-	updateObj['privateIpAddress'] = instance.privateIpAddress;
-	updateObj['tags'] = instance.tags;
-	if(instance.state === 'terminated'){
+	if(instance.state === 'terminated' || instance.state === 'shutting-down'){
 		updateObj['isDeleted'] = true;
 	}else{
-		updateObj['isDeleted'] = false;  
+		updateObj['isDeleted'] = false;
+		updateObj['subnetId']= instance.subnetId;
+		updateObj['ip'] = instance.ip;
+		updateObj['vpcId'] = instance.vpcId;
+		updateObj['privateIpAddress'] = instance.privateIpAddress;
+		updateObj['tags'] = instance.tags;
 	}
 	UnmanagedInstance.update({
 			"_id": ObjectId(instanceId)
diff --git a/server/app/routes/v1.0/routes_cloudformation.js b/server/app/routes/v1.0/routes_cloudformation.js
index f5303496e..7d5ccc97f 100755
--- a/server/app/routes/v1.0/routes_cloudformation.js
+++ b/server/app/routes/v1.0/routes_cloudformation.js
@@ -163,7 +163,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
                                                 projectName: instance.projectName,
                                                 envName: instance.environmentName,
                                                 status: 'shutting-down',
-                                                actionStatus: "success",
+                                                actionStatus: "pending",
                                                 platformId: instance.platformId,
                                                 blueprintName: instance.blueprintData.blueprintName,
                                                 data: instance.runlist,
diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 2c62a26a4..508360f6a 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -1371,6 +1371,7 @@ function instanceSyncWithAWS(instanceId,instanceData,callback){
 
 function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestampStarted,next){
     var actionLog = instancesModel.insertInstanceStatusActionLog(instance._id, user, instanceState, timestampStarted);
+    var actionAction = 'success';
     var logReferenceIds = [instance._id, actionLog._id];
     logsDao.insertLog({
         referenceId: logReferenceIds,
@@ -1378,6 +1379,9 @@ function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestamp
         log: "Instance " + instanceState,
         timestamp: timestampStarted
     });
+    if(instanceState === 'shutting-down'){
+        actionAction = 'pending';
+    }
     var instanceLog = {
         actionId: actionLog._id,
         instanceId: instance._id,
@@ -1386,7 +1390,7 @@ function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestamp
         projectName: instance.projectName,
         envName: instance.environmentName,
         status: instanceState,
-        actionStatus: "success",
+        actionStatus: actionAction,
         platformId: instance.platformId,
         blueprintName: instance.blueprintData.blueprintName,
         data: instance.runlist,

From 28482a1a921f7691625490201ee3214fb87ffc5c Mon Sep 17 00:00:00 2001
From: Durgesh1988 <durgeshch@gmail.com>
Date: Thu, 15 Sep 2016 17:31:33 +0530
Subject: [PATCH 3/3] CAT-2333/CAT-2335/CAT-2334 Fixed

---
 server/app/services/instanceService.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/app/services/instanceService.js b/server/app/services/instanceService.js
index 508360f6a..283679c93 100644
--- a/server/app/services/instanceService.js
+++ b/server/app/services/instanceService.js
@@ -1371,7 +1371,7 @@ function instanceSyncWithAWS(instanceId,instanceData,callback){
 
 function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestampStarted,next){
     var actionLog = instancesModel.insertInstanceStatusActionLog(instance._id, user, instanceState, timestampStarted);
-    var actionAction = 'success';
+    var actionStatus = 'success';
     var logReferenceIds = [instance._id, actionLog._id];
     logsDao.insertLog({
         referenceId: logReferenceIds,
@@ -1380,7 +1380,7 @@ function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestamp
         timestamp: timestampStarted
     });
     if(instanceState === 'shutting-down'){
-        actionAction = 'pending';
+        actionStatus = 'pending';
     }
     var instanceLog = {
         actionId: actionLog._id,
@@ -1390,7 +1390,7 @@ function createOrUpdateInstanceLogs(instance,instanceState,action,user,timestamp
         projectName: instance.projectName,
         envName: instance.environmentName,
         status: instanceState,
-        actionStatus: actionAction,
+        actionStatus: actionStatus,
         platformId: instance.platformId,
         blueprintName: instance.blueprintData.blueprintName,
         data: instance.runlist,