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

CLOUDSTACK-5139: UI > zone wizard > secondary storage step > providers dropdown - hardcode options instead of get them from listStorageProviders&type=image since not all of returned values are handled by UI (e.g. "NetApp" is not handled by UI).

This commit is contained in:
Jessica Wang 2013-12-04 15:01:38 -08:00
parent 71323f15c6
commit 9a0de43334
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/scripts/zoneWizard.js
View File

@ -1838,25 +1838,15 @@
if(s3stores != null && s3stores.length > 0) {
storageproviders.push({ id: 'S3', description: 'S3'}); //if (region-wide) S3 store exists already, only "S3" option should be included here. Any other type of store is not allowed to be created since cloudstack doesn't support multiple types of store at this point.
} else {
$.ajax({
url: createURL('listStorageProviders'),
data: {
type: 'image'
},
async: false,
success: function(json) {
var objs = json.liststorageprovidersresponse.dataStoreProvider;
if (objs != null) {
for (var i = 0; i < objs.length; i++) {
storageproviders.push({
id: objs[i].name,
description: objs[i].name
});
}
}
}
});
storageproviders.push({ id: 'SMB', description: 'SMB/cifs'}); //temporary, before Rajesh adds 'SMB' to listStorageProviders API response.
/*
UI no longer gets providers from "listStorageProviders&type=image" because:
(1) Not all of returned values are handled by UI (e.g. Provider "NetApp" is not handled by UI).
(2) Provider "SMB" which is handled by UI is not returned from "listStorageProviders&type=image"
*/
storageproviders.push({ id: 'NFS', description: 'NFS'});
storageproviders.push({ id: 'SMB', description: 'SMB/cifs'});
storageproviders.push({ id: 'S3', description: 'S3'});
storageproviders.push({ id: 'Swift', description: 'Swift'});
}
args.response.success({
data: storageproviders