apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 9154: Add redundant state to DomainRouterResponse

Browse Source
This commit is contained in:
Sheng Yang 2011-06-14 19:30:30 -07:00
parent 206eef2805
commit 07a61686db
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/com/cloud/api/response/DomainRouterResponse.java
View File

@ -119,8 +119,8 @@ public class DomainRouterResponse extends BaseResponse {
@SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine") @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine")
private String serviceOfferingName; private String serviceOfferingName;
@SerializedName("redundantstate") @Param(description="the state of redundant virtual router")
private String redundantState;
@Override @Override
public Long getObjectId() { public Long getObjectId() {
@ -374,4 +374,12 @@ public class DomainRouterResponse extends BaseResponse {
public void setServiceOfferingName(String serviceOfferingName) { public void setServiceOfferingName(String serviceOfferingName) {
this.serviceOfferingName = serviceOfferingName; this.serviceOfferingName = serviceOfferingName;
} }
public String getRedundantState() {
return redundantState;
}
public void setRedundantState(String redundantState) {
this.redundantState = redundantState;
}
} }

5
api/src/com/cloud/network/router/VirtualRouter.java
View File

@ -30,8 +30,9 @@ public interface VirtualRouter extends VirtualMachine {
} }
Role getRole(); Role getRole();
public enum RedundantState { public enum RedundantState {
UNKNOWN,
MASTER, MASTER,
BACKUP, BACKUP
UNKNOWN
} }
RedundantState getRedundantState();
} }

1
core/src/com/cloud/vm/DomainRouterVO.java
View File

@ -160,6 +160,7 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter {
this.priority = priority; this.priority = priority;
} }
@Override
public RedundantState getRedundantState() { public RedundantState getRedundantState() {
return this.redundantState; return this.redundantState;
} }

1
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1257,6 +1257,7 @@ public class ApiResponseHelper implements ResponseGenerator {
routerResponse.setTemplateId(router.getTemplateId()); routerResponse.setTemplateId(router.getTemplateId());
routerResponse.setCreated(router.getCreated()); routerResponse.setCreated(router.getCreated());
routerResponse.setState(router.getState()); routerResponse.setState(router.getState());
routerResponse.setRedundantState(router.getRedundantState().toString());
if (router.getHostId() != null) { if (router.getHostId() != null) {
routerResponse.setHostId(router.getHostId()); routerResponse.setHostId(router.getHostId());