apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13665: Quick Install wizard - pick the network offering that has SecurityGroups service (but no LB, StaticNat). Enable SecurityGroups provider before creating a guest work. [reviewed-by: Brian]

Browse Source
This commit is contained in:
Jessica Wang 2012-02-21 19:23:05 -08:00
parent 4b5586c8df
commit db255b31dd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/scripts/installWizard.js
View File

@ -252,13 +252,14 @@
var services = $.map(networkOffering.service, function(service) {
return service.name;
});
return $.inArray('SecurityGroup', services) == -1;
//pick the network offering including SecurityGroup, but excluding Lb and StaticNat. (bug 13665)
return (($.inArray('SecurityGroup', services) != -1) && ($.inArray('Lb', services) == -1) && ($.inArray('StaticNat', services) == -1)) ;
}
)[0];
)[0];
}
});
cloudStack.zoneWizard.action($.extend(true, {}, args, {
// Plug in hard-coded values specific to quick install
data: {
@ -266,7 +267,11 @@
networkType: 'Basic',
domain: 1,
networkOfferingId: selectedNetworkOffering.id
}
},
pluginFrom: {
name: 'installWizard',
selectedNetworkOfferingHavingSG: true
}
},
response: {
success: function(args) {

5
ui/scripts/zoneWizard.js
View File

@ -1423,7 +1423,10 @@
$("body").stopTime(updateNetworkServiceProviderTimer);
if (result.jobstatus == 1) {
//alert("Virtual Router Provider is enabled");
if(args.data.pluginFrom != null && args.data.pluginFrom.name == "installWizard") {
selectedNetworkOfferingHavingSG = args.data.pluginFrom.selectedNetworkOfferingHavingSG;
}
if(selectedNetworkOfferingHavingSG == true) { //need to Enable security group provider first
// get network service provider ID of Security Group
var securityGroupProviderId;