CLOUDSTACK-8844: Network Update from RVR offering to Standalone offering fails - Fixed

kansal · kansal · commit e24ecccdea06 · 2015-10-30T10:54:45.000+05:30
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -619,4 +619,9 @@ public void setStrechedL2Network(boolean strechedL2Network) {
     public void setVpcId(Long vpcId) {
         this.vpcId = vpcId;
     }
+
+    public void setIsReduntant(boolean reduntant) {
+        this.isRedundant = reduntant;
+    }
+
 }
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2100,6 +2100,9 @@ public Network updateGuestNetwork(final long networkId, String name, String disp
                 }
                 restartNetwork = true;
                 networkOfferingChanged = true;
+
+                //Setting the new network's isReduntant to the new network offering's RedundantRouter.
+                network.setIsReduntant(_networkOfferingDao.findById(networkOfferingId).getRedundantRouter());
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -619,4 +619,9 @@ public void setStrechedL2Network(boolean strechedL2Network) {`
`619`	`619`	`public void setVpcId(Long vpcId) {`
`620`	`620`	`this.vpcId = vpcId;`
`621`	`621`	`}`
	`622`	`+`
	`623`	`+ public void setIsReduntant(boolean reduntant) {`
	`624`	`+ this.isRedundant = reduntant;`
	`625`	`+ }`
	`626`	`+`
`622`	`627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2100,6 +2100,9 @@ public Network updateGuestNetwork(final long networkId, String name, String disp`
`2100`	`2100`	`}`
`2101`	`2101`	`restartNetwork = true;`
`2102`	`2102`	`networkOfferingChanged = true;`
	`2103`	`+`
	`2104`	`+ //Setting the new network's isReduntant to the new network offering's RedundantRouter.`
	`2105`	`+ network.setIsReduntant(_networkOfferingDao.findById(networkOfferingId).getRedundantRouter());`
`2103`	`2106`	`}`
`2104`	`2107`	`}`
`2105`	`2108`