diff --git a/api/src/com/cloud/api/response/DomainRouterResponse.java b/api/src/com/cloud/api/response/DomainRouterResponse.java index 33ce06a53ac..14576cee2fe 100644 --- a/api/src/com/cloud/api/response/DomainRouterResponse.java +++ b/api/src/com/cloud/api/response/DomainRouterResponse.java @@ -119,8 +119,8 @@ public class DomainRouterResponse extends BaseResponse { @SerializedName("serviceofferingname") @Param(description="the name of the service offering of the virtual machine") private String serviceOfferingName; - - + @SerializedName("redundantstate") @Param(description="the state of redundant virtual router") + private String redundantState; @Override public Long getObjectId() { @@ -374,4 +374,12 @@ public class DomainRouterResponse extends BaseResponse { public void setServiceOfferingName(String serviceOfferingName) { this.serviceOfferingName = serviceOfferingName; } + + public String getRedundantState() { + return redundantState; + } + + public void setRedundantState(String redundantState) { + this.redundantState = redundantState; + } } diff --git a/api/src/com/cloud/network/router/VirtualRouter.java b/api/src/com/cloud/network/router/VirtualRouter.java index 49c8d5eda96..d61adca6acd 100755 --- a/api/src/com/cloud/network/router/VirtualRouter.java +++ b/api/src/com/cloud/network/router/VirtualRouter.java @@ -30,8 +30,9 @@ public interface VirtualRouter extends VirtualMachine { } Role getRole(); public enum RedundantState { + UNKNOWN, MASTER, - BACKUP, - UNKNOWN + BACKUP } + RedundantState getRedundantState(); } diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java index fca4475d921..de49f24dca2 100755 --- a/core/src/com/cloud/vm/DomainRouterVO.java +++ b/core/src/com/cloud/vm/DomainRouterVO.java @@ -160,6 +160,7 @@ public class DomainRouterVO extends VMInstanceVO implements VirtualRouter { this.priority = priority; } + @Override public RedundantState getRedundantState() { return this.redundantState; } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index ea34e9b42fe..3fa1e45855f 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1257,6 +1257,7 @@ public class ApiResponseHelper implements ResponseGenerator { routerResponse.setTemplateId(router.getTemplateId()); routerResponse.setCreated(router.getCreated()); routerResponse.setState(router.getState()); + routerResponse.setRedundantState(router.getRedundantState().toString()); if (router.getHostId() != null) { routerResponse.setHostId(router.getHostId());