From d7c81b702eba9baddd10bd41965e736dbf4779fe Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@cloud.com>
Date: Mon, 20 Dec 2010 17:46:14 -0800
Subject: [PATCH] WIP 3

---
 .../agent/api/routing/LoadBalancerConfigCommand.java  |  9 ++-------
 .../virtualnetwork/VirtualRoutingResource.java        | 11 +++++------
 .../hypervisor/xen/resource/CitrixResourceBase.java   |  4 ++--
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
index d8d2e8396f9..ae868061404 100644
--- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -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;
     }
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index c9aef0fe787..b7cdd5dfe95 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -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,
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index a458dd3555e..9aa5b74bb18 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -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];