etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6241: incremental checkin

This commit is contained in:
abhishek 2010-09-22 13:56:11 -07:00
parent 3292779a96
commit 32884572b9
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java
View File

@ -127,6 +127,7 @@ public class CreateIPForwardingRuleCmd extends BaseCmd {
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.PRIVATE_PORT.getName(), firewallRule.getPrivatePort()));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.PROTOCOL.getName(), firewallRule.getProtocol()));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_NAME.getName(), userVM.getName()));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_DISPLAYNAME.getName(), userVM.getDisplayName()));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), Long.toString(userVM.getId())));
forwardingTag[0] = ruleData;

1
server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
View File

@ -128,6 +128,7 @@ public class ListPortForwardingRulesCmd extends BaseCmd {
if (userVM != null) {
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName(), Long.toString(userVM.getId())));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_NAME.getName(), userVM.getName()));
ruleData.add(new Pair<String, Object>(BaseCmd.Properties.VIRTUAL_MACHINE_DISPLAYNAME.getName(), userVM.getDisplayName()));
}
forwardingTag[i++] = ruleData;

2
server/src/com/cloud/async/executor/UpdatePortForwardingRuleExecutor.java
View File

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

11
server/src/com/cloud/async/executor/UpdatePortForwardingRuleResultObject.java
View File

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