cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to 823c725
Date Fri, 19 Jul 2013 20:21:00 GMT
Updated Branches:
  refs/heads/master 1c21a6296 -> 823c72552


InternalLb: fixed creation for default network offering with internal lb support - public
lb support should be disbaled on it


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

Branch: refs/heads/master
Commit: 823c72552e82a7210a2156cd0e1d1be6c55bfb4b
Parents: 1c21a62
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Jul 19 12:59:42 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Jul 19 13:20:57 2013 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java | 4 ++++
 server/src/com/cloud/network/NetworkManagerImpl.java         | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/823c7255/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
index f8f25ea..b0cb85d 100755
--- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
+++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java
@@ -436,4 +436,8 @@ public class NetworkOfferingVO implements NetworkOffering {
     public void setConcurrentConnections(Integer concurrent_connections) {
         this.concurrent_connections = concurrent_connections;
     }
+
+    public void setPublicLb(boolean publicLb) {
+        this.publicLb = publicLb;
+    }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/823c7255/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 196f7de..279ea84 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1429,6 +1429,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager,
L
                     true, Network.GuestType.Isolated, false, null, false, null, false, false,
null, false, null);
             offering.setState(NetworkOffering.State.Enabled);
             offering.setInternalLb(true);
+            offering.setPublicLb(false);
             _networkOfferingDao.update(offering.getId(), offering);
         }
 


Mime
View raw message