Skip to content

CAT-2335/CAT-2336 Fixed #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2016
Merged

CAT-2335/CAT-2336 Fixed #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27df025
CAT-2335/CAT-2336 Fixed
Durgesh1988 Sep 16, 2016
34b1f8d
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/htmls/private/ajax/Settings/CreateProviders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@ <h4 class="widget-margin" style="color: black;"><span id="spnprovider"></span></
</div>
<div class="row">
<div class="col-lg-6 col-md-6 margintop20 foraws">
<label for="">S3 Bucket Name:<span style="color: Red;" class="control-label">&nbsp;*</span></label>
<label for="">S3 Bucket Name:</label>
<span>
<img data-toggle="popover" data-html="true" data-placement="left" title="S3 bucket to which AWS bills are delivered. NOTE: Detailed billing has to be enabled in AWS." src="img/help.png"/>
</span>
<input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" cat-validation="required" placeholder="Enter the S3 Bucket Name">
<input name="s3BucketName" id="s3BucketName" class="form-control" type="text" cdata="catalyst" placeholder="Enter the S3 Bucket Name">
</div>

<div class="col-lg-6 col-md-6 margintop20 foraws">
Expand Down
9 changes: 8 additions & 1 deletion client/htmls/private/ajax/Settings/providerSync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,6 +1055,11 @@ <h4 class="modal-title">Importing Instances</h4>
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;i<tagsListSelected.length;i++){
var objcatalystEntityType = tagsListSelected[i].catalystEntityType;
Expand All @@ -1066,6 +1071,7 @@ <h4 class="modal-title">Importing Instances</h4>
$bgtagsList.val(objtagName);
}
if(objcatalystEntityType == catalystEntityProjName){
$('.btnprojectMappingSave').attr('disabled',false);
$projecttagsList.val(objtagName);
//For Mapping tab.....
//For project catalystEntityType
Expand Down Expand Up @@ -1244,6 +1250,7 @@ <h4 class="modal-title">Importing Instances</h4>

$.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
Expand Down Expand Up @@ -1285,6 +1292,7 @@ <h4 class="modal-title">Importing Instances</h4>

$.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
Expand Down Expand Up @@ -2013,7 +2021,6 @@ <h4 class="modal-title">Importing Instances</h4>
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;
Expand Down
6 changes: 6 additions & 0 deletions client/htmls/public/js/awsCapacity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,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;
Expand Down
51 changes: 28 additions & 23 deletions server/app/cronjobs/provider-rds-s3-sync/AWSRDSS3ProviderSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,44 +307,49 @@ 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) {
count++;
var masterDetails = {
orgId: resources[j].masterDetails.orgId,
orgName: resources[j].masterDetails.orgName,
bgId: catalystBgtId,
bgId: catalystBgId,
bgName: catalystBgName,
projectId: catalystProjectId,
projectName: catalystProjectName,
Expand Down
53 changes: 29 additions & 24 deletions server/app/cronjobs/provider-sync/AWSProviderSync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down