apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

cloudStack 3.0 new UI - VM Wizard - If a basic zone is selected in step 1, check if its guest network includes security group service. If yes, display security groups in step 5. Otherwise, display nothing in step 5.

Browse Source
This commit is contained in:
Jessica Wang 2011-12-01 15:13:15 -08:00
parent ebfd69e285
commit 0d564e864c
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.jsp
View File

@ -179,7 +179,7 @@
<div class="network" wizard-step-id="network">
<!-- 5a: Network description -->
<div class="wizard-step-conditional nothing-to-select">
<p>Either your selected hypervisor does not have any additional network features or you don't have any zone that has security group enabled.</p>
<p>Either you select a basic zone whose guest network does not include security group service or your selected hypervisor does not have any additional network features or you don't have any zone that has security group enabled.</p>
<p>Thus, no additional network features.</p>
<p>Please proceed to the next step.</p>
</div>

33
ui/scripts/instances.js
View File

@ -206,14 +206,37 @@
if (selectedZoneObj.securitygroupsenabled == false) { //show network container
step5ContainerType = 'select-network';
}
else if (selectedZoneObj.securitygroupsenabled == true) { // if security group is enabled
if(selectedHypervisor == "VMware" || g_directAttachSecurityGroupsEnabled != "true")
else if (selectedZoneObj.securitygroupsenabled == true) { // if security group is enabled
var includingSecurityGroupService = false;
$.ajax({
url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id),
dataType: "json",
async: false,
success: function(json) {
//basic zone should have only one guest network returned in this API call
var items = json.listnetworksresponse.network;
if(items != null && items.length > 0) {
var networkObj = items[0];
var serviceObjArray = networkObj.service;
for(var k = 0; k < serviceObjArray.length; k++) {
if(serviceObjArray[k].name == "SecurityGroup") {
includingSecurityGroupService = true;
break;
}
}
}
}
});
if(includingSecurityGroupService == false || selectedHypervisor == "VMware" || g_directAttachSecurityGroupsEnabled != "true") { //???
step5ContainerType = 'nothing-to-select';
else
step5ContainerType = 'select-security-group';
}
else {
step5ContainerType = 'select-security-group';
}
}
//step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in!!!!!!!!!!!!
//step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in
if(step5ContainerType == 'select-network') {
var defaultNetworkArray = [], optionalNetworkArray = [];
var networkData = {