You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/30 17:03:21 UTC
[1/2] git commit: updated refs/heads/master to 901d47c
Repository: cloudstack
Updated Branches:
refs/heads/master beaed0e9b -> 901d47c07
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/e24ecccd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e24ecccd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e24ecccd
Branch: refs/heads/master
Commit: e24ecccdea06f11fd8a6bf35c5955fbd661d0982
Parents: c03956e
Author: Kshitij Kansal <ka...@gmail.com>
Authored: Mon Sep 14 16:45:49 2015 +0530
Committer: Kshitij Kansal <ka...@gmail.com>
Committed: Fri Oct 30 10:54:45 2015 +0530
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 5 +++++
server/src/com/cloud/network/NetworkServiceImpl.java | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e24ecccd/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..65929d5 100644
--- 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 class NetworkVO implements Network {
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/e24ecccd/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 e50cbe7..a99d996 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());
}
}
[2/2] git commit: updated refs/heads/master to 901d47c
Posted by re...@apache.org.
Merge pull request #818 from kansal/CLOUDSTACK-8844
Fixed: Network Update from RVR offering to Standalone offering failsProblem: Moving a RVR network offering to standalone makes the status of VR's as UNKNOWN and Redundant Router marked with YES.
Fix: The network's isRedundant was not getting updated.
* pr/818:
CLOUDSTACK-8844: Network Update from RVR offering to Standalone offering fails - Fixed
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/901d47c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/901d47c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/901d47c0
Branch: refs/heads/master
Commit: 901d47c07edb06beef388c4e6b78e26ce87e2f6b
Parents: beaed0e e24eccc
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Oct 30 17:02:34 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Oct 30 17:02:34 2015 +0100
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 5 +++++
server/src/com/cloud/network/NetworkServiceImpl.java | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------