From 242f46118bffb151553b701dcc8ae1c6bae65fd2 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 19 Jul 2013 12:59:42 -0700 Subject: [PATCH] InternalLb: fixed creation for default network offering with internal lb support - public lb support should be disbaled on it Conflicts: engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java --- engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java | 3 +++ server/src/com/cloud/network/NetworkManagerImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java index 6317f72d0df..f21136e5d36 100755 --- a/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java +++ b/engine/schema/src/com/cloud/offerings/NetworkOfferingVO.java @@ -426,4 +426,7 @@ public class NetworkOfferingVO implements NetworkOffering { this.internalLb = internalLb; } + public void setPublicLb(boolean publicLb) { + this.publicLb = publicLb; + } } diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 736f2a16fde..8368f9507b0 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1428,6 +1428,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false); offering.setState(NetworkOffering.State.Enabled); offering.setInternalLb(true); + offering.setPublicLb(false); _networkOfferingDao.update(offering.getId(), offering); }