From 27df0252b23b7c9ac27904ad9bfe24b1a86d92f1 Mon Sep 17 00:00:00 2001 From: Durgesh1988 Date: Fri, 16 Sep 2016 16:43:11 +0530 Subject: [PATCH] CAT-2335/CAT-2336 Fixed --- .../ajax/Settings/CreateProviders.html | 4 +- .../private/ajax/Settings/providerSync.html | 9 +++- client/htmls/public/js/awsCapacity.js | 6 +++ .../AWSRDSS3ProviderSync.js | 51 ++++++++++-------- .../cronjobs/provider-sync/AWSProviderSync.js | 53 ++++++++++--------- 5 files changed, 73 insertions(+), 50 deletions(-) diff --git a/client/htmls/private/ajax/Settings/CreateProviders.html b/client/htmls/private/ajax/Settings/CreateProviders.html index c677ead19..810efca2f 100755 --- a/client/htmls/private/ajax/Settings/CreateProviders.html +++ b/client/htmls/private/ajax/Settings/CreateProviders.html @@ -222,11 +222,11 @@

- + - +
diff --git a/client/htmls/private/ajax/Settings/providerSync.html b/client/htmls/private/ajax/Settings/providerSync.html index 52fd4cadd..fd25800de 100644 --- a/client/htmls/private/ajax/Settings/providerSync.html +++ b/client/htmls/private/ajax/Settings/providerSync.html @@ -1055,6 +1055,11 @@

Importing Instances

