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

WIP 3

This commit is contained in:
Chiradeep Vittal 2010-12-20 17:46:14 -08:00
parent 5c9a11523b
commit d7c81b702e
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
View File

@ -25,17 +25,12 @@ import com.cloud.agent.api.to.LoadBalancerTO;
*/
public class LoadBalancerConfigCommand extends RoutingCommand {
LoadBalancerTO[] loadBalancers;
String routerIp;
public LoadBalancerConfigCommand(String routerControlIpAddress, LoadBalancerTO[] loadBalancers) {
public LoadBalancerConfigCommand( LoadBalancerTO[] loadBalancers) {
this.loadBalancers = loadBalancers;
this.routerIp = routerControlIpAddress;
}
public String getRouterIp() {
return routerIp;
}
public LoadBalancerTO[] getLoadBalancers() {
return loadBalancers;
}

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

@ -123,8 +123,8 @@ public class VirtualRoutingResource implements Manager {
}
private Answer execute(SetPortForwardingRulesCommand cmd) {
String routerIp = cmd.getAccessDetail("router.ip");
String routerName = cmd.getAccessDetail("router.name");
String routerIp = cmd.getAccessDetail(RoutingCommand.ROUTER_IP);
String routerName = cmd.getAccessDetail(RoutingCommand.ROUTER_NAME);
String[] results = new String[cmd.getRules().length];
int i = 0;
@ -147,7 +147,7 @@ public class VirtualRoutingResource implements Manager {
}
private Answer execute(LoadBalancerConfigCommand cmd) {
String routerIp = cmd.getAccessDetail(RoutingCommand.ROUTER_IP);
File tmpCfgFile = null;
try {
String cfgFilePath = "";
@ -155,8 +155,8 @@ public class VirtualRoutingResource implements Manager {
LoadBalancerConfigurator cfgtr = new HAProxyConfigurator();
String[] config = cfgtr.generateConfiguration(cmd);
String[][] rules = cfgtr.generateFwRules(cmd);
if (cmd.getRouterIp() != null) {
tmpCfgFile = File.createTempFile(cmd.getRouterIp().replace('.', '_'), "cfg");
if (routerIp != null) {
tmpCfgFile = File.createTempFile(routerIp.replace('.', '_'), "cfg");
final PrintWriter out
= new PrintWriter(new BufferedWriter(new FileWriter(tmpCfgFile)));
for (int i=0; i < config.length; i++) {
@ -164,7 +164,6 @@ public class VirtualRoutingResource implements Manager {
}
out.close();
cfgFilePath = tmpCfgFile.getAbsolutePath();
routerIP = cmd.getRouterIp();
}
final String result = setLoadBalancerConfig(cfgFilePath,

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

@ -1040,7 +1040,7 @@ public abstract class CitrixResourceBase implements ServerResource {
protected Answer execute(final LoadBalancerConfigCommand cmd) {
Connection conn = getConnection();
String routerIp = cmd.getAccessDetail("router.ip");
String routerIp = cmd.getAccessDetail(RoutingCommand.ROUTER_IP);
if (routerIp == null) {
return new Answer(cmd);
@ -1049,7 +1049,7 @@ public abstract class CitrixResourceBase implements ServerResource {
LoadBalancerConfigurator cfgtr = new HAProxyConfigurator();
String[] config = cfgtr.generateConfiguration(cmd);
String[][] rules = cfgtr.generateFwRules(cmd);
String tmpCfgFilePath = "/tmp/" + cmd.getRouterIp().replace('.', '_') + ".cfg";
String tmpCfgFilePath = "/tmp/" + routerIp.replace('.', '_') + ".cfg";
String tmpCfgFileContents = "";
for (int i = 0; i < config.length; i++) {
tmpCfgFileContents += config[i];