cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/pr818-rebased to c9ad869
Date Fri, 23 Oct 2015 14:22:22 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/pr818-rebased [created] c9ad8696b


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6bf65c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6bf65c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6bf65c6

Branch: refs/heads/pr818-rebased
Commit: e6bf65c6a2d5660afe13a924496bc8d36880c23f
Parents: 3ded3e9
Author: Kshitij Kansal <kansal.k@gmail.com>
Authored: Mon Sep 14 16:45:49 2015 +0530
Committer: Kshitij Kansal <kansal.k@gmail.com>
Committed: Mon Sep 28 10:04:19 2015 +0530

----------------------------------------------------------------------
 engine/schema/src/com/cloud/network/dao/NetworkVO.java | 7 ++++---
 server/src/com/cloud/network/NetworkServiceImpl.java   | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6bf65c6/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 34d5aa7..d0ebeda 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -616,7 +616,8 @@ public class NetworkVO implements Network {
         this.strechedL2Network = strechedL2Network;
     }
 
-    public void setVpcId(Long vpcId) {
-        this.vpcId = vpcId;
-    }
+    public void setVpcId(Long vpcId) { this.vpcId = vpcId;}
+
+    public void setIsReduntant(boolean reduntant){this.isRedundant = reduntant;}
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6bf65c6/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index abee178..73a87ce 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2100,6 +2100,9 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService
{
                 }
                 restartNetwork = true;
                 networkOfferingChanged = true;
+
+                //Setting the new network's isReduntant to the new network offering's RedundantRouter.
+                network.setIsReduntant(_networkOfferingDao.findById(networkOfferingId).getRedundantRouter());
             }
         }
 


Mime
View raw message