Skip to content

Commit 1e539e8

Browse files
author
Jessica Wang
committed
CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storage
- Add Secondary Storage - when provider is S3, show option to create NFS cache storage.
1 parent 292e77b commit 1e539e8

1 file changed

Lines changed: 64 additions & 3 deletions

File tree

ui/scripts/system.js

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10380,7 +10380,11 @@
1038010380
$form.find('.form-item[rel=connectiontimeout]').hide();
1038110381
$form.find('.form-item[rel=maxerrorretry]').hide();
1038210382
$form.find('.form-item[rel=sockettimeout]').hide();
10383-
10383+
$form.find('.form-item[rel=createNfsCache]').hide();
10384+
$form.find('.form-item[rel=nfsCacheZoneid]').hide();
10385+
$form.find('.form-item[rel=nfsCacheNfsServer]').hide();
10386+
$form.find('.form-item[rel=nfsCachePath]').hide();
10387+
1038410388
//Swift
1038510389
$form.find('.form-item[rel=url]').hide();
1038610390
$form.find('.form-item[rel=account]').hide();
@@ -10401,7 +10405,14 @@
1040110405
$form.find('.form-item[rel=usehttps]').css('display', 'inline-block');
1040210406
$form.find('.form-item[rel=connectiontimeout]').css('display', 'inline-block');
1040310407
$form.find('.form-item[rel=maxerrorretry]').css('display', 'inline-block');
10404-
$form.find('.form-item[rel=sockettimeout]').css('display', 'inline-block');
10408+
$form.find('.form-item[rel=sockettimeout]').css('display', 'inline-block');
10409+
10410+
$form.find('.form-item[rel=createNfsCache]').find('input').attr('checked','checked');
10411+
$form.find('.form-item[rel=createNfsCache]').css('display', 'inline-block');
10412+
$form.find('.form-item[rel=nfsCacheZoneid]').css('display', 'inline-block');
10413+
$form.find('.form-item[rel=nfsCacheNfsServer]').css('display', 'inline-block');
10414+
$form.find('.form-item[rel=nfsCachePath]').css('display', 'inline-block');
10415+
1040510416

1040610417
//Swift
1040710418
$form.find('.form-item[rel=url]').hide();
@@ -10424,7 +10435,11 @@
1042410435
$form.find('.form-item[rel=connectiontimeout]').hide();
1042510436
$form.find('.form-item[rel=maxerrorretry]').hide();
1042610437
$form.find('.form-item[rel=sockettimeout]').hide();
10427-
10438+
$form.find('.form-item[rel=createNfsCache]').hide();
10439+
$form.find('.form-item[rel=nfsCacheZoneid]').hide();
10440+
$form.find('.form-item[rel=nfsCacheNfsServer]').hide();
10441+
$form.find('.form-item[rel=nfsCachePath]').hide();
10442+
1042810443
//Swift
1042910444
$form.find('.form-item[rel=url]').css('display', 'inline-block');
1043010445
$form.find('.form-item[rel=account]').css('display', 'inline-block');
@@ -10499,6 +10514,52 @@
1049910514
connectiontimeout: { label: 'label.s3.connection_timeout' },
1050010515
maxerrorretry: { label: 'label.s3.max_error_retry' },
1050110516
sockettimeout: { label: 'label.s3.socket_timeout' },
10517+
10518+
createNfsCache: {
10519+
label: 'Create NFS Cache Storage',
10520+
isBoolean: true,
10521+
isChecked: true
10522+
},
10523+
nfsCacheZoneid: {
10524+
dependsOn: 'createNfsCache',
10525+
label: 'Zone',
10526+
validation: { required: true },
10527+
select: function(args) {
10528+
$.ajax({
10529+
url: createURL('listZones'),
10530+
data: {
10531+
listAll: true
10532+
},
10533+
success: function(json) {
10534+
var zones = json.listzonesresponse.zone;
10535+
10536+
if(zones != null){ //$.map(items, fn) - items can not be null
10537+
args.response.success({
10538+
data: $.map(zones, function(zone) {
10539+
return {
10540+
id: zone.id,
10541+
description: zone.name
10542+
};
10543+
})
10544+
});
10545+
}
10546+
else {
10547+
args.response.success({data: null});
10548+
}
10549+
}
10550+
});
10551+
}
10552+
},
10553+
nfsCacheNfsServer: {
10554+
dependsOn: 'createNfsCache',
10555+
label: 'label.nfs.server',
10556+
validation: { required: true }
10557+
},
10558+
nfsCachePath: {
10559+
dependsOn: 'createNfsCache',
10560+
label: 'label.path',
10561+
validation: { required: true }
10562+
},
1050210563
//S3 (end)
1050310564

1050410565

0 commit comments

Comments
 (0)