From a2bf7f035ee09b294aa41fe85944f2f510aefacc Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Wed, 2 Oct 2013 11:09:44 -0700
Subject: [PATCH] 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

---
 engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
index 78ee674e069..48b83b41cfc 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");