CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is not specified explicitly

Alena Prokharchyk · Alena Prokharchyk · commit fc16e29f992d · 2013-06-17T10:10:43.000-07:00
diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -95,7 +95,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
     @Parameter(name=ApiConstants.IS_PERSISTENT, type=CommandType.BOOLEAN, description="true if network offering supports persistent networks; defaulted to false if not specified")
     private Boolean isPersistent;
     
-    @Parameter(name=ApiConstants.DETAILS, type=CommandType.MAP, since="4.2.0", description="Template details in key/value pairs." +
+    @Parameter(name=ApiConstants.DETAILS, type=CommandType.MAP, since="4.2.0", description="Network offering details in key/value pairs." +
     		" Supported keys are internallbprovider/publiclbprovider with service provider as a value")
     protected Map details;
 
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3968,9 +3968,6 @@ public NetworkOfferingVO createNetworkOffering(String name, String displayText,
                         _networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.Lb), Service.Lb, Capability.LbSchemes, publicLbStr);
                         internalLb = publicLbStr.contains("internal");
                         publicLb = publicLbStr.contains("public");
-                    } else {
-                        //if not specified, default public lb to true
-                        publicLb = true;
                     }
                 }
             }
@@ -4009,6 +4006,11 @@ public NetworkOfferingVO createNetworkOffering(String name, String displayText,
                 }
             }
         }
+        
+        if (serviceProviderMap.containsKey(Service.Lb) && !internalLb && !publicLb) {
+            //if not specified, default public lb to true
+            publicLb = true;
+        }
 
         NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan,
                 networkRate, multicastRate, isDefault, availability, tags, type, conserveMode, dedicatedLb,

Original file line number	Diff line number	Diff line change
`@@ -3968,9 +3968,6 @@ public NetworkOfferingVO createNetworkOffering(String name, String displayText,`
`3968`	`3968`	`_networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.Lb), Service.Lb, Capability.LbSchemes, publicLbStr);`
`3969`	`3969`	`internalLb = publicLbStr.contains("internal");`
`3970`	`3970`	`publicLb = publicLbStr.contains("public");`
`3971`		`- } else {`
`3972`		`- //if not specified, default public lb to true`
`3973`		`- publicLb = true;`
`3974`	`3971`	`}`
`3975`	`3972`	`}`
`3976`	`3973`	`}`
`@@ -4009,6 +4006,11 @@ public NetworkOfferingVO createNetworkOffering(String name, String displayText,`
`4009`	`4006`	`}`
`4010`	`4007`	`}`
`4011`	`4008`	`}`
	`4009`	`+`
	`4010`	`+ if (serviceProviderMap.containsKey(Service.Lb) && !internalLb && !publicLb) {`
	`4011`	`+ //if not specified, default public lb to true`
	`4012`	`+ publicLb = true;`
	`4013`	`+ }`
`4012`	`4014`
`4013`	`4015`	`NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan,`
`4014`	`4016`	`networkRate, multicastRate, isDefault, availability, tags, type, conserveMode, dedicatedLb,`