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]

Jessica Wang · Jessica Wang · commit db255b31dd0f · 2012-02-21T19:23:22.000-08:00
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
@@ -252,21 +252,26 @@
               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: {
           zone: {
             networkType: 'Basic',
             domain: 1,
             networkOfferingId: selectedNetworkOffering.id
-          }
+          },
+					pluginFrom: {
+					  name: 'installWizard',
+						selectedNetworkOfferingHavingSG: true
+					}						
         },
         response: {
           success: function(args) {
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
@@ -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;
