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/23 16:22:22 UTC
[1/2] git commit: updated refs/heads/pr818-rebased to c9ad869
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 <ka...@gmail.com>
Authored: Mon Sep 14 16:45:49 2015 +0530
Committer: Kshitij Kansal <ka...@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());
}
}
[2/2] git commit: updated refs/heads/pr818-rebased to c9ad869
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/c9ad8696
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9ad8696
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9ad8696
Branch: refs/heads/pr818-rebased
Commit: c9ad8696be8652402c62862059f54c76914e988a
Parents: fb0871b e6bf65c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Oct 23 16:20:46 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Oct 23 16:20:47 2015 +0200
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------