From 2d67815ddf61e7228e0eb269b8c28cee3a173a5c Mon Sep 17 00:00:00 2001 From: abhishek Date: Thu, 23 Sep 2010 10:23:03 -0700 Subject: [PATCH] bug 6239: some changes to the router api status 6239: resolved fixed --- .../async/executor/RouterExecutorHelper.java | 3 ++- .../executor/RouterOperationResultObject.java | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/async/executor/RouterExecutorHelper.java b/server/src/com/cloud/async/executor/RouterExecutorHelper.java index ba85c184eff..98e4e582c94 100644 --- a/server/src/com/cloud/async/executor/RouterExecutorHelper.java +++ b/server/src/com/cloud/async/executor/RouterExecutorHelper.java @@ -44,7 +44,8 @@ public class RouterExecutorHelper { resultObject.setGuestMacAddress(router.getGuestMacAddress()); resultObject.setTemplateId(router.getTemplateId()); resultObject.setCreated(router.getCreated()); - + resultObject.setGuestNetmask(router.getGuestNetmask()); + if (router.getHostId() != null) { resultObject.setHostname(managementServer.getHostBy(router.getHostId()).getName()); resultObject.setHostId(router.getHostId()); diff --git a/server/src/com/cloud/async/executor/RouterOperationResultObject.java b/server/src/com/cloud/async/executor/RouterOperationResultObject.java index ccfed01617d..74606c138f4 100644 --- a/server/src/com/cloud/async/executor/RouterOperationResultObject.java +++ b/server/src/com/cloud/async/executor/RouterOperationResultObject.java @@ -96,8 +96,19 @@ public class RouterOperationResultObject { private String state; @Param(name="hostname") - private String hostname; - + private String hostname; + + @Param(name="guestnetmask") + private String guestNetmask; + + public String getGuestNetmask(){ + return this.guestNetmask; + } + + public void setGuestNetmask(String guestNetmask){ + this.guestNetmask = guestNetmask; + } + public long getId() { return id; }