Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BD5A10A7C for ; Thu, 3 Oct 2013 19:48:06 +0000 (UTC) Received: (qmail 13561 invoked by uid 500); 3 Oct 2013 19:48:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 13430 invoked by uid 500); 3 Oct 2013 19:48:00 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 12900 invoked by uid 99); 3 Oct 2013 19:47:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 19:47:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9B5F290EE19; Thu, 3 Oct 2013 19:47:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 03 Oct 2013 19:47:54 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/10] git commit: updated refs/heads/ui-restyle to fbb0499 Updated Branches: refs/heads/ui-restyle 8351bd709 -> fbb0499be CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2bf7f03 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2bf7f03 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2bf7f03 Branch: refs/heads/ui-restyle Commit: a2bf7f035ee09b294aa41fe85944f2f510aefacc Parents: b44bc9d Author: Alena Prokharchyk Authored: Wed Oct 2 11:09:44 2013 -0700 Committer: Alena Prokharchyk Committed: Wed Oct 2 11:09:44 2013 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2bf7f03/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java index 78ee674..48b83b4 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -663,7 +663,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { services.put("SecurityGroup", "SecurityGroupProvider"); } - if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) || uniqueName.equalsIgnoreCase(externalOfferingName)) { + if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) || uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString() + "-redundant") || uniqueName.equalsIgnoreCase(externalOfferingName)) { if (externalOfferingName != null && uniqueName.equalsIgnoreCase(externalOfferingName)) { services.put("SourceNat", "JuniperSRX"); services.put("PortForwarding", "JuniperSRX");