var catalystEntityProjName = $('#projectnameLabelId').attr('catalystEntitytype'); var catalystEntityEnvName = $('#envnameLabelId').attr('catalystEntitytype'); var catalystEntityBgName = $('#bgNameLabelId').attr('catalystEntitytype'); + if(tagsListSelected.length > 0){ + $('.btnprojectMappingSave').attr('disabled',false); + }else{ + $('.btnprojectMappingSave').attr('disabled',true); + } for(var i=0;iImporting Instances

$bgtagsList.val(objtagName); } if(objcatalystEntityType == catalystEntityProjName){ + $('.btnprojectMappingSave').attr('disabled',false); $projecttagsList.val(objtagName); //For Mapping tab..... //For project catalystEntityType @@ -1244,6 +1250,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/environment', function(data) { if(data){ + $('.btnenvMappingSave').attr('disabled',false); var $tbody = $('#mappingenvTable tbody').empty(); for(var i = 0; i < envList.length; i++){ //For Table @@ -1285,6 +1292,7 @@

Importing Instances

$.get('/providers/'+urlproviderId+'/tag-mappings/bgName', function(data) { if(data){ + $('.btnbgMappingSave').attr('disabled',false); var $tbody = $('#mappingBgTable tbody').empty(); for(var i = 0; i < bgList.length; i++){ //For Table @@ -2013,7 +2021,6 @@

Importing Instances

bootbox.alert("Please configure tag-mapping for updating tags"); return false; } - return false; if(projectTagName === '' && envTagName === '' && bgTagName ===''){ bootbox.alert("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; diff --git a/client/htmls/public/js/awsCapacity.js b/client/htmls/public/js/awsCapacity.js index 4f4e9666d..07e0b8e97 100644 --- a/client/htmls/public/js/awsCapacity.js +++ b/client/htmls/public/js/awsCapacity.js @@ -480,6 +480,12 @@ $(document).ready(function() { } updateUniqueInstanceTagsObj["id"] = instanceId; updateUniqueInstanceTagsObj["tags"] = {}; + if((projectTagsMapName === 'undefined' || projectTagsMapName === '' || projectTagsMapName === null) && + (envTagsMapName === 'undefined' || envTagsMapName === '' || envTagsMapName === null) && + (bgTagsMapName === 'undefined' || bgTagsMapName === '' || bgTagsMapName === null)){ + toastr.error("Please configure tag-mapping for updating tags"); + return false; + } if(projectTagName === '' && envTagName === '' && bgTagName ===''){ toastr.error("Please update tag value in any text-box corresponding to selected check-box for updating tags"); return false; diff --git a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js index 30efbed80..65ae33759 100644 --- a/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js +++ b/server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js @@ -307,36 +307,41 @@ function tagMappingForResources(resources,provider,next){ var catalystProjectName = null; var catalystEnvironmentId = null; var catalystEnvironmentName = null; - var catalystBgtId = null; + var catalystBgId = null; var catalystBgName = null; var assignmentFound = false; - if ((bgTag || projectTag || environmentTag) && (resources[j].isDeleted === false) - && ((bgTag.name in resources[j].tags) || (projectTag.name in resources[j].tags) || (environmentTag.name in resources[j].tags))) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[bgTag.name] !== '' && - bgTag.catalystEntityMapping[y].tagValue === resources[j].tags[bgTag.name]) { - catalystBgtId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; - break; + if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (resources[j].isDeleted === false)){ + if(bgTag !== null && bgTag.name in resources[j].tags) { + for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { + if (bgTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[bgTag.name] !== '' + && bgTag.catalystEntityMapping[y].tagValue === resources[j].tags[bgTag.name]) { + catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; + catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === resources[j].tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; - break; + if(projectTag !== null && projectTag.name in resources[j].tags) { + for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { + if (projectTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[projectTag.name] !== '' && + projectTag.catalystEntityMapping[y].tagValue === resources[j].tags[projectTag.name]) { + catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; + catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === resources[j].tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; - break; + if(environmentTag !== null && environmentTag.name in resources[j].tags) { + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + if (environmentTag.catalystEntityMapping[y].tagValue !== '' && resources[j].tags[environmentTag.name] !== '' && + environmentTag.catalystEntityMapping[y].tagValue === resources[j].tags[environmentTag.name]) { + catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; + catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - if (catalystProjectId || catalystEnvironmentId || catalystBgtId) { + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { assignmentFound = true; } if (assignmentFound === true) { @@ -344,7 +349,7 @@ function tagMappingForResources(resources,provider,next){ var masterDetails = { orgId: resources[j].masterDetails.orgId, orgName: resources[j].masterDetails.orgName, - bgId: catalystBgtId, + bgId: catalystBgId, bgName: catalystBgName, projectId: catalystProjectId, projectName: catalystProjectName, diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index 062c046a9..39affbfcc 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -225,33 +225,38 @@ function tagMappingForInstances(instances,provider,next){ var catalystBgName = null; var assignmentFound = false; if(instance.tags) { - if ((bgTag || projectTag || environmentTag) && (instance.isDeleted === false) - && ((bgTag.name in instance.tags) || (projectTag.name in instance.tags) || (environmentTag.name in instance.tags))) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[bgTag.name] !== '' - && bgTag.catalystEntityMapping[y].tagValue === instance.tags[bgTag.name]) { - catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; - break; + if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (instance.isDeleted === false)){ + if(bgTag !== null && bgTag.name in instance.tags) { + for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { + if (bgTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[bgTag.name] !== '' + && bgTag.catalystEntityMapping[y].tagValue === instance.tags[bgTag.name]) { + catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; + catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === instance.tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; - break; + if(projectTag !== null && projectTag.name in instance.tags) { + for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { + if (projectTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[projectTag.name] !== '' && + projectTag.catalystEntityMapping[y].tagValue === instance.tags[projectTag.name]) { + catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; + catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === instance.tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; - break; + if(environmentTag !== null && environmentTag.name in instance.tags) { + for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { + if (environmentTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' && + environmentTag.catalystEntityMapping[y].tagValue === instance.tags[environmentTag.name]) { + catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; + catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + break; + } } } - if (catalystBgId || catalystProjectId || catalystEnvironmentId) { + if (catalystBgId !== null || catalystProjectId !== null || catalystEnvironmentId !== null) { assignmentFound = true; } if (assignmentFound === true) { @@ -277,9 +282,9 @@ function tagMappingForInstances(instances,provider,next){ ip: instance.ip, os: instance.os, state: instance.state, - subnetId: instance.SubnetId, - vpcId: instance.VpcId, - privateIpAddress: instance.PrivateIpAddress, + subnetId: instance.subnetId, + vpcId: instance.vpcId, + privateIpAddress: instance.privateIpAddress, tags: instance.tags, } assignedInstanceList.push(assignedInstanceObj);