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

Alena Prokharchyk · Alena Prokharchyk · commit a2bf7f035ee0 · 2013-10-02T11:09:44.000-07:00
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -663,7 +663,7 @@ private void createNetworkOfferingServices(Connection conn, String externalOffer
                     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");

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ private void createNetworkOfferingServices(Connection conn, String externalOffer`
`663`	`663`	`services.put("SecurityGroup", "SecurityGroupProvider");`
`664`	`664`	`}`
`665`	`665`
`666`		`- if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) \|\| uniqueName.equalsIgnoreCase(externalOfferingName)) {`
	`666`	`+ if (uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString()) \|\| uniqueName.equals(NetworkOffering.DefaultIsolatedNetworkOfferingWithSourceNatService.toString() + "-redundant") \|\| uniqueName.equalsIgnoreCase(externalOfferingName)) {`
`667`	`667`	`if (externalOfferingName != null && uniqueName.equalsIgnoreCase(externalOfferingName)) {`
`668`	`668`	`services.put("SourceNat", "JuniperSRX");`
`669`	`669`	`services.put("PortForwarding", "JuniperSRX");`