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

pass conn to function

This commit is contained in:
anthony 2010-12-14 17:42:34 -08:00
parent e466905a4d
commit 9c1447c80e
2 changed files with 312 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

850
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

File diff suppressed because it is too large Load Diff

7
core/src/com/cloud/hypervisor/xen/resource/XenServerResource.java
View File

@ -65,11 +65,12 @@ public class XenServerResource extends CitrixResourceBase {
}
@Override
protected boolean can_bridge_firewall() {
return Boolean.valueOf(callHostPlugin("vmops", "can_bridge_firewall", "host_uuid", _host.uuid));
protected boolean can_bridge_firewall(Connection conn) {
return Boolean.valueOf(callHostPlugin(conn, "vmops", "can_bridge_firewall", "host_uuid", _host.uuid));
}
private Answer execute(NetworkIngressRulesCmd cmd) {
Connection conn = getConnection();
if (s_logger.isTraceEnabled()) {
s_logger.trace("Sending network rules command to " + _host.ip);
}
@ -79,7 +80,7 @@ public class XenServerResource extends CitrixResourceBase {
return new NetworkIngressRuleAnswer(cmd, false, "Host " + _host.ip + " cannot do bridge firewalling");
}
String result = callHostPlugin("vmops", "network_rules",
String result = callHostPlugin(conn, "vmops", "network_rules",
"vmName", cmd.getVmName(),
"vmIP", cmd.getGuestIp(),
"vmMAC", cmd.getGuestMac(),