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

CLOUDSTACK-2029: UI - zone wizard - primary storage step - scope dropdown - show zone-wide option when hypervisor is VMware or KVM.

This commit is contained in:
Jessica Wang 2013-06-04 15:38:03 -07:00
parent e883526449
commit 782bf82744
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ui/scripts/zoneWizard.js
View File

@ -1233,26 +1233,21 @@
if(selectedHypervisorObj == null) {
return;
}
// ZWPS is supported only for KVM as the hypervisor
if(selectedHypervisorObj.hypervisortype != "KVM"){
var scope=[];
scope.push({ id: 'cluster', description: _l('label.cluster') });
//scope.push({ id: 'host', description: _l('label.host') });
args.response.success({data: scope});
}
else {
var scope=[];
scope.push({ id: 'zone', description: _l('label.zone.wide') });
scope.push({ id: 'cluster', description: _l('label.cluster') });
// scope.push({ id: 'host', description: _l('label.host') });
args.response.success({data: scope});
}
}
},
//zone-wide-primary-storage is supported only for KVM and VMWare
if(selectedHypervisorObj.hypervisortype == "KVM" || selectedHypervisorObj.hypervisortype == "VMware"){
var scope=[];
scope.push({ id: 'zone', description: _l('label.zone.wide') });
scope.push({ id: 'cluster', description: _l('label.cluster') });
args.response.success({data: scope});
}
else {
var scope=[];
scope.push({ id: 'cluster', description: _l('label.cluster') });
args.response.success({data: scope});
}
}
},
protocol: {
label: 'label.protocol',
@ -3514,6 +3509,11 @@
array1.push("&name=" + todb(args.data.primaryStorage.name));
array1.push("&scope=" + todb(args.data.primaryStorage.scope));
//zone-wide-primary-storage is supported only for KVM and VMWare
if(args.data.primaryStorage.scope == "zone") {
array1.push("&hypervisor=" + todb(args.data.returnedCluster.hypervisortype)); //hypervisor type of the hosts in zone that will be attached to this storage pool. KVM, VMware supported as of now.
}
var server = args.data.primaryStorage.server;
var url = null;
if (args.data.primaryStorage.protocol == "nfs") {