apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3016: UI - (1) remove obsolete code that pass zonetype to API calls. (2) network menu: use listZones&networktype=Advanced to determine which section to show.

Browse Source
This commit is contained in:
Jessica Wang 2013-06-19 11:49:05 -07:00
parent 928d94265b
commit 2d10ae7580
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ui/scripts/network.js
View File

@ -275,13 +275,29 @@
}; };
var networkOfferingObjs = []; var networkOfferingObjs = [];
var checkVpc=0; var advZoneObjs;
cloudStack.sections.network = { cloudStack.sections.network = {
title: 'label.network', title: 'label.network',
id: 'network', id: 'network',
sectionSelect: { sectionSelect: {
preFilter: function(args) { preFilter: function(args) {
var havingSecurityGroupNetwork = false; var sectionsToShow = ['networks'];
$.ajax({
url: createURL('listZones'),
data: {
networktype: 'Advanced'
},
async: false,
success: function(json) {
advZoneObjs = json.listzonesresponse.zone;
if(advZoneObjs != null && advZoneObjs.length > 0) {
sectionsToShow.push('vpc');
sectionsToShow.push('vpnCustomerGateway');
}
}
});
$.ajax({ $.ajax({
url: createURL('listNetworks', { ignoreProject: true }), url: createURL('listNetworks', { ignoreProject: true }),
@ -291,23 +307,13 @@
details: 'min' details: 'min'
}, },
async: false, async: false,
success: function(data) { success: function(json) {
if (data.listnetworksresponse.network != null && data.listnetworksresponse.network.length > 0) { if(json.listnetworksresponse.network != null && json.listnetworksresponse.network.length > 0) {
havingSecurityGroupNetwork = true; sectionsToShow.push('securityGroups');
} }
} }
}); });
var sectionsToShow = ['networks'];
if(args.context.zoneType != 'Basic') { //Advanced type or all types
sectionsToShow.push('vpc');
sectionsToShow.push('vpnCustomerGateway');
}
if(havingSecurityGroupNetwork == true)
sectionsToShow.push('securityGroups');
return sectionsToShow; return sectionsToShow;
}, },
@ -323,11 +329,18 @@
add: { add: {
label: 'Add Isolated Guest Network with SourceNat', label: 'Add Isolated Guest Network with SourceNat',
preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone preFilter: function(args) {
if(args.context.zoneType != 'Basic') if(advZoneObjs != null && advZoneObjs.length > 0) {
for(var i = 0; i < advZoneObjs.length; i++) {
if(advZoneObjs[i].securitygroupsenabled != true) { //'Add Isolated Guest Network with SourceNat' is only supported in Advanced SG-disabled zone
return true; return true;
else }
}
return false; return false;
}
else{
return false;
}
}, },
createForm: { createForm: {

4
ui/scripts/sharedFunctions.js
View File

@ -115,10 +115,6 @@ function createURL(apiName, options) {
urlString = urlString + '&projectid=' + cloudStack.context.projects[0].id; urlString = urlString + '&projectid=' + cloudStack.context.projects[0].id;
} }
if(cloudStack.context != null && cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
urlString = urlString + '&zonetype=' + cloudStack.context.zoneType;
}
return urlString; return urlString;
} }