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

bug 8209,8370,8459: fix libvirt ipassoc and firewalling

This commit is contained in:
Chiradeep Vittal 2011-02-08 12:09:11 -08:00
parent 711c4eeaae
commit 2b46ea5c0a
2 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -121,21 +121,26 @@ public class VirtualRoutingResource implements Manager {
private Answer execute(SetPortForwardingRulesCommand cmd) {
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String[] results = new String[cmd.getRules().length];
int i = 0;
for (PortForwardingRuleTO rule : cmd.getRules()) {
String result = null;
final Script command = new Script(_firewallPath, _timeout, s_logger);
command.add(routerIp);
command.add(rule.revoked() ? "-D" : "-A");
if (rule.isOneToOneNat()){
setStaticNat(!rule.revoked(), rule.getProtocol(), routerIp, rule.getSrcIp(), rule.getDstIp());
//1:1 NAT needs instanceip;publicip;domrip;op
command.add(" -l ", rule.getSrcIp());
command.add(" -r ", rule.getDstIp());
command.add(" -P ", rule.getProtocol().toLowerCase());
command.add(" -d ", rule.getStringDstPortRange());
command.add(" -G ") ;
} else {
result = setPortForwardRule(!rule.revoked(), routerName, routerIp,
rule.getProtocol().toLowerCase(), rule.getSrcIp(),
Integer.toString(rule.getSrcPortRange()[0]), rule.getDstIp(),
Integer.toString(rule.getDstPortRange()[0]));
command.add("-P ", rule.getProtocol().toLowerCase());
command.add("-l ", rule.getSrcIp());
command.add("-p ", rule.getStringSrcPortRange());
command.add("-r ", rule.getDstIp());
command.add("-d ", rule.getStringDstPortRange());
}
results[i++] = (!(result == null || result.isEmpty())) ? "Failed" : null;
}
@ -244,7 +249,9 @@ public class VirtualRoutingResource implements Manager {
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
for (IpAddressTO ip : ips) {
result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask());
result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(),
ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask(),
ip.getVifMacAddress(), ip.getGuestIp());
if (result != null) {
results[i++] = IpAssocAnswer.errorResult;
} else {
@ -385,73 +392,37 @@ public class VirtualRoutingResource implements Manager {
return command.execute();
}
public String assignPublicIpAddress(final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask) {
protected String assignPublicIpAddress(final String vmName,
final String privateIpAddress, final String publicIpAddress,
final boolean add, final boolean firstIP, final boolean sourceNat,
final String vlanId, final String vlanGateway,
final String vlanNetmask, final String vifMacAddress, String guestIp){
final Script command = new Script(_ipassocPath, _timeout, s_logger);
command.add( privateIpAddress);
if (add) {
command.add("-A");
} else {
command.add("-D");
}
String cidrSize = Long.toString(NetUtils.getCidrSize(vlanNetmask));
if (sourceNat) {
command.add("-f");
command.add("-l", publicIpAddress + "/" + cidrSize);
} else if (firstIP) {
command.add( "-f");
command.add( "-l", publicIpAddress + "/" + cidrSize);
} else {
command.add("-l", publicIpAddress);
}
command.add("-i", privateIpAddress);
command.add("-l", publicIpAddress);
command.add("-r", vmName);
command.add("-n", vlanNetmask);
//FIXME: figure out the right interface
command.add("-c", "eth2");
if (vlanId != null) {
command.add("-v", vlanId);
command.add("-g", vlanGateway);
}
return command.execute();
}
public String setPortForwardRule(final boolean enable, final String routerName, final String routerIpAddress, final String protocol,
final String publicIpAddress, final String publicPortRange, final String privateIpAddress, final String privatePortRange) {
if (routerIpAddress == null) {
s_logger.warn("setPortForwardRule did nothing because Router IP address was null when creating rule for public IP: " + publicIpAddress);
return null;
}
final Script command = new Script(_firewallPath, _timeout, s_logger);
command.add(enable ? "-A" : "-D");
command.add("-P", protocol);
command.add("-l", publicIpAddress);
command.add("-p", publicPortRange);
command.add("-n", routerName);
command.add("-i", routerIpAddress);
command.add("-r", privateIpAddress);
command.add("-d", privatePortRange);
return command.execute();
}
public String setStaticNat(final boolean enable, final String protocal, final String routerIpAddress,
final String publicIpAddress, final String privateIpAddress) {
if (routerIpAddress == null) {
s_logger.warn("setStaticNat did nothing because Router IP address was null when creating rule for public IP: " + publicIpAddress);
return null;
}
final Script command = new Script(_firewallPath, _timeout, s_logger);
command.add(enable ? "-A" : "-D");
command.add("-l", publicIpAddress);
command.add("-G", protocal);
command.add("-i", routerIpAddress);
command.add("-r", privateIpAddress);
return command.execute();
}
private boolean isBridgeExists(String bridgeName) {
Script command = new Script("/bin/sh", _timeout);

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

@ -1130,7 +1130,6 @@ public abstract class CitrixResourceBase implements ServerResource {
protected SetPortForwardingRulesAnswer execute(SetPortForwardingRulesCommand cmd) {
Connection conn = getConnection();
String routerName = cmd.getAccessDetail(NetworkElementCommand.ROUTER_NAME);
String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
String args = routerIp;
String[] results = new String[cmd.getRules().length];
@ -1155,16 +1154,6 @@ public abstract class CitrixResourceBase implements ServerResource {
args += " -r " + rule.getDstIp();
args += " -d " + rule.getStringDstPortRange();
// String oldPrivateIP = rule.getOldPrivateIP();
// String oldPrivatePort = rule.getOldPrivatePort();
//
// if (oldPrivateIP != null) {
// args += " -w " + oldPrivateIP;
// }
//
// if (oldPrivatePort != null) {
// args += " -x " + oldPrivatePort;
// }
}
String result = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args);
results[i++] = (result == null || result.isEmpty()) ? "Failed" : null;