cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [23/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to 691bc9d
Date Tue, 18 Jun 2013 07:58:23 GMT
CLOUDSTACK-2914: default lb scheme to Public when the service LB is enabled, and scheme is
not specified explicitly


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc16e29f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc16e29f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc16e29f

Branch: refs/heads/disk_io_throttling
Commit: fc16e29f992d81156a4e08a77da215f8276f4efe
Parents: b0ea02e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Mon Jun 17 10:09:52 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Mon Jun 17 10:10:43 2013 -0700

----------------------------------------------------------------------
 .../api/command/admin/network/CreateNetworkOfferingCmd.java  | 2 +-
 .../com/cloud/configuration/ConfigurationManagerImpl.java    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc16e29f/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
----------------------------------------------------------------------
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
index 6410715..febb0c3 100644
--- 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;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc16e29f/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 131d340..68745bf 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3968,9 +3968,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                         _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 class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                 }
             }
         }
+        
+        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,


Mime
View raw message