This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 1f29313 CLOUDSTACK-10002: Restart network with cleanup spawns
Redundant Routers(In Default Network Offering) (#2186)
1f29313 is described below
commit 1f29313071898a148ebc347b5509d3d7d041d3a4
Author: Nitin Kumar Maharana <[email protected]>
AuthorDate: Wed Aug 23 02:18:32 2017 +0530
CLOUDSTACK-10002: Restart network with cleanup spawns Redundant Routers(In
Default Network Offering) (#2186)
The setter name is different from what it should be used by update call.
---
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 17 ++++++++---------
server/src/com/cloud/network/NetworkServiceImpl.java | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index ee5c6b5..08a326a 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -67,7 +67,7 @@ public class NetworkVO implements Network {
String name;
@Column(name = "display_text")
- String displayText;;
+ String displayText;
@Column(name = "broadcast_uri")
URI broadcastUri;
@@ -299,14 +299,18 @@ public class NetworkVO implements Network {
return state;
}
+ // don't use this directly when possible, use Network state machine instead
+ public void setState(State state) {
+ this.state = state;
+ }
+
@Override
public boolean isRedundant() {
return this.redundant;
}
- // don't use this directly when possible, use Network state machine instead
- public void setState(State state) {
- this.state = state;
+ public void setRedundant(boolean redundant) {
+ this.redundant = redundant;
}
@Override
@@ -630,9 +634,4 @@ public class NetworkVO implements Network {
public void setVpcId(Long vpcId) {
this.vpcId = vpcId;
}
-
- public void setIsReduntant(boolean reduntant) {
- this.redundant = reduntant;
- }
-
}
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java
b/server/src/com/cloud/network/NetworkServiceImpl.java
index 0495606..36dd53f 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2121,7 +2121,7 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService {
networkOfferingChanged = true;
//Setting the new network's isReduntant to the new network
offering's RedundantRouter.
-
network.setIsReduntant(_networkOfferingDao.findById(networkOfferingId).getRedundantRouter());
+
network.setRedundant(_networkOfferingDao.findById(networkOfferingId).getRedundantRouter());
}
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
