diff --git a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java index bde83fad080..03d42623479 100644 --- a/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java @@ -125,7 +125,8 @@ public class CreateIPForwardingRuleCmd extends BaseCmd { ruleData.add(new Pair(BaseCmd.Properties.PRIVATE_PORT.getName(), firewallRule.getPrivatePort())); ruleData.add(new Pair(BaseCmd.Properties.PROTOCOL.getName(), firewallRule.getProtocol())); ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_NAME.getName(), userVM.getName())); - ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), userVM.getId().toString())); + ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_DISPLAYNAME.getName(), userVM.getDisplayName())); + ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), Long.toString(userVM.getId()))); forwardingTag[0] = ruleData; diff --git a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index 180e416c69b..c98ac51b71a 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -126,6 +126,7 @@ public class ListPortForwardingRulesCmd extends BaseCmd { if (userVM != null) { ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), userVM.getId().toString())); ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_NAME.getName(), userVM.getName())); + ruleData.add(new Pair(BaseCmd.Properties.VIRTUAL_MACHINE_DISPLAYNAME.getName(), userVM.getDisplayName())); } forwardingTag[i++] = ruleData; diff --git a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleExecutor.java b/server/src/com/cloud/async/executor/UpdatePortForwardingRuleExecutor.java index 351ea5e372a..61d1657cad1 100644 --- a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleExecutor.java +++ b/server/src/com/cloud/async/executor/UpdatePortForwardingRuleExecutor.java @@ -1,3 +1,4 @@ + package com.cloud.async.executor; import java.util.List; @@ -74,6 +75,7 @@ public class UpdatePortForwardingRuleExecutor extends BaseAsyncJobExecutor { UserVmVO userVM = userVMs.get(0); resultObject.setVirtualMachineId(userVM.getId()); resultObject.setVirtualMachineName(userVM.getName()); + resultObject.setVirtualMachineDisplayName(userVM.getDisplayName()); } resultObject.setId(firewallRule.getId()); diff --git a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java b/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java index 1743174da0d..a5e81001963 100644 --- a/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java +++ b/server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java @@ -27,6 +27,17 @@ public class UpdatePortForwardingRuleResultObject { @Param(name="vmname") private String virtualMachineName; + @Param(name="vmdisplayname") + private String virtualMachineDisplayName; + + public String getVirtualMachineDisplayName(){ + return this.virtualMachineDisplayName; + } + + public void setVirtualMachineDisplayName(String name){ + this.virtualMachineDisplayName = name; + } + public long getId() { return id; }