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.
This commit is contained in:
Nitin Kumar Maharana 2017-08-23 02:18:32 +05:30 committed by Rohit Yadav
parent 7f987ace35
commit 1f29313071
2 changed files with 9 additions and 10 deletions

View File

@ -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;
}
}

View File

@ -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());
}
}