etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-16044: Zone wizard: Add 'use local storage' checkbox 

Add checkbox to zone wizard indicating whether zone will use local
storage. If checked, bypass add primary storage step and enable local
storage for zone on creation.
This commit is contained in:
Brian Federle 2012-08-20 11:07:06 -07:00
parent 717623132d
commit 9ef1730c97
3 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -1,4 +1,5 @@
#new labels (begin) **********************************************************************************************
label.local.storage.enabled=Local storage enabled
label.tier.details=Tier details
label.edit.tags=Edit tags
label.network.rate.megabytes=Network Rate (MB/s)

1
ui/index.jsp
View File

@ -1602,6 +1602,7 @@
</html>
<script language="javascript">
dictionary = {
'label.local.storage.enabled': '<fmt:message key="label.local.storage.enabled"/>',
'label.tier.details': '<fmt:message key="label.tier.details"/>',
'label.edit.tags': '<fmt:message key="label.edit.tags"/>',
'label.network.rate.megabytes': '<fmt:message key="label.network.rate.megabytes"/>',

38
ui/scripts/zoneWizard.js
View File

@ -283,31 +283,8 @@
return (args.groupedData.zone.hypervisor != "VMware");
},
addPrimaryStorage: function(args) {
var item;
$.ajax({
url: createURL("listConfigurations&name=" + todb("use.local.storage")),
dataType: 'json',
async: false,
success: function(json) {
var items = json.listconfigurationsresponse.configuration; //unfortunately, it returns 2 items("system.vm.use.local.storage", "use.local.storage") instead of 1 item.
if(items != null && items.length > 0) {
for(var i = 0; i < items.length; i++) {
item = items[i];
if(item.name == "use.local.storage") {
break; //break for loop
}
}
}
}
});
if(item == null || item.value == null || item.value.length == 0 || item.value == "false")
configurationUseLocalStorage = false;
else
configurationUseLocalStorage = true;
return (!configurationUseLocalStorage);
addPrimaryStorage: function(args) {
return args.data.localstorageenabled != 'on';
}
},
@ -512,6 +489,10 @@
}
});
}
},
localstorageenabled: {
label: 'label.local.storage.enabled',
isBoolean: true
}
}
},
@ -1259,6 +1240,9 @@
array1.push("&name=" + todb(args.data.zone.name));
if (args.data.zone.localstorageenabled == 'on') {
array1.push("&localstorageenabled=true");
}
array1.push("&dns1=" + todb(args.data.zone.dns1));
var dns2 = args.data.zone.dns2;
@ -2798,8 +2782,8 @@
});
},
addPrimaryStorage: function(args) {
if(configurationUseLocalStorage == true) { //use local storage, don't need primary storage. So, skip this step.
addPrimaryStorage: function(args) {
if(args.data.zone.localstorageenabled == 'on') { //use local storage, don't need primary storage. So, skip this step.
stepFns.addSecondaryStorage({
data: args.data
});