cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [27/55] [abbrv] api_refactor: refactor project apis
Date Tue, 04 Dec 2012 10:02:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/VmStatsEntry.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/VmStatsEntry.java b/api/src/com/cloud/agent/api/VmStatsEntry.java
index 55694f8..8828e91 100755
--- a/api/src/com/cloud/agent/api/VmStatsEntry.java
+++ b/api/src/com/cloud/agent/api/VmStatsEntry.java
@@ -19,17 +19,17 @@ package com.cloud.agent.api;
 import com.cloud.vm.VmStats;
 
 public class VmStatsEntry implements VmStats {
-	
+
 	double cpuUtilization;
 	double networkReadKBs;
 	double networkWriteKBs;
-	int numCPUs;	
+	int numCPUs;
 	String entityType;
-	    
+
     public VmStatsEntry() {
     }
-    
-    public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, int numCPUs, String entityType) 
+
+    public VmStatsEntry(double cpuUtilization, double networkReadKBs, double networkWriteKBs, int numCPUs, String entityType)
     {
         this.cpuUtilization = cpuUtilization;
         this.networkReadKBs = networkReadKBs;
@@ -41,7 +41,7 @@ public class VmStatsEntry implements VmStats {
     public double getCPUUtilization() {
     	return cpuUtilization;
     }
-    
+
     public void setCPUUtilization(double cpuUtilization) {
     	this.cpuUtilization = cpuUtilization;
     }
@@ -49,23 +49,23 @@ public class VmStatsEntry implements VmStats {
     public double getNetworkReadKBs() {
     	return networkReadKBs;
     }
-    
+
     public void setNetworkReadKBs(double networkReadKBs) {
     	this.networkReadKBs = networkReadKBs;
     }
-    
+
     public double getNetworkWriteKBs() {
     	return networkWriteKBs;
     }
-    
+
     public void setNetworkWriteKBs(double networkWriteKBs) {
     	this.networkWriteKBs = networkWriteKBs;
     }
-    
+
     public int getNumCPUs() {
     	return numCPUs;
     }
-    
+
     public void setNumCPUs(int numCPUs) {
     	this.numCPUs = numCPUs;
     }
@@ -73,10 +73,10 @@ public class VmStatsEntry implements VmStats {
     public String getEntityType(){
     	return this.entityType;
     }
-    
+
     public void setEntityType(String entityType){
     	this.entityType = entityType;
     }
-    
+
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java b/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
index e0f4a28..fdd1fe9 100644
--- a/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/IpmISetBootDevCommand.java
@@ -18,23 +18,23 @@ package com.cloud.agent.api.baremetal;
 
 import com.cloud.agent.api.Command;
 
-public class IpmISetBootDevCommand extends Command {	
+public class IpmISetBootDevCommand extends Command {
 	public enum BootDev {
 		pxe(),
 		disk(),
 		cdrom(),
 	}
-	
+
 	BootDev bootDev;
-		
+
 	public BootDev getBootDev() {
 		return bootDev;
 	}
-	
+
 	public IpmISetBootDevCommand(BootDev dev) {
 		bootDev = dev;
 	}
-	
+
 	@Override
 	public boolean executeInSequence() {
 		return true;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
index 1190cb3..d8f0529 100644
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
+++ b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
@@ -22,8 +22,8 @@ public class PreparePxeServerAnswer extends Answer {
 	public PreparePxeServerAnswer(PreparePxeServerCommand cmd) {
 		super(cmd, true, "SUCCESS");
 	}
-	
+
 	public PreparePxeServerAnswer(PreparePxeServerCommand cmd, String details) {
 		super(cmd, false, details);
-	}	
+	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
index 0cda0f1..6c73563 100644
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
@@ -28,12 +28,12 @@ public class PreparePxeServerCommand extends Command {
 	String template;
 	String vmName;
 	String hostName;
-	
+
 	@Override
 	public boolean executeInSequence() {
 		return true;
 	}
-	
+
 	public PreparePxeServerCommand(String ip, String mac, String netMask, String gateway, String dns, String template, String vmName, String hostName) {
 		this.ip = ip;
 		this.mac = mac;
@@ -44,7 +44,7 @@ public class PreparePxeServerCommand extends Command {
 		this.vmName = vmName;
 		this.hostName = hostName;
 	}
-	
+
 	public String getIp() {
 		return ip;
 	}
@@ -68,11 +68,11 @@ public class PreparePxeServerCommand extends Command {
 	public String getTemplate() {
 		return template;
 	}
-	
+
 	public String getVmName() {
 		return vmName;
 	}
-	
+
 	public String getHostName() {
 		return hostName;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java b/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
index 03d178e..b187420 100644
--- a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
@@ -25,12 +25,12 @@ public class prepareCreateTemplateCommand extends Command {
     String gateway;
     String dns;
     String template;
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public prepareCreateTemplateCommand(String ip, String mac, String netMask, String gateway, String dns, String template) {
         this.ip = ip;
         this.mac = mac;
@@ -43,23 +43,23 @@ public class prepareCreateTemplateCommand extends Command {
     public String getIp() {
         return ip;
     }
-    
+
     public String getMac() {
         return mac;
     }
-    
+
     public String getNetMask() {
         return netMask;
     }
-    
+
     public String getGateWay() {
         return gateway;
     }
-    
+
     public String getDns() {
         return dns;
     }
-    
+
     public String getTemplate() {
         return template;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
index 7618159..3414eb0 100644
--- a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
+++ b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
@@ -20,17 +20,17 @@ import com.cloud.agent.api.Answer;
 
 public class CheckSshAnswer extends Answer {
     protected CheckSshAnswer() {
-        
+
     }
-    
+
     public CheckSshAnswer(CheckSshCommand cmd) {
         super(cmd, true, null);
     }
-    
+
     public CheckSshAnswer(CheckSshCommand cmd, String details) {
         super(cmd, false, details);
     }
-    
+
     public CheckSshAnswer(CheckSshCommand cmd, Throwable th) {
         super(cmd, false, th.getMessage());
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/check/CheckSshCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshCommand.java b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
index fb4210f..e384983 100644
--- a/api/src/com/cloud/agent/api/check/CheckSshCommand.java
+++ b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
@@ -24,11 +24,11 @@ public class CheckSshCommand extends Command {
     int interval;
     int retries;
     String name;
-    
+
     protected CheckSshCommand() {
         super();
     }
-    
+
     public CheckSshCommand(String instanceName, String ip, int port) {
         super();
         this.ip = ip;
@@ -37,7 +37,7 @@ public class CheckSshCommand extends Command {
         this.retries = 100;
         this.name = instanceName;
     }
-    
+
     public String getName() {
         return name;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java b/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
index 0586f8c..0937dad 100644
--- a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
+++ b/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
@@ -20,7 +20,7 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
 import com.cloud.agent.api.to.SwiftTO;
 
 /**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.  
+ * This currently assumes that both primary and secondary storage are mounted on the XenServer.
  */
 public class downloadSnapshotFromSwiftCommand extends SnapshotCommand {
     @LogLevel(Log4jLevel.Off)
@@ -29,9 +29,9 @@ public class downloadSnapshotFromSwiftCommand extends SnapshotCommand {
     private String _parent;
 
     protected downloadSnapshotFromSwiftCommand() {
-        
+
     }
-   
+
     public downloadSnapshotFromSwiftCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long volumeId, String parent, String BackupUuid, int wait) {
 
         super("", secondaryStorageUrl, BackupUuid, "", dcId, accountId, volumeId);
@@ -57,4 +57,4 @@ public class downloadSnapshotFromSwiftCommand extends SnapshotCommand {
         this._parent = parent;
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
index 0bf6e98..8229065 100644
--- a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
+++ b/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
@@ -20,8 +20,8 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
 import com.cloud.agent.api.to.SwiftTO;
 
 /**
- * 
- * 
+ *
+ *
  */
 
 public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command {
@@ -35,9 +35,9 @@ public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command
     private String path;
 
     protected downloadTemplateFromSwiftToSecondaryStorageCommand() {
-        
+
     }
-   
+
     public downloadTemplateFromSwiftToSecondaryStorageCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long templateId, String path, int wait) {
 
         this.swift = swift;
@@ -87,4 +87,4 @@ public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command
         return true;
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
index 318d939..7582b0d 100644
--- a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
@@ -26,33 +26,33 @@ public class CheckConsoleProxyLoadCommand extends ProxyCommand {
 	private String proxyVmName;
 	private String proxyManagementIp;
 	private int proxyCmdPort;
-	
+
 	public CheckConsoleProxyLoadCommand() {
 	}
-	
+
 	public CheckConsoleProxyLoadCommand(long proxyVmId, String proxyVmName, String proxyManagementIp, int proxyCmdPort) {
 		this.proxyVmId = proxyVmId;
 		this.proxyVmName = proxyVmName;
 		this.proxyManagementIp = proxyManagementIp;
 		this.proxyCmdPort = proxyCmdPort;
 	}
-	
+
 	public long getProxyVmId() {
 		return proxyVmId;
 	}
-	
+
 	public String getProxyVmName() {
 		return proxyVmName;
 	}
-	
+
 	public String getProxyManagementIp() {
 		return proxyManagementIp;
 	}
-	
+
 	public int getProxyCmdPort() {
 		return proxyCmdPort;
 	}
-	
+
     @Override
     public boolean executeInSequence() {
         return false;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
index df8f47d..ae93f51 100644
--- a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
+++ b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
@@ -23,21 +23,21 @@ public class ConsoleProxyLoadAnswer extends Answer {
 
 	private long proxyVmId;
 	private String proxyVmName;
-	
+
 	protected ConsoleProxyLoadAnswer() {
 	}
-	
+
 	public ConsoleProxyLoadAnswer(Command command, long proxyVmId, String proxyVmName, boolean success, String details) {
 		super(command, success, details);
-		
+
 		this.proxyVmId = proxyVmId;
 		this.proxyVmName = proxyVmName;
 	}
-	
+
 	public long getProxyVmId() {
 		return proxyVmId;
 	}
-	
+
 	public String getProxyVmName() {
 		return proxyVmName;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
index fd306ff..c5af38e 100644
--- a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
@@ -27,21 +27,21 @@ public class StartConsoleProxyAgentHttpHandlerCommand extends Command {
 	private String keystorePassword;
     @LogLevel(Log4jLevel.Off)
 	private String encryptorPassword;
-    
+
 	public StartConsoleProxyAgentHttpHandlerCommand() {
 		super();
 	}
-	
+
 	public StartConsoleProxyAgentHttpHandlerCommand(byte[] ksBits, String ksPassword) {
 		this.keystoreBits = ksBits;
 		this.keystorePassword = ksPassword;
 	}
-	
+
 	@Override
 	public boolean executeInSequence() {
 		return true;
 	}
-	
+
 	public byte[] getKeystoreBits() {
 		return keystoreBits;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
index b918ba4..ef4a549 100644
--- a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
@@ -25,7 +25,7 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
 	private String proxyManagementIp;
 	private int proxyCmdPort;
 	int interval;
-	
+
     public WatchConsoleProxyLoadCommand(int interval, long proxyVmId, String proxyVmName,
     	String proxyManagementIp, int proxyCmdPort) {
         this.interval = interval;
@@ -34,30 +34,30 @@ public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCo
 		this.proxyManagementIp = proxyManagementIp;
 		this.proxyCmdPort = proxyCmdPort;
     }
-	
+
 	protected WatchConsoleProxyLoadCommand() {
 	}
-	
+
 	public long getProxyVmId() {
 		return proxyVmId;
 	}
-	
+
 	public String getProxyVmName() {
 		return proxyVmName;
 	}
-	
+
 	public String getProxyManagementIp() {
 		return proxyManagementIp;
 	}
-	
+
 	public int getProxyCmdPort() {
 		return proxyCmdPort;
 	}
-	
+
 	public int getInterval() {
 	    return interval;
 	}
-	
+
 	@Override
     public boolean executeInSequence() {
 	    return false;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
index ed972a2..dc7f1a1 100644
--- a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
+++ b/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
@@ -27,7 +27,7 @@ public class CreateLoadBalancerApplianceCommand extends NetworkElementCommand {
     String password;
     String publicInterface;
     String privateInterface;
-    
+
     public CreateLoadBalancerApplianceCommand(String ip, String netmask, String gateway) {
         this.ip = ip;
         this.netmask = netmask;
@@ -45,4 +45,4 @@ public class CreateLoadBalancerApplianceCommand extends NetworkElementCommand {
     public String getGateway() {
         return gateway;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
index ff38941..5c2cd58 100644
--- a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
@@ -29,56 +29,56 @@ public class DhcpEntryCommand extends NetworkElementCommand {
     String staticRoutes;
     String defaultDns;
 
-    
+
     protected DhcpEntryCommand() {
-        
+
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName) {
         this.vmMac = vmMac;
         this.vmIpAddress = vmIpAddress;
         this.vmName = vmName;
     }
-    
+
     public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String dns, String gateway) {
         this(vmMac, vmIpAddress, vmName);
         this.dns = dns;
         this.gateway = gateway;
     }
-    
+
     public String getDns() {
         return dns;
     }
-    
+
     public String getGateway() {
         return gateway;
     }
-    
+
     public String getVmMac() {
         return vmMac;
     }
-    
+
     public String getVmIpAddress() {
         return vmIpAddress;
     }
-    
+
     public String getVmName() {
         return vmName;
     }
-    
+
     public void setNextServer(String ip) {
         nextServer = ip;
     }
-    
+
     public String getNextServer() {
         return nextServer;
     }
-    
+
     public String getDefaultRouter() {
         return defaultRouter;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
index 1892196..194923c 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
@@ -20,13 +20,13 @@ import com.cloud.agent.api.Answer;
 
 public class IpAssocAnswer extends Answer{
     String[] results;
-    
+
     public static final String errorResult = "Failed";
-    
+
     protected IpAssocAnswer() {
         super();
     }
-    
+
     public IpAssocAnswer(IpAssocCommand cmd, String[] results) {
 
         boolean finalResult = true;
@@ -41,7 +41,7 @@ public class IpAssocAnswer extends Answer{
         assert(cmd.getIpAddresses().length == results.length) : "Shouldn't the results match the commands?";
         this.results = results;
     }
-    
+
     String[] getResults() {
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
index 5326b11..5cdc2da 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
@@ -19,12 +19,12 @@ package com.cloud.agent.api.routing;
 import com.cloud.agent.api.to.IpAddressTO;
 
 public class IpAssocCommand extends NetworkElementCommand {
-    
+
 	IpAddressTO[] ipAddresses;
 
 	protected IpAssocCommand() {
 	}
-	
+
 	public IpAssocCommand(IpAddressTO[] ips) {
 		this.ipAddresses = ips;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
index cc7fcb0..e5c900d 100644
--- a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
@@ -22,7 +22,7 @@ public class IpAssocVpcCommand extends IpAssocCommand{
     protected IpAssocVpcCommand() {
         super();
     }
-    
+
     public IpAssocVpcCommand(IpAddressTO[] ips) {
         super(ips);
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
index a5505e1..1c1fb91 100644
--- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
@@ -31,13 +31,13 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
     public String lbStatsPort = "8081"; /*load balancer listen on this port for stats */
     public String lbStatsSrcCidrs = "0/0" ; /* TODO : currently there is no filtering based on the source ip */
     public String lbStatsAuth = "admin1:AdMiN123";
-    public String lbStatsUri = "/admin?stats";  
+    public String lbStatsUri = "/admin?stats";
     NicTO nic;
     Long vpcId;
-    
+
     protected LoadBalancerConfigCommand() {
     }
-    
+
     public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, Long vpcId) {
     	this.loadBalancers = loadBalancers;
     	this.vpcId = vpcId;
@@ -51,11 +51,11 @@ public class LoadBalancerConfigCommand extends NetworkElementCommand {
     	this.nic = nic;
     	this.vpcId = vpcId;
     }
-    
+
     public NicTO getNic() {
         return nic;
     }
-   
+
 	public LoadBalancerTO[] getLoadBalancers() {
         return loadBalancers;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
index 61e41e8..41ae80f 100644
--- a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
@@ -22,7 +22,7 @@ import com.cloud.agent.api.Command;
 
 public abstract class NetworkElementCommand extends Command {
     HashMap<String, String> accessDetails = new HashMap<String, String>(0);
-    
+
     public static final String ACCOUNT_ID = "account.id";
     public static final String GUEST_NETWORK_CIDR = "guest.network.cidr";
     public static final String GUEST_NETWORK_GATEWAY = "guest.network.gateway";
@@ -32,19 +32,19 @@ public abstract class NetworkElementCommand extends Command {
     public static final String ROUTER_GUEST_IP = "router.guest.ip";
     public static final String ZONE_NETWORK_TYPE = "zone.network.type";
     public static final String GUEST_BRIDGE = "guest.bridge";
-    
+
     protected NetworkElementCommand() {
         super();
     }
-    
+
     public void setAccessDetail(String name, String value) {
         accessDetails.put(name, value);
     }
-    
+
     public String getAccessDetail(String name) {
         return accessDetails.get(name);
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return false;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
index 8cf3ba2..68d7caf 100644
--- a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
+++ b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
@@ -18,17 +18,17 @@ package com.cloud.agent.api.routing;
 
 
 public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {
-	
+
 	boolean create;
     String vpnServerIp;
     String ipRange;
     String presharedKey;
     String localIp;
-    
+
     protected RemoteAccessVpnCfgCommand() {
     	this.create = false;
     }
-    
+
     public boolean isCreate() {
 		return create;
 	}
@@ -37,12 +37,12 @@ public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {
     public boolean executeInSequence() {
         return true;
     }
-    
-    
+
+
 	public RemoteAccessVpnCfgCommand(boolean create, String vpnServerAddress, String localIp, String ipRange, String ipsecPresharedKey) {
 		this.vpnServerIp = vpnServerAddress;
 		this.ipRange  = ipRange;
-		this.presharedKey = ipsecPresharedKey; 
+		this.presharedKey = ipsecPresharedKey;
 		this.localIp = localIp;
 		this.create = create;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
index 92cf671..6dac148 100644
--- a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
@@ -22,25 +22,25 @@ public class SavePasswordCommand extends NetworkElementCommand {
     String password;
     String vmIpAddress;
     String vmName;
-    
-    protected SavePasswordCommand() {	
+
+    protected SavePasswordCommand() {
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public SavePasswordCommand(String password, String vmIpAddress, String vmName) {
         this.password = password;
         this.vmIpAddress = vmIpAddress;
         this.vmName = vmName;
     }
-    
+
 	public String getPassword() {
 		return password;
 	}
-	
+
 	public String getVmIpAddress() {
 		return vmIpAddress;
 	}
@@ -48,7 +48,7 @@ public class SavePasswordCommand extends NetworkElementCommand {
     public String getVmName() {
         return vmName;
     }
-	
-	
-	
+
+
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
index 82730bd..5268c3d 100644
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
@@ -20,16 +20,16 @@ import com.cloud.agent.api.Answer;
 
 public class SetFirewallRulesAnswer extends Answer {
     String[] results;
-    
+
     protected SetFirewallRulesAnswer() {
     }
-    
+
     public SetFirewallRulesAnswer(SetFirewallRulesCommand cmd, boolean success, String[] results) {
         super(cmd, success, null);
         assert (cmd.getRules().length == results.length) : "rules and their results should be the same length don't you think?";
         this.results = results;
     }
-    
+
     public String[] getResults() {
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
index 528f36b..3841bd7 100644
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
@@ -23,7 +23,7 @@ import java.util.Set;
 import com.cloud.agent.api.to.FirewallRuleTO;
 
 /**
- * 
+ *
  * AccessDetails allow different components to put in information about
  * how to access the components inside the command.
  */
@@ -32,11 +32,11 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
 
     protected SetFirewallRulesCommand() {
     }
-    
+
     public SetFirewallRulesCommand(List<FirewallRuleTO> rules) {
-        this.rules = rules.toArray(new FirewallRuleTO[rules.size()]); 
+        this.rules = rules.toArray(new FirewallRuleTO[rules.size()]);
     }
-    
+
     public FirewallRuleTO[] getRules() {
         return rules;
     }
@@ -45,34 +45,34 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
 		String [][] result = new String [2][];
 		Set<String> toAdd = new HashSet<String>();
 
-		
+
 		for (FirewallRuleTO fwTO: rules) {
-		/* example  :  172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:, 
+		/* example  :  172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
 		 *  each entry format      <ip>:protocol:srcport:destport:scidr:
 		 *  reverted entry format  <ip>:reverted:0:0:0:
 		 */
-			if (fwTO.revoked() == true) 
+			if (fwTO.revoked() == true)
 			{
 				StringBuilder sb = new StringBuilder();
 				/* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
-				sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:"); 
+				sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:");
 				String fwRuleEntry = sb.toString();
 				toAdd.add(fwRuleEntry);
 				continue;
 			}
-			
+
 			List<String> cidr;
 			StringBuilder sb = new StringBuilder();
 			sb.append(fwTO.getSrcIp()).append(":").append(fwTO.getProtocol()).append(":");
 			if ("icmp".compareTo(fwTO.getProtocol()) == 0)
 			{
 				sb.append(fwTO.getIcmpType()).append(":").append(fwTO.getIcmpCode()).append(":");
-				
+
 			}else if (fwTO.getStringSrcPortRange() == null)
 				sb.append("0:0").append(":");
 			else
 			    sb.append(fwTO.getStringSrcPortRange()).append(":");
-			
+
 			cidr = fwTO.getSourceCidrList();
 			if (cidr == null || cidr.isEmpty())
 			{
@@ -80,19 +80,19 @@ public class SetFirewallRulesCommand extends NetworkElementCommand {
 			}else{
 				Boolean firstEntry = true;
 	            for (String tag : cidr) {
-	            	if (!firstEntry) sb.append("-"); 
+	            	if (!firstEntry) sb.append("-");
 	        	   sb.append(tag);
 	        	   firstEntry = false;
 	            }
 			}
 			sb.append(":");
 			String fwRuleEntry = sb.toString();
-		
+
 			toAdd.add(fwRuleEntry);
-			
+
 		}
 		result[0] = toAdd.toArray(new String[toAdd.size()]);
-		
+
 		return result;
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
index cc14295..dc192ad 100644
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
@@ -20,17 +20,17 @@ import com.cloud.agent.api.Answer;
 
 public class SetNetworkACLAnswer extends Answer {
     String[] results;
-    
+
     protected SetNetworkACLAnswer() {
     }
-    
+
     public SetNetworkACLAnswer(SetNetworkACLCommand cmd, boolean success, String[] results) {
         super(cmd, success, null);
         assert (cmd.getRules().length == results.length) : "ACLs and their results should be the same length";
         this.results = results;
     }
-    
+
     public String[] getResults() {
         return results;
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
index b8fe119..dba7354 100644
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
@@ -30,12 +30,12 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
 
     protected SetNetworkACLCommand() {
     }
-    
+
     public SetNetworkACLCommand(List<NetworkACLTO> rules, NicTO nic) {
-        this.rules = rules.toArray(new NetworkACLTO[rules.size()]); 
+        this.rules = rules.toArray(new NetworkACLTO[rules.size()]);
         this.nic = nic;
     }
-    
+
     public NetworkACLTO[] getRules() {
         return rules;
     }
@@ -43,22 +43,22 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
         String [][] result = new String [2][];
         Set<String> toAdd = new HashSet<String>();
 
-        
+
         for (NetworkACLTO aclTO: rules) {
-        /*  example  :  Ingress:tcp:80:80:0.0.0.0/0:,Egress:tcp:220:220:0.0.0.0/0:, 
+        /*  example  :  Ingress:tcp:80:80:0.0.0.0/0:,Egress:tcp:220:220:0.0.0.0/0:,
          *  each entry format      Ingress/Egress:protocol:start port: end port:scidrs:
          *  reverted entry format  Ingress/Egress:reverted:0:0:0:
          */
-            if (aclTO.revoked() == true) 
+            if (aclTO.revoked() == true)
             {
                 StringBuilder sb = new StringBuilder();
                 /* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
-                sb.append(aclTO.getTrafficType().toString()).append(":reverted:0:0:0:"); 
+                sb.append(aclTO.getTrafficType().toString()).append(":reverted:0:0:0:");
                 String aclRuleEntry = sb.toString();
                 toAdd.add(aclRuleEntry);
                 continue;
             }
-            
+
             List<String> cidr;
             StringBuilder sb = new StringBuilder();
             sb.append(aclTO.getTrafficType().toString()).append(":").append(aclTO.getProtocol()).append(":");
@@ -75,22 +75,22 @@ public class SetNetworkACLCommand extends NetworkElementCommand{
             }else{
                 Boolean firstEntry = true;
                 for (String tag : cidr) {
-                    if (!firstEntry) sb.append("-"); 
+                    if (!firstEntry) sb.append("-");
                    sb.append(tag);
                    firstEntry = false;
                 }
             }
             sb.append(":");
             String aclRuleEntry = sb.toString();
-        
+
             toAdd.add(aclRuleEntry);
-            
+
         }
         result[0] = toAdd.toArray(new String[toAdd.size()]);
-        
+
         return result;
     }
-    
+
     public NicTO getNic() {
         return nic;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
index 9aa2f6d..15306fb 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
@@ -23,14 +23,14 @@ public class SetPortForwardingRulesAnswer extends Answer {
     protected SetPortForwardingRulesAnswer() {
         super();
     }
-    
+
     public SetPortForwardingRulesAnswer(SetPortForwardingRulesCommand cmd, String[] results, boolean success) {
         super(cmd, success, null);
-        
+
         assert(cmd.getRules().length == results.length) : "Shouldn't the results match the commands?";
         this.results = results;
     }
-    
+
     String[] getResults() {
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
index dc82043..a7bf37f 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
@@ -25,7 +25,7 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
 
     protected SetPortForwardingRulesCommand() {
     }
-    
+
     public SetPortForwardingRulesCommand(List<? extends PortForwardingRuleTO> pfRules) {
         rules = new PortForwardingRuleTO[pfRules.size()];
         int i = 0;
@@ -33,7 +33,7 @@ public class SetPortForwardingRulesCommand extends NetworkElementCommand {
             rules[i++] = rule;
         }
     }
-    
+
     public PortForwardingRuleTO[] getRules() {
         return rules;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
index 042e788..7228457 100644
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
@@ -23,7 +23,7 @@ import com.cloud.agent.api.to.PortForwardingRuleTO;
 public class SetPortForwardingRulesVpcCommand extends SetPortForwardingRulesCommand{
     protected SetPortForwardingRulesVpcCommand() {
     }
-    
+
     public SetPortForwardingRulesVpcCommand(List<? extends PortForwardingRuleTO> pfRules) {
         super(pfRules);
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
index 165a15d..96aa001 100644
--- a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
@@ -21,10 +21,10 @@ import com.cloud.agent.api.to.IpAddressTO;
 public class SetSourceNatCommand extends NetworkElementCommand{
     IpAddressTO ipAddress;
     boolean add;
-    
+
     protected SetSourceNatCommand() {
     }
-    
+
     public SetSourceNatCommand(IpAddressTO ip, boolean add) {
         this.ipAddress = ip;
         this.add = add;
@@ -38,5 +38,5 @@ public class SetSourceNatCommand extends NetworkElementCommand{
     public IpAddressTO getIpAddress() {
         return ipAddress;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
index e57b327..9b5d09b 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
@@ -23,14 +23,14 @@ public class SetStaticNatRulesAnswer extends Answer {
     protected SetStaticNatRulesAnswer() {
         super();
     }
-    
+
     public SetStaticNatRulesAnswer(SetStaticNatRulesCommand cmd, String[] results, boolean success) {
         super(cmd, success, null);
-        
+
         assert(cmd.getRules().length == results.length) : "Shouldn't the results match the commands?";
         this.results = results;
     }
-    
+
     String[] getResults() {
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
index c28032c..852d161 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
@@ -21,13 +21,13 @@ import java.util.List;
 import com.cloud.agent.api.to.StaticNatRuleTO;
 
 public class SetStaticNatRulesCommand extends NetworkElementCommand{
-    
+
     StaticNatRuleTO[] rules;
     Long vpcId;
 
     protected SetStaticNatRulesCommand() {
     }
-    
+
     public SetStaticNatRulesCommand(List<? extends StaticNatRuleTO> staticNatRules, Long vpcId) {
         rules = new StaticNatRuleTO[staticNatRules.size()];
         int i = 0;
@@ -36,7 +36,7 @@ public class SetStaticNatRulesCommand extends NetworkElementCommand{
         }
         this.vpcId = vpcId;
     }
-    
+
     public StaticNatRuleTO[] getRules() {
         return rules;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
index c13bda0..76f5bb9 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
@@ -20,16 +20,16 @@ import com.cloud.agent.api.Answer;
 
 public class SetStaticRouteAnswer extends Answer{
     String[] results;
-    
+
     protected SetStaticRouteAnswer() {
     }
-    
+
     public SetStaticRouteAnswer(SetStaticRouteCommand cmd, boolean success, String[] results) {
         super(cmd, success, null);
         assert (cmd.getStaticRoutes().length == results.length) : "Static routes and their results should be the same length";
         this.results = results;
     }
-    
+
     public String[] getResults() {
         return results;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
index 0c91a9e..c9c2056 100644
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
+++ b/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
@@ -27,12 +27,12 @@ import com.cloud.utils.net.NetUtils;
 
 public class SetStaticRouteCommand extends NetworkElementCommand{
     StaticRouteProfile[] staticRoutes;
-    
+
     protected SetStaticRouteCommand() {
     }
-    
+
     public SetStaticRouteCommand(List<StaticRouteProfile> staticRoutes) {
-        this.staticRoutes = staticRoutes.toArray(new StaticRouteProfile[staticRoutes.size()]); 
+        this.staticRoutes = staticRoutes.toArray(new StaticRouteProfile[staticRoutes.size()]);
     }
 
     public StaticRouteProfile[] getStaticRoutes() {

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java b/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
index 97db2f9..8316303 100644
--- a/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
+++ b/api/src/com/cloud/agent/api/routing/Site2SiteVpnCfgCommand.java
@@ -5,7 +5,7 @@
 // to you under the Apache License, Version 2.0 (the
 // "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
-// 
+//
 //   http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing,
@@ -30,16 +30,16 @@ public class Site2SiteVpnCfgCommand extends NetworkElementCommand {
     private long ikeLifetime;
     private long espLifetime;
     private boolean dpd;
-    
+
 	@Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public Site2SiteVpnCfgCommand () {
         this.create = false;
     }
-    
+
     public Site2SiteVpnCfgCommand (boolean create, String localPublicIp, String localPublicGateway, String localGuestCidr, String peerGatewayIp,
             String peerGuestCidrList, String ikePolicy, String espPolicy, String ipsecPsk, Long ikeLifetime, Long espLifetime, Boolean dpd) {
         this.create = create;
@@ -55,11 +55,11 @@ public class Site2SiteVpnCfgCommand extends NetworkElementCommand {
         this.espLifetime = espLifetime;
         this.dpd = dpd;
     }
-    
+
     public boolean isCreate() {
         return create;
     }
-    
+
     public void setCreate(boolean create) {
         this.create = create;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/UserDataCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/UserDataCommand.java b/api/src/com/cloud/agent/api/routing/UserDataCommand.java
index 103bd91..f7b38c8 100644
--- a/api/src/com/cloud/agent/api/routing/UserDataCommand.java
+++ b/api/src/com/cloud/agent/api/routing/UserDataCommand.java
@@ -23,31 +23,31 @@ public class UserDataCommand extends NetworkElementCommand {
     String vmIpAddress;
     String routerPrivateIpAddress;
     String vmName;
-    
+
     protected UserDataCommand() {
-    	
+
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public UserDataCommand(String userData, String vmIpAddress, String routerPrivateIpAddress, String vmName) {
         this.userData = userData;
         this.vmIpAddress = vmIpAddress;
         this.routerPrivateIpAddress = routerPrivateIpAddress;
         this.vmName = vmName;
     }
-	
+
 	public String getRouterPrivateIpAddress() {
 		return routerPrivateIpAddress;
 	}
-	
+
 	public String getVmIpAddress() {
 		return vmIpAddress;
 	}
-	
+
 	public String getVmName() {
 		return vmName;
 	}
@@ -59,5 +59,5 @@ public class UserDataCommand extends NetworkElementCommand {
 	public void setUserData(String userData) {
 		this.userData = userData;
 	}
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/VmDataCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/VmDataCommand.java b/api/src/com/cloud/agent/api/routing/VmDataCommand.java
index d505384..df88255 100644
--- a/api/src/com/cloud/agent/api/routing/VmDataCommand.java
+++ b/api/src/com/cloud/agent/api/routing/VmDataCommand.java
@@ -23,24 +23,24 @@ import com.cloud.agent.api.LogLevel;
 import com.cloud.agent.api.LogLevel.Log4jLevel;
 
 public class VmDataCommand extends NetworkElementCommand {
-    
+
 	String vmIpAddress;
 	String vmName;
 	@LogLevel(Log4jLevel.Trace)
 	List<String[]> vmData;
-	
+
     protected VmDataCommand() {
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-    
+
     public VmDataCommand(String vmIpAddress) {
     	this(vmIpAddress, null);
     }
-    
+
     public String getVmName() {
         return vmName;
     }
@@ -50,18 +50,18 @@ public class VmDataCommand extends NetworkElementCommand {
         this.vmIpAddress = vmIpAddress;
         this.vmData = new ArrayList<String[]>();
     }
-    
-	
+
+
 	public String getVmIpAddress() {
 		return vmIpAddress;
 	}
-	
+
 	public List<String[]> getVmData() {
 		return vmData;
 	}
-	
+
 	public void addVmData(String folder, String file, String contents) {
 		vmData.add(new String[]{folder, file, contents});
 	}
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java b/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
index 249c235..ebe725d 100644
--- a/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
+++ b/api/src/com/cloud/agent/api/routing/VpnUsersCfgCommand.java
@@ -23,12 +23,12 @@ import com.cloud.network.VpnUser;
 
 
 public class VpnUsersCfgCommand extends NetworkElementCommand {
-	public static class UsernamePassword{ 
+	public static class UsernamePassword{
 		private String username;
 	    @LogLevel(Log4jLevel.Off)
 		private String password;
 		boolean add = true;
-		
+
 		public boolean isAdd() {
 			return add;
 		}
@@ -66,11 +66,11 @@ public class VpnUsersCfgCommand extends NetworkElementCommand {
 		}
 	}
 	UsernamePassword [] userpwds;
-	
+
     protected VpnUsersCfgCommand() {
-    	
+
     }
-    
+
     public VpnUsersCfgCommand(List<VpnUser> addUsers, List<VpnUser> removeUsers) {
     	userpwds = new UsernamePassword[addUsers.size() + removeUsers.size()];
     	int i = 0;
@@ -86,7 +86,7 @@ public class VpnUsersCfgCommand extends NetworkElementCommand {
 	public boolean executeInSequence() {
 		return true;
 	}
-	
+
 	public UsernamePassword[] getUserpwds() {
 		return userpwds;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java b/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
index 5737a05..04b3d43 100644
--- a/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/AbstractDownloadCommand.java
@@ -24,46 +24,46 @@ public abstract class AbstractDownloadCommand extends ssCommand {
     private ImageFormat format;
     private long accountId;
     private String name;
-    
+
     protected AbstractDownloadCommand() {
     }
-    
+
     protected AbstractDownloadCommand(String name, String url, ImageFormat format, long accountId) {
     	assert(url != null);
     	url = url.replace('\\', '/');
-    	
+
         this.url = url;
         this.format = format;
         this.accountId = accountId;
         this.name = name;
     }
-    
+
     protected AbstractDownloadCommand(AbstractDownloadCommand that) {
         super(that);
         assert(that.url != null);
-        
+
         this.url = that.url.replace('\\', '/');
         this.format = that.format;
         this.accountId = that.accountId;
         this.name = that.name;
     }
-    
+
     public String getUrl() {
         return url;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     public ImageFormat getFormat() {
         return format;
     }
-    
+
     public long getAccountId() {
         return accountId;
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java b/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
index 1c55e8f..49c04b1 100644
--- a/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/AbstractUploadCommand.java
@@ -25,37 +25,37 @@ public class AbstractUploadCommand  extends StorageCommand{
     private ImageFormat format;
     private long accountId;
     private String name;
-    
+
     protected AbstractUploadCommand() {
     }
-    
+
     protected AbstractUploadCommand(String name, String url, ImageFormat format, long accountId) {
         this.url = url;
         this.format = format;
         this.accountId = accountId;
         this.name = name;
     }
-    
+
     protected AbstractUploadCommand(AbstractUploadCommand that) {
         this(that.name, that.url, that.format, that.accountId);
     }
-    
+
     public String getUrl() {
         return url;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     public ImageFormat getFormat() {
         return format;
     }
-    
+
     public long getAccountId() {
         return accountId;
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java b/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
index 7704569..8c55ac3 100644
--- a/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/CopyVolumeAnswer.java
@@ -22,20 +22,20 @@ import com.cloud.agent.api.Command;
 public class CopyVolumeAnswer extends Answer {
 	private String volumeFolder;
 	private String volumePath;
-	
+
 	protected CopyVolumeAnswer() {
     }
-	
+
 	public CopyVolumeAnswer(Command command, boolean success, String details, String volumeFolder, String volumePath) {
 		super(command, success, details);
 		this.volumeFolder = volumeFolder;
 		this.volumePath = volumePath;
 	}
-	
+
 	public String getVolumeFolder() {
 		return volumeFolder;
 	}
-	
+
 	public String getVolumePath() {
 		return volumePath;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java b/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
index 26bd187..3d05e9b 100644
--- a/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
+++ b/api/src/com/cloud/agent/api/storage/CopyVolumeCommand.java
@@ -23,49 +23,49 @@ import com.cloud.storage.StoragePool;
 public class CopyVolumeCommand extends Command {
 
 	long volumeId;
-	String volumePath;	
+	String volumePath;
 	StorageFilerTO pool;
 	String secondaryStorageURL;
 	boolean toSecondaryStorage;
 	String vmName;
-	
-	public CopyVolumeCommand() {		
+
+	public CopyVolumeCommand() {
 	}
-	
+
 	public CopyVolumeCommand(long volumeId, String volumePath, StoragePool pool, String secondaryStorageURL, boolean toSecondaryStorage, int wait) {
 		this.volumeId = volumeId;
-		this.volumePath = volumePath;				
+		this.volumePath = volumePath;
 		this.pool = new StorageFilerTO(pool);
 		this.secondaryStorageURL = secondaryStorageURL;
 		this.toSecondaryStorage = toSecondaryStorage;
 		setWait(wait);
 	}
-	
+
     @Override
     public boolean executeInSequence() {
         return true;
     }
-	
+
 	public String getVolumePath() {
 		return volumePath;
 	}
-	
+
 	public long getVolumeId() {
 		return volumeId;
 	}
-	
+
 	public StorageFilerTO getPool() {
 		return pool;
 	}
-	
+
 	public String getSecondaryStorageURL() {
 		return secondaryStorageURL;
 	}
-	
+
 	public boolean toSecondaryStorage() {
 		return toSecondaryStorage;
 	}
-	
+
 	public String getVmName() {
 		return vmName;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreateAnswer.java b/api/src/com/cloud/agent/api/storage/CreateAnswer.java
index 695b6ba..ab6cc03 100644
--- a/api/src/com/cloud/agent/api/storage/CreateAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/CreateAnswer.java
@@ -24,29 +24,29 @@ public class CreateAnswer extends Answer {
     boolean requestTemplateReload = false;
     protected CreateAnswer() {
     }
-    
+
     public CreateAnswer(CreateCommand cmd, VolumeTO volume) {
         super(cmd, true, null);
         this.volume = volume;
     }
-    
+
     public CreateAnswer(CreateCommand cmd, String details) {
         super(cmd, false, details);
     }
-    
+
     public CreateAnswer(CreateCommand cmd, String details, boolean requestTemplateReload) {
         super(cmd, false, details);
         this.requestTemplateReload = requestTemplateReload;
     }
-    
+
     public CreateAnswer(CreateCommand cmd, Exception e) {
         super(cmd, e);
     }
-    
+
     public VolumeTO getVolume() {
         return volume;
     }
-    
+
     public boolean templateReloadRequested() {
     	return requestTemplateReload;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreateCommand.java b/api/src/com/cloud/agent/api/storage/CreateCommand.java
index b8b2446..fd0375a 100644
--- a/api/src/com/cloud/agent/api/storage/CreateCommand.java
+++ b/api/src/com/cloud/agent/api/storage/CreateCommand.java
@@ -26,14 +26,14 @@ public class CreateCommand extends Command {
     private StorageFilerTO pool;
     private DiskProfile diskCharacteristics;
     private String templateUrl;
-    
+
     protected CreateCommand() {
         super();
     }
 
     /**
      * Construction for template based volumes.
-     * 
+     *
      * @param vol
      * @param vm
      * @param diskCharacteristics
@@ -47,7 +47,7 @@ public class CreateCommand extends Command {
 
     /**
      * Construction for regular volumes.
-     * 
+     *
      * @param vol
      * @param vm
      * @param diskCharacteristics
@@ -55,19 +55,19 @@ public class CreateCommand extends Command {
      */
     public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool) {
         this.volId = diskCharacteristics.getVolumeId();
-        this.diskCharacteristics = diskCharacteristics;        
+        this.diskCharacteristics = diskCharacteristics;
         this.pool = pool;
         this.templateUrl = null;
     }
-    
+
     public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StoragePool pool) {
         this(diskCharacteristics, templateUrl, new StorageFilerTO(pool));
     }
-    
+
     public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool) {
         this(diskCharacteristics, new StorageFilerTO(pool));
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;
@@ -76,19 +76,19 @@ public class CreateCommand extends Command {
     public String getTemplateUrl() {
         return templateUrl;
     }
-    
+
     public StorageFilerTO getPool() {
         return pool;
     }
-    
+
     public DiskProfile getDiskCharacteristics() {
         return diskCharacteristics;
     }
-    
+
     public long getVolumeId() {
         return volId;
     }
-    
+
     @Deprecated
     public String getInstanceName() {
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
index 550a949..808a67f 100644
--- a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLAnswer.java
@@ -19,19 +19,19 @@ package com.cloud.agent.api.storage;
 import com.cloud.agent.api.Answer;
 
 public class CreateEntityDownloadURLAnswer extends Answer{
-    
+
     String resultString;
     short resultCode;
     public static final short RESULT_SUCCESS = 1;
     public static final short RESULT_FAILURE = 0;
-    
+
     public CreateEntityDownloadURLAnswer(String resultString, short resultCode) {
         super();
         this.resultString = resultString;
         this.resultCode = resultCode;
-    }    
-    
-    public CreateEntityDownloadURLAnswer(){        
+    }
+
+    public CreateEntityDownloadURLAnswer(){
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
index f320022..c80179a 100755
--- a/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
+++ b/api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java
@@ -26,7 +26,7 @@ public class CreateEntityDownloadURLCommand extends AbstractDownloadCommand {
         this.installPath = installPath;
         this.extractLinkUUID = uuid;
     }
-    
+
     public CreateEntityDownloadURLCommand(String installPath, String uuid) {
         super();
         this.parent = parent;
@@ -40,7 +40,7 @@ public class CreateEntityDownloadURLCommand extends AbstractDownloadCommand {
     private String installPath;
     private String parent;
     private String extractLinkUUID;
-    
+
     @Override
     public boolean executeInSequence() {
         return false;
@@ -53,7 +53,7 @@ public class CreateEntityDownloadURLCommand extends AbstractDownloadCommand {
     public void setInstallPath(String installPath) {
         this.installPath = installPath;
     }
-    
+
     public String getParent() {
         return parent;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
index 2dfcf21..83db84d 100644
--- a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateAnswer.java
@@ -29,7 +29,7 @@ public class CreatePrivateTemplateAnswer extends Answer {
 
     public CreatePrivateTemplateAnswer() {}
 
-    public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize, 
+    public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result, String path, long virtualSize,
             long physicalSize, String uniqueName, ImageFormat format) {
         super(cmd, success, result);
         _path = path;
@@ -42,23 +42,23 @@ public class CreatePrivateTemplateAnswer extends Answer {
     public CreatePrivateTemplateAnswer(Command cmd, boolean success, String result) {
         super(cmd, success, result);
     }
-    
+
     public String getPath() {
         return _path;
     }
-    
+
     public void setPath(String path) {
         _path = path;
     }
-    
+
     public long getVirtualSize() {
     	return _virtualSize;
     }
-    
+
     public void setVirtualSize(long virtualSize) {
     	_virtualSize = virtualSize;
     }
-    
+
     public void setphysicalSize(long _physicalSize) {
         this._physicalSize = _physicalSize;
     }
@@ -70,7 +70,7 @@ public class CreatePrivateTemplateAnswer extends Answer {
     public String getUniqueName() {
     	return _uniqueName;
     }
-    
+
     public ImageFormat getImageFormat() {
     	return _format;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
index 5fd186c..d392a89 100644
--- a/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/storage/CreatePrivateTemplateCommand.java
@@ -24,7 +24,7 @@ public class CreatePrivateTemplateCommand extends StorageCommand {
     private String _uniqueName;
     private long _templateId;
     private long _accountId;
-    
+
     // For XenServer
     private String _secondaryStorageURL;
     private String _snapshotName;
@@ -44,10 +44,10 @@ public class CreatePrivateTemplateCommand extends StorageCommand {
     }
 
     @Override
-    public boolean executeInSequence() { 
+    public boolean executeInSequence() {
         return false;
     }
-    
+
     public String getSecondaryStorageURL() {
     	return _secondaryStorageURL;
     }
@@ -67,23 +67,23 @@ public class CreatePrivateTemplateCommand extends StorageCommand {
     public String getSnapshotPath() {
         return _snapshotPath;
     }
-    
+
     public String getSnapshotName() {
     	return _snapshotName;
     }
-    
+
     public String getUserFolder() {
         return _userFolder;
     }
-    
+
     public long getTemplateId() {
     	return _templateId;
     }
-    
+
     public long getAccountId() {
     	return _accountId;
     }
-    
+
     public void setTemplateId(long templateId) {
     	_templateId = templateId;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
index 69a2b49..c6fdf3c 100644
--- a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLAnswer.java
@@ -19,19 +19,19 @@ package com.cloud.agent.api.storage;
 import com.cloud.agent.api.Answer;
 
 public class DeleteEntityDownloadURLAnswer  extends Answer{
-    
+
     String resultString;
     short resultCode;
     public static final short RESULT_SUCCESS = 1;
     public static final short RESULT_FAILURE = 0;
-    
+
     public DeleteEntityDownloadURLAnswer(String resultString, short resultCode) {
         super();
         this.resultString = resultString;
         this.resultCode = resultCode;
-    }    
-    
-    public DeleteEntityDownloadURLAnswer(){        
+    }
+
+    public DeleteEntityDownloadURLAnswer(){
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
index 772e6c6..fbfacb9 100755
--- a/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DeleteEntityDownloadURLCommand.java
@@ -19,9 +19,9 @@ package com.cloud.agent.api.storage;
 import com.cloud.storage.Upload;
 
 public class DeleteEntityDownloadURLCommand extends AbstractDownloadCommand {
-    
+
     private String path;
-    private String extractUrl; 
+    private String extractUrl;
     private Upload.Type type;
     private String parentPath;
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java b/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
index ce349dd..69f465c 100644
--- a/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DeleteTemplateCommand.java
@@ -21,19 +21,19 @@ public class DeleteTemplateCommand extends ssCommand {
 	private String templatePath;
 
 
-	public DeleteTemplateCommand() {	
+	public DeleteTemplateCommand() {
 	}
-	
+
 	public DeleteTemplateCommand(String secUrl, String templatePath) {
 	    this.setSecUrl(secUrl);
     	this.templatePath = templatePath;
     }
-	
+
 	@Override
     public boolean executeInSequence() {
         return true;
     }
-	
+
 	public String getTemplatePath() {
 		return templatePath;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java b/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java
index ea729e8..949af01 100755
--- a/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DeleteVolumeCommand.java
@@ -14,25 +14,25 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.agent.api.storage;
-
-public class DeleteVolumeCommand extends ssCommand {
-	private String volumePath;
-
-	public DeleteVolumeCommand() {	
-	}
-	
-	public DeleteVolumeCommand(String secUrl, String volumePath) {
-	    this.setSecUrl(secUrl);
-    	this.volumePath = volumePath;
-    }
-	
-	@Override
-    public boolean executeInSequence() {
-        return true;
-    }
-	
-	public String getVolumePath() {
-		return volumePath;
-	}
-}
+package com.cloud.agent.api.storage;
+
+public class DeleteVolumeCommand extends ssCommand {
+	private String volumePath;
+
+	public DeleteVolumeCommand() {
+	}
+
+	public DeleteVolumeCommand(String secUrl, String volumePath) {
+	    this.setSecUrl(secUrl);
+    	this.volumePath = volumePath;
+    }
+
+	@Override
+    public boolean executeInSequence() {
+        return true;
+    }
+
+	public String getVolumePath() {
+		return volumePath;
+	}
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DestroyAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DestroyAnswer.java b/api/src/com/cloud/agent/api/storage/DestroyAnswer.java
index 2f01c1b..ac60015 100644
--- a/api/src/com/cloud/agent/api/storage/DestroyAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/DestroyAnswer.java
@@ -22,7 +22,7 @@ public class DestroyAnswer extends Answer {
     public DestroyAnswer(DestroyCommand cmd, boolean result, String details) {
         super(cmd, result, details);
     }
-    
+
     // Constructor for gson.
     protected DestroyAnswer() {
         super();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DestroyCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DestroyCommand.java b/api/src/com/cloud/agent/api/storage/DestroyCommand.java
index 29c564c..6732ea5 100755
--- a/api/src/com/cloud/agent/api/storage/DestroyCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DestroyCommand.java
@@ -25,25 +25,25 @@ public class DestroyCommand extends StorageCommand {
 	// in VMware, things are designed around VM instead of volume, we need it the volume VM context if the volume is attached
 	String vmName;
     VolumeTO volume;
-    
+
     protected DestroyCommand() {
     }
-    
+
     public DestroyCommand(StoragePool pool, Volume volume, String vmName) {
          this.volume = new VolumeTO(volume, pool);
          this.vmName = vmName;
     }
-    
+
     public DestroyCommand(StoragePool pool, VMTemplateStorageResourceAssoc templatePoolRef) {
-        volume = new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(), 
-        		null, pool.getPath(), templatePoolRef.getInstallPath(), 
+        volume = new VolumeTO(templatePoolRef.getId(), null, pool.getPoolType(), pool.getUuid(),
+        		null, pool.getPath(), templatePoolRef.getInstallPath(),
         		templatePoolRef.getTemplateSize(), null);
     }
-    
+
     public VolumeTO getVolume() {
     	return volume;
     }
-    
+
     public String getVmName() {
     	return vmName;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DownloadAnswer.java b/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
index 52c3245..bb7b8a9 100755
--- a/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadAnswer.java
@@ -33,40 +33,40 @@ public class DownloadAnswer extends Answer  {
 	private long templateSize = 0L;
 	private long templatePhySicalSize = 0L;
 	private String checkSum;
-	
+
 	public String getCheckSum() {
 		return checkSum;
 	}
-	
+
 	public int getDownloadPct() {
 		return downloadPct;
 	}
 	public String getErrorString() {
 		return errorString;
 	}
-	
+
 	public String getDownloadStatusString() {
 		return downloadStatus.toString();
 	}
-	
+
 	public VMTemplateStorageResourceAssoc.Status getDownloadStatus() {
 		return downloadStatus;
 	}
-	
+
 	public String getDownloadPath() {
 		return downloadPath;
 	}
 	protected DownloadAnswer() {
-		
+
 	}
-	
+
 	public String getJobId() {
 		return jobId;
 	}
 	public void setJobId(String jobId) {
 		this.jobId = jobId;
 	}
-	
+
     public DownloadAnswer(String errorString, Status status) {
         super();
         this.downloadPct = 0;
@@ -74,7 +74,7 @@ public class DownloadAnswer extends Answer  {
         this.downloadStatus = status;
         this.details = errorString;
     }
-	
+
 	public DownloadAnswer(String jobId, int downloadPct, String errorString,
 			Status downloadStatus, String fileSystemPath, String installPath, long templateSize, long templatePhySicalSize, String checkSum) {
 		super();
@@ -89,7 +89,7 @@ public class DownloadAnswer extends Answer  {
 		this.templatePhySicalSize = templatePhySicalSize;
 		this.checkSum = checkSum;
 	}
-	
+
    public DownloadAnswer(String jobId, int downloadPct, Command command,
             Status downloadStatus, String fileSystemPath, String installPath) {
         super(command);
@@ -99,7 +99,7 @@ public class DownloadAnswer extends Answer  {
         this.downloadPath = fileSystemPath;
         this.installPath = installPath;
     }
-		
+
 	private static String fixPath(String path){
 		if (path == null) {
             return path;
@@ -112,11 +112,11 @@ public class DownloadAnswer extends Answer  {
 		}
 		return path;
 	}
-	
+
 	public void setDownloadStatus(VMTemplateStorageResourceAssoc.Status downloadStatus) {
 		this.downloadStatus = downloadStatus;
 	}
-	
+
 	public String getInstallPath() {
 		return installPath;
 	}
@@ -127,7 +127,7 @@ public class DownloadAnswer extends Answer  {
 	public void setTemplateSize(long templateSize) {
 		this.templateSize = templateSize;
 	}
-	
+
 	public Long getTemplateSize() {
 		return templateSize;
 	}
@@ -137,5 +137,5 @@ public class DownloadAnswer extends Answer  {
     public long getTemplatePhySicalSize() {
         return templatePhySicalSize;
     }
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DownloadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DownloadCommand.java b/api/src/com/cloud/agent/api/storage/DownloadCommand.java
index af9ff40..9245411 100644
--- a/api/src/com/cloud/agent/api/storage/DownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadCommand.java
@@ -28,7 +28,7 @@ public class DownloadCommand extends AbstractDownloadCommand {
 		String userName;
 		String password;
 		public PasswordAuth() {
-			
+
 		}
 		public PasswordAuth(String user, String password) {
 			this.userName = user;
@@ -41,28 +41,28 @@ public class DownloadCommand extends AbstractDownloadCommand {
 			return password;
 		}
 	}
-	
+
     public static enum ResourceType {
         VOLUME, TEMPLATE
     }
-	
+
 	public static class Proxy {
 		private String _host;
 		private int _port;
 		private String _userName;
 		private String _password;
-		
+
 		public Proxy() {
-			
+
 		}
-		
+
 		public Proxy(String host, int port, String userName, String password) {
 			this._host = host;
 			this._port = port;
 			this._userName = userName;
 			this._password = password;
 		}
-		
+
 		public Proxy(URI uri) {
 			this._host = uri.getHost();
 			this._port = uri.getPort() == -1 ? 3128 : uri.getPort();
@@ -78,19 +78,19 @@ public class DownloadCommand extends AbstractDownloadCommand {
 				}
 			}
 		}
-		
+
 		public String getHost() {
 			return _host;
 		}
-		
+
 		public int getPort() {
 			return _port;
 		}
-		
+
 		public String getUserName() {
 			return _userName;
 		}
-		
+
 		public String getPassword() {
 			return _password;
 		}
@@ -103,11 +103,11 @@ public class DownloadCommand extends AbstractDownloadCommand {
 	private Long maxDownloadSizeInBytes = null;
 	private long id;
 	private ResourceType resourceType = ResourceType.TEMPLATE;
-	
+
 	protected DownloadCommand() {
 	}
-	
-	
+
+
 	public DownloadCommand(DownloadCommand that) {
 	    super(that);
 	    this.hvm = that.hvm;
@@ -119,7 +119,7 @@ public class DownloadCommand extends AbstractDownloadCommand {
 	    this.maxDownloadSizeInBytes = that.getMaxDownloadSizeInBytes();
 	    this.resourceType = that.resourceType;
 	}
-	
+
 	public DownloadCommand(String secUrl, VirtualMachineTemplate template, Long maxDownloadSizeInBytes) {
 	    super(template.getUniqueName(), template.getUrl(), template.getFormat(), template.getAccountId());
 	    this.hvm = template.isRequiresHvm();
@@ -129,7 +129,7 @@ public class DownloadCommand extends AbstractDownloadCommand {
 	    this.setSecUrl(secUrl);
 	    this.maxDownloadSizeInBytes = maxDownloadSizeInBytes;
 	}
-	
+
 	public DownloadCommand(String secUrl, Volume volume, Long maxDownloadSizeInBytes, String checkSum, String url, ImageFormat format) {
 	    super(volume.getName(), url, format, volume.getAccountId());
 	    //this.hvm = volume.isRequiresHvm();
@@ -150,11 +150,11 @@ public class DownloadCommand extends AbstractDownloadCommand {
         this.maxDownloadSizeInBytes = maxDownloadSizeInBytes;
 		auth = new PasswordAuth(user, passwd);
 	}
-	
+
 	public long getId() {
 	    return id;
 	}
-	
+
 	public void setHvm(boolean hvm) {
 		this.hvm = hvm;
 	}
@@ -188,19 +188,19 @@ public class DownloadCommand extends AbstractDownloadCommand {
 	public PasswordAuth getAuth() {
 		return auth;
 	}
-	
+
 	public void setCreds(String userName, String passwd) {
 		auth = new PasswordAuth(userName, passwd);
 	}
-	
+
 	public Proxy getProxy() {
 		return _proxy;
 	}
-	
+
 	public void setProxy(Proxy proxy) {
 		_proxy = proxy;
 	}
-	
+
 	public Long getMaxDownloadSizeInBytes() {
 		return maxDownloadSizeInBytes;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java b/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
index 205ba80..835847b 100644
--- a/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadProgressCommand.java
@@ -26,7 +26,7 @@ public class DownloadProgressCommand extends DownloadCommand {
 	protected DownloadProgressCommand() {
 		super();
 	}
-	
+
 	public DownloadProgressCommand(DownloadCommand cmd, String jobId, RequestType req) {
 	    super(cmd);
 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java b/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
index 45622fa..06e95fe 100644
--- a/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java
@@ -25,17 +25,17 @@ import com.cloud.storage.template.TemplateInfo;
 public class ListTemplateAnswer extends Answer  {
     private String secUrl;
     private Map<String, TemplateInfo> templateInfos;
-	
+
 	public ListTemplateAnswer() {
-		
+
 	}
-	
+
 	public ListTemplateAnswer(String secUrl, Map<String, TemplateInfo> templateInfos) {
 	    super(null, true, "success");
 	    this.setSecUrl(secUrl);
-	    this.templateInfos = templateInfos;    
+	    this.templateInfos = templateInfos;
 	}
-	
+
 	public Map<String, TemplateInfo> getTemplateInfo() {
 	    return templateInfos;
 	}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java b/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java
index 18123fa..da25ed5 100644
--- a/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java
+++ b/api/src/com/cloud/agent/api/storage/ListTemplateCommand.java
@@ -24,15 +24,15 @@ public class ListTemplateCommand extends StorageCommand {
     private String secUrl;
     @LogLevel(Log4jLevel.Off)
     private SwiftTO swift;
-    
+
     public ListTemplateCommand() {
     }
-    
+
 	public ListTemplateCommand(String secUrl) {
 	    this.secUrl = secUrl;
         this.swift = null;
 	}
-	
+
     public ListTemplateCommand(SwiftTO swift) {
         this.secUrl = null;
         this.swift = swift;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java b/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
index e2dc447..6bbb2e8 100755
--- a/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/ListVolumeAnswer.java
@@ -14,40 +14,40 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.agent.api.storage;
-
-import java.util.Map;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.storage.template.TemplateInfo;
-
-public class ListVolumeAnswer extends Answer {
-	private String secUrl;
-    private Map<Long, TemplateInfo> templateInfos;
-	
-	public ListVolumeAnswer() {
-		
-	}
-	
-	public ListVolumeAnswer(String secUrl, Map<Long, TemplateInfo> templateInfos) {
-	    super(null, true, "success");
-	    this.setSecUrl(secUrl);
-	    this.templateInfos = templateInfos;    
-	}
-	
-	public Map<Long, TemplateInfo> getTemplateInfo() {
-	    return templateInfos;
-	}
-
-	public void setTemplateInfo(Map<Long, TemplateInfo> templateInfos) {
-	    this.templateInfos = templateInfos;
-	}
-
-    public void setSecUrl(String secUrl) {
-        this.secUrl = secUrl;
-    }
-
-    public String getSecUrl() {
-        return secUrl;
-    }
-}
+package com.cloud.agent.api.storage;
+
+import java.util.Map;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.storage.template.TemplateInfo;
+
+public class ListVolumeAnswer extends Answer {
+	private String secUrl;
+    private Map<Long, TemplateInfo> templateInfos;
+
+	public ListVolumeAnswer() {
+
+	}
+
+	public ListVolumeAnswer(String secUrl, Map<Long, TemplateInfo> templateInfos) {
+	    super(null, true, "success");
+	    this.setSecUrl(secUrl);
+	    this.templateInfos = templateInfos;
+	}
+
+	public Map<Long, TemplateInfo> getTemplateInfo() {
+	    return templateInfos;
+	}
+
+	public void setTemplateInfo(Map<Long, TemplateInfo> templateInfos) {
+	    this.templateInfos = templateInfos;
+	}
+
+    public void setSecUrl(String secUrl) {
+        this.secUrl = secUrl;
+    }
+
+    public String getSecUrl() {
+        return secUrl;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java b/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java
index afec624..a2776c2 100755
--- a/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java
+++ b/api/src/com/cloud/agent/api/storage/ListVolumeCommand.java
@@ -14,30 +14,30 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-package com.cloud.agent.api.storage;
-
-import com.cloud.agent.api.LogLevel;
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.cloud.agent.api.to.SwiftTO;
-
-public class ListVolumeCommand extends StorageCommand {
-
-    private String secUrl;        
-    
-    public ListVolumeCommand() {
-    }
-    
-	public ListVolumeCommand(String secUrl) {
-	    this.secUrl = secUrl;        
-	}	
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public String getSecUrl() {
-        return secUrl;
-    }
-
-}
+package com.cloud.agent.api.storage;
+
+import com.cloud.agent.api.LogLevel;
+import com.cloud.agent.api.LogLevel.Log4jLevel;
+import com.cloud.agent.api.to.SwiftTO;
+
+public class ListVolumeCommand extends StorageCommand {
+
+    private String secUrl;
+
+    public ListVolumeCommand() {
+    }
+
+	public ListVolumeCommand(String secUrl) {
+	    this.secUrl = secUrl;
+	}
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+
+    public String getSecUrl() {
+        return secUrl;
+    }
+
+}


Mime
View raw message