incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject [48/52] [partial] Summary: Fixes for api_refactoring
Date Thu, 10 Jan 2013 00:48:36 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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..efb5ecb 100644
--- a/api/src/com/cloud/agent/api/storage/DownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/DownloadCommand.java
@@ -21,14 +21,15 @@ import java.net.URI;
 import com.cloud.storage.Volume;
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class DownloadCommand extends AbstractDownloadCommand {
+public class DownloadCommand extends AbstractDownloadCommand implements InternalIdentity {
 	public static class PasswordAuth {
 		String userName;
 		String password;
 		public PasswordAuth() {
-			
+
 		}
 		public PasswordAuth(String user, String password) {
 			this.userName = user;
@@ -41,28 +42,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 +79,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 +104,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 +120,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 +130,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 +151,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 +189,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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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/c4c9d2d8/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;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
index 354a693..edd2830 100644
--- a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityAnswer.java
@@ -20,12 +20,12 @@ import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 
 public class ManageVolumeAvailabilityAnswer extends Answer {
-	
+
 	protected ManageVolumeAvailabilityAnswer() {
     }
-	
+
 	public ManageVolumeAvailabilityAnswer(Command command, boolean success, String details) {
 		super(command, success, details);
 	}
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
index e27fe8c..1a7d480 100644
--- a/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
+++ b/api/src/com/cloud/agent/api/storage/ManageVolumeAvailabilityCommand.java
@@ -19,36 +19,36 @@ package com.cloud.agent.api.storage;
 import com.cloud.agent.api.Command;
 
 public class ManageVolumeAvailabilityCommand extends Command {
-	
+
 	boolean attach;
 	String primaryStorageSRUuid;
 	String volumeUuid;
-	
-	
-	public ManageVolumeAvailabilityCommand() {	
+
+
+	public ManageVolumeAvailabilityCommand() {
 	}
-	
+
 	public ManageVolumeAvailabilityCommand(boolean attach, String primaryStorageSRUuid, String volumeUuid) {
     	this.attach = attach;
     	this.primaryStorageSRUuid = primaryStorageSRUuid;
         this.volumeUuid = volumeUuid;
     }
-	
+
 	@Override
     public boolean executeInSequence() {
         return false;
     }
-	
+
 	public boolean getAttach() {
 		return attach;
 	}
-	
+
 	public String getPrimaryStorageSRUuid() {
 		return primaryStorageSRUuid;
 	}
-	
+
 	public String getVolumeUuid() {
 		return volumeUuid;
 	}
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
index 3d5c556..a5a6c49 100644
--- a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadAnswer.java
@@ -21,24 +21,24 @@ import com.cloud.agent.api.Answer;
 public class PrimaryStorageDownloadAnswer extends Answer  {
 	private String installPath;
     private long templateSize = 0L;
-	
+
 	protected PrimaryStorageDownloadAnswer() {
 	}
-	
+
     public PrimaryStorageDownloadAnswer(String detail) {
         super(null, false, detail);
     }
-	
+
 	public PrimaryStorageDownloadAnswer(String installPath, long templateSize ) {
         super(null);
 		this.installPath = installPath;
-		this.templateSize = templateSize;		
+		this.templateSize = templateSize;
 	}
-	
+
 	public String getInstallPath() {
 		return installPath;
 	}
-	
+
 	public void setInstallPath(String installPath) {
 		this.installPath = installPath;
     }
@@ -50,5 +50,5 @@ public class PrimaryStorageDownloadAnswer extends Answer  {
     public Long getTemplateSize() {
         return templateSize;
     }
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
index f66d00e..b450041 100644
--- a/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
@@ -27,8 +27,9 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
 	String localPath;
 	String poolUuid;
 	long poolId;
-        StorageFilerTO primaryPool;
-	
+
+    StorageFilerTO primaryPool;
+
 	String secondaryStorageUrl;
 	String primaryStorageUrl;
 
@@ -42,11 +43,11 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
         this.primaryPool = new StorageFilerTO(pool);
         setWait(wait);
     }
-   
+
     public String getPoolUuid() {
         return poolUuid;
     }
-    
+
     public long getPoolId() {
         return poolId;
     }
@@ -58,27 +59,27 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
     public void setLocalPath(String path) {
     	this.localPath = path;
     }
-    
+
     public String getLocalPath() {
     	return localPath;
     }
-    
+
     public void setSecondaryStorageUrl(String url) {
     	secondaryStorageUrl = url;
     }
-    
+
     public String getSecondaryStorageUrl() {
     	return secondaryStorageUrl;
     }
-    
+
     public void setPrimaryStorageUrl(String url) {
     	primaryStorageUrl = url;
     }
-    
+
     public String getPrimaryStorageUrl() {
     	return primaryStorageUrl;
     }
-    
+
     @Override
     public boolean executeInSequence() {
         return true;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/UploadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/UploadAnswer.java b/api/src/com/cloud/agent/api/storage/UploadAnswer.java
index 430eb83..f2d9788 100755
--- a/api/src/com/cloud/agent/api/storage/UploadAnswer.java
+++ b/api/src/com/cloud/agent/api/storage/UploadAnswer.java
@@ -24,7 +24,7 @@ import com.cloud.storage.Upload;
 
 public class UploadAnswer extends Answer {
 
-	
+
 	private String jobId;
 	private int uploadPct;
 	private String errorString;
@@ -32,29 +32,29 @@ public class UploadAnswer extends Answer {
 	private String uploadPath;
 	private String installPath;
 	public Long templateSize = 0L;
-	
+
 	public int getUploadPct() {
 		return uploadPct;
 	}
 	public String getErrorString() {
 		return errorString;
 	}
-	
+
 	public String getUploadStatusString() {
 		return uploadStatus.toString();
 	}
-	
+
 	public Upload.Status getUploadStatus() {
 		return uploadStatus;
 	}
-	
+
 	public String getUploadPath() {
 		return uploadPath;
 	}
 	protected UploadAnswer() {
-		
+
 	}
-		
+
 	public void setErrorString(String errorString) {
         this.errorString = errorString;
     }
@@ -64,7 +64,7 @@ public class UploadAnswer extends Answer {
 	public void setJobId(String jobId) {
 		this.jobId = jobId;
 	}
-	
+
 	public UploadAnswer(String jobId, int uploadPct, String errorString,
 			Upload.Status uploadStatus, String fileSystemPath, String installPath, long templateSize) {
 		super();
@@ -87,7 +87,7 @@ public class UploadAnswer extends Answer {
         this.uploadPath = fileSystemPath;
         this.installPath = installPath;
     }
-		
+
 	private static String fixPath(String path){
 		if (path == null) {
             return path;
@@ -100,11 +100,11 @@ public class UploadAnswer extends Answer {
 		}
 		return path;
 	}
-	
+
 	public void setUploadStatus(Upload.Status uploadStatus) {
 		this.uploadStatus = uploadStatus;
 	}
-	
+
 	public String getInstallPath() {
 		return installPath;
 	}
@@ -115,9 +115,9 @@ public class UploadAnswer extends Answer {
 	public void setTemplateSize(long templateSize) {
 		this.templateSize = templateSize;
 	}
-	
+
 	public Long getTemplateSize() {
 		return templateSize;
 	}
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/UploadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/UploadCommand.java b/api/src/com/cloud/agent/api/storage/UploadCommand.java
index 4b004c9..2a7c60a 100644
--- a/api/src/com/cloud/agent/api/storage/UploadCommand.java
+++ b/api/src/com/cloud/agent/api/storage/UploadCommand.java
@@ -20,13 +20,14 @@ import com.cloud.agent.api.storage.DownloadCommand.PasswordAuth;
 import com.cloud.agent.api.to.TemplateTO;
 import com.cloud.storage.Upload.Type;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class UploadCommand extends AbstractUploadCommand {
+public class UploadCommand extends AbstractUploadCommand implements InternalIdentity {
 
 	private TemplateTO template;
 	private String url;
-	private String installPath;	
+	private String installPath;
 	private boolean hvm;
 	private String description;
 	private String checksum;
@@ -36,16 +37,16 @@ public class UploadCommand extends AbstractUploadCommand {
 	private Type type;
 
 	public UploadCommand(VirtualMachineTemplate template, String url, String installPath, long sizeInBytes) {
-		
+
 		this.template = new TemplateTO(template);
 		this.url = url;
 		this.installPath = installPath;
 		this.checksum = template.getChecksum();
 		this.id = template.getId();
 		this.templateSizeInBytes = sizeInBytes;
-		
+
 	}
-	
+
 	public UploadCommand(String url, long id, long sizeInBytes, String installPath, Type type){
 		this.template = null;
 		this.url = url;
@@ -54,10 +55,10 @@ public class UploadCommand extends AbstractUploadCommand {
 		this.type = type;
 		this.templateSizeInBytes = sizeInBytes;
 	}
-	
+
 	protected UploadCommand() {
 	}
-	
+
 	public UploadCommand(UploadCommand that) {
 		this.template = that.template;
 		this.url = that.url;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java b/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
index 36b1437..7f6d584 100644
--- a/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
+++ b/api/src/com/cloud/agent/api/storage/UploadProgressCommand.java
@@ -25,7 +25,7 @@ public class UploadProgressCommand extends UploadCommand {
 	protected UploadProgressCommand() {
 		super();
 	}
-	
+
 	public UploadProgressCommand(UploadCommand cmd, String jobId, RequestType req) {
 	    super(cmd);
 
@@ -44,5 +44,5 @@ public class UploadProgressCommand extends UploadCommand {
 	public RequestType getRequest() {
 		return request;
 	}
-	
-}
\ No newline at end of file
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/storage/ssCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/storage/ssCommand.java b/api/src/com/cloud/agent/api/storage/ssCommand.java
index c7b75ea..c218a8d 100644
--- a/api/src/com/cloud/agent/api/storage/ssCommand.java
+++ b/api/src/com/cloud/agent/api/storage/ssCommand.java
@@ -22,21 +22,21 @@ public abstract class ssCommand extends Command {
     private String secUrl;
 
 
-	public ssCommand() {	
+	public ssCommand() {
 	}
-	
+
     protected ssCommand(ssCommand that) {
         this.secUrl = that.secUrl;
     }
 	public ssCommand(String secUrl) {
 	    this.secUrl = secUrl;
     }
-	
+
 	@Override
     public boolean executeInSequence() {
         return true;
     }
-	
+
     public String getSecUrl() {
         return secUrl;
     }
@@ -44,5 +44,5 @@ public abstract class ssCommand extends Command {
     public void setSecUrl(String secUrl) {
         this.secUrl = secUrl;
     }
-	
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index 8ce3def..95ac57c 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -22,22 +22,23 @@ import java.util.List;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.State;
 import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * FirewallRuleTO transfers a port range for an ip to be opened.
- *   
+ *
  * There are essentially three states transferred with each state.
- *      sent multiple times to the destination.  If the rule is not on 
+ *      sent multiple times to the destination.  If the rule is not on
  *   2. alreadyAdded - the rule has been successfully added before.  Rules
  *      in this state are sent for completeness and optimization.
  *      If the rule already exists on the destination, the destination should
  *      reply the rule is successfully applied.
- *      
+ *
  *   - srcPortRange: port range to open.
  *   - protocol: protocol to open for.  Usually tcp and udp.
  *
  */
-public class FirewallRuleTO {
+public class FirewallRuleTO implements InternalIdentity {
     long id;
     String srcVlanTag;
     String srcIp;
@@ -49,35 +50,35 @@ public class FirewallRuleTO {
     FirewallRule.Purpose purpose;
     private Integer icmpType;
     private Integer icmpCode;
-    
+
 
     protected FirewallRuleTO() {
     }
-    
+
     public FirewallRuleTO(long id, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, FirewallRule.Purpose purpose, List<String> sourceCidr,Integer icmpType,Integer icmpCode) {
        this(id,null,srcIp,protocol,srcPortStart,srcPortEnd,revoked,alreadyAdded,purpose,sourceCidr,icmpType,icmpCode);
-    } 
+    }
     public FirewallRuleTO(long id,String srcVlanTag, String srcIp, String protocol, Integer srcPortStart, Integer srcPortEnd, boolean revoked, boolean alreadyAdded, FirewallRule.Purpose purpose, List<String> sourceCidr,Integer icmpType,Integer icmpCode) {
         this.id = id;
         this.srcVlanTag = srcVlanTag;
         this.srcIp = srcIp;
         this.protocol = protocol;
-        
+
         if (srcPortStart != null) {
             List<Integer> portRange = new ArrayList<Integer>();
             portRange.add(srcPortStart);
             if (srcPortEnd != null) {
                 portRange.add(srcPortEnd);
             }
-            
+
             srcPortRange = new int[portRange.size()];
             int i = 0;
             for (Integer port : portRange) {
                 srcPortRange[i] = port.intValue();
                 i ++;
-            }   
-        } 
-        
+            }
+        }
+
         this.revoked = revoked;
         this.alreadyAdded = alreadyAdded;
         this.purpose = purpose;
@@ -88,11 +89,11 @@ public class FirewallRuleTO {
     public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp) {
         this(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getState()==State.Revoke, rule.getState()==State.Active, rule.getPurpose(),rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode());
     }
-    
+
     public FirewallRuleTO(FirewallRule rule, String srcIp) {
         this(rule.getId(),null, srcIp, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getState()==State.Revoke, rule.getState()==State.Active, rule.getPurpose(),rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode());
     }
-    
+
     public long getId() {
         return id;
     }
@@ -100,7 +101,7 @@ public class FirewallRuleTO {
     public String getSrcVlanTag() {
     	return srcVlanTag;
     }
-    
+
     public String getSrcIp() {
         return srcIp;
     }
@@ -112,15 +113,15 @@ public class FirewallRuleTO {
     public int[] getSrcPortRange() {
         return srcPortRange;
     }
-    
+
     public Integer getIcmpType(){
     	return icmpType;
     }
-    
+
     public Integer getIcmpCode(){
-    	return icmpCode;  
+    	return icmpCode;
     }
-    
+
     public String getStringSrcPortRange() {
     	if (srcPortRange == null || srcPortRange.length < 2)
     		return "0:0";
@@ -131,11 +132,11 @@ public class FirewallRuleTO {
     public boolean revoked() {
         return revoked;
     }
-    
+
     public List<String> getSourceCidrList() {
         return sourceCidrList;
     }
-    
+
     public boolean isAlreadyAdded() {
         return alreadyAdded;
     }
@@ -143,5 +144,5 @@ public class FirewallRuleTO {
     public FirewallRule.Purpose getPurpose() {
         return purpose;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/HostTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/HostTO.java b/api/src/com/cloud/agent/api/to/HostTO.java
index f7b734c..967a63d 100644
--- a/api/src/com/cloud/agent/api/to/HostTO.java
+++ b/api/src/com/cloud/agent/api/to/HostTO.java
@@ -24,10 +24,10 @@ public class HostTO {
     private NetworkTO publicNetwork;
     private NetworkTO storageNetwork1;
     private NetworkTO storageNetwork2;
-    
+
     protected HostTO() {
     }
-    
+
     public HostTO(Host vo) {
         guid = vo.getGuid();
         privateNetwork = new NetworkTO(vo.getPrivateIpAddress(), vo.getPrivateNetmask(), vo.getPrivateMacAddress());

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/NetworkACLTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NetworkACLTO.java b/api/src/com/cloud/agent/api/to/NetworkACLTO.java
index 3cdf8fb..9b1a629 100644
--- a/api/src/com/cloud/agent/api/to/NetworkACLTO.java
+++ b/api/src/com/cloud/agent/api/to/NetworkACLTO.java
@@ -23,9 +23,10 @@ import java.util.List;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.FirewallRule.TrafficType;
 import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.api.InternalIdentity;
 
 
-public class NetworkACLTO {
+public class NetworkACLTO implements InternalIdentity {
     long id;
     String vlanTag;
     String protocol;
@@ -36,32 +37,32 @@ public class NetworkACLTO {
     private Integer icmpType;
     private Integer icmpCode;
     private FirewallRule.TrafficType trafficType;
-    
+
 
     protected NetworkACLTO() {
     }
-    
+
 
     public NetworkACLTO(long id,String vlanTag, String protocol, Integer portStart, Integer portEnd, boolean revoked,
             boolean alreadyAdded, List<String> cidrList, Integer icmpType,Integer icmpCode,TrafficType trafficType) {
         this.vlanTag = vlanTag;
         this.protocol = protocol;
-        
+
         if (portStart != null) {
             List<Integer> range = new ArrayList<Integer>();
             range.add(portStart);
             if (portEnd != null) {
                 range.add(portEnd);
             }
-            
+
             portRange = new int[range.size()];
             int i = 0;
             for (Integer port : range) {
                 portRange[i] = port.intValue();
                 i ++;
-            }   
-        } 
-        
+            }
+        }
+
         this.revoked = revoked;
         this.alreadyAdded = alreadyAdded;
         this.cidrList = cidrList;
@@ -71,11 +72,11 @@ public class NetworkACLTO {
     }
 
     public NetworkACLTO(FirewallRule rule, String vlanTag, FirewallRule.TrafficType  trafficType ) {
-        this(rule.getId(), vlanTag, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(), 
+        this(rule.getId(), vlanTag, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(),
                 rule.getState() == FirewallRule.State.Revoke, rule.getState() == FirewallRule.State.Active,
                 rule.getSourceCidrList() ,rule.getIcmpType(), rule.getIcmpCode(),trafficType);
     }
-    
+
     public long getId() {
         return id;
     }
@@ -91,15 +92,15 @@ public class NetworkACLTO {
     public int[] getSrcPortRange() {
         return portRange;
     }
-    
+
     public Integer getIcmpType(){
     	return icmpType;
     }
-    
+
     public Integer getIcmpCode(){
-    	return icmpCode;  
+    	return icmpCode;
     }
-    
+
     public String getStringPortRange() {
     	if (portRange == null || portRange.length < 2)
     		return "0:0";
@@ -110,11 +111,11 @@ public class NetworkACLTO {
     public boolean revoked() {
         return revoked;
     }
-    
+
     public List<String> getSourceCidrList() {
         return cidrList;
     }
-    
+
     public boolean isAlreadyAdded() {
         return alreadyAdded;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/NetworkTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NetworkTO.java b/api/src/com/cloud/agent/api/to/NetworkTO.java
index ad9d4d9..3edd4c0 100644
--- a/api/src/com/cloud/agent/api/to/NetworkTO.java
+++ b/api/src/com/cloud/agent/api/to/NetworkTO.java
@@ -100,7 +100,7 @@ public class NetworkTO {
 
     /**
      * This constructor is usually for hosts where the other information are not important.
-     * 
+     *
      * @param ip ip address
      * @param netmask netmask
      * @param mac mac address
@@ -112,7 +112,7 @@ public class NetworkTO {
     /**
      * This is the full constructor and should be used for VM's network as it contains
      * the full information about what is needed.
-     * 
+     *
      * @param ip
      * @param vlan
      * @param netmask

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/NicTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java b/api/src/com/cloud/agent/api/to/NicTO.java
index 79a43d2..aa2aa19 100644
--- a/api/src/com/cloud/agent/api/to/NicTO.java
+++ b/api/src/com/cloud/agent/api/to/NicTO.java
@@ -26,45 +26,45 @@ public class NicTO extends NetworkTO {
     public NicTO() {
         super();
     }
-    
+
     public void setDeviceId(int deviceId) {
         this.deviceId = deviceId;
     }
-    
+
     public int getDeviceId() {
         return deviceId;
     }
-    
+
     public Integer getNetworkRateMbps() {
         return networkRateMbps;
     }
-    
+
     public void setNetworkRateMbps(Integer networkRateMbps) {
         this.networkRateMbps = networkRateMbps;
     }
-    
+
     public Integer getNetworkRateMulticastMbps() {
         return networkRateMulticastMbps;
     }
-    
+
     public boolean isDefaultNic() {
         return defaultNic;
     }
-    
+
     public void setDefaultNic(boolean defaultNic) {
         this.defaultNic = defaultNic;
     }
-    
+
     @Override
     public String getUuid() {
         return uuid;
     }
-    
+
     @Override
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
-    
+
     @Override
     public String toString() {
         return new StringBuilder("[Nic:").append(type).append("-").append(ip).append("-").append(broadcastUri).append("]").toString();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
index 19673a6..c23dce8 100644
--- a/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
@@ -22,23 +22,23 @@ import com.cloud.utils.net.NetUtils;
 
 /**
  * PortForwardingRuleTO specifies one port forwarding rule.
- * 
+ *
  *
  */
 public class PortForwardingRuleTO extends FirewallRuleTO {
     String dstIp;
     int[] dstPortRange;
-    
+
     protected PortForwardingRuleTO() {
         super();
     }
-    
+
     public PortForwardingRuleTO(PortForwardingRule rule, String srcVlanTag, String srcIp) {
         super(rule, srcVlanTag, srcIp);
         this.dstIp = rule.getDestinationIpAddress().addr();
         this.dstPortRange = new int[] { rule.getDestinationPortStart(), rule.getDestinationPortEnd() };
     }
-    
+
     public PortForwardingRuleTO(long id, String srcIp, int srcPortStart, int srcPortEnd, String dstIp, int dstPortStart, int dstPortEnd, String protocol, boolean revoked, boolean alreadyAdded) {
         super(id, null, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.PortForwarding, null,0,0);
         this.dstIp = dstIp;
@@ -56,5 +56,5 @@ public class PortForwardingRuleTO extends FirewallRuleTO {
     public String getStringDstPortRange() {
         return NetUtils.portRangeToString(dstPortRange);
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java b/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java
index 6f60014..64ca266 100644
--- a/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/StaticNatRuleTO.java
@@ -22,27 +22,27 @@ import com.cloud.network.rules.StaticNatRule;
 
 /**
  * StaticNatRuleTO specifies one static nat rule.
- * 
+ *
  *
  */
 
 public class StaticNatRuleTO extends FirewallRuleTO{
     String dstIp;
-    
+
     protected StaticNatRuleTO() {
     }
-   
+
     public StaticNatRuleTO(StaticNatRule rule, String srcVlanTag, String srcIp, String dstIp) {
         super(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(),rule.getState()==State.Revoke, rule.getState()==State.Active, rule.getPurpose(), null,0,0);
         this.dstIp = dstIp;
     }
- 
+
     public StaticNatRuleTO(StaticNatRule rule, String scrIp, String dstIp) {
         super(rule.getId(), scrIp, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(),rule.getState()==State.Revoke, rule.getState()==State.Active, rule.getPurpose(), null,0,0);
         this.dstIp = dstIp;
     }
-    
-    
+
+
     public StaticNatRuleTO(long id, String srcIp, Integer srcPortStart, Integer srcPortEnd, String dstIp, Integer dstPortStart, Integer dstPortEnd, String protocol, boolean revoked, boolean alreadyAdded) {
         super(id, srcIp, protocol, srcPortStart, srcPortEnd, revoked, alreadyAdded, FirewallRule.Purpose.StaticNat, null,0,0);
         this.dstIp = dstIp;
@@ -56,5 +56,5 @@ public class StaticNatRuleTO extends FirewallRuleTO{
     public String getDstIp() {
         return dstIp;
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/StorageFilerTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/StorageFilerTO.java b/api/src/com/cloud/agent/api/to/StorageFilerTO.java
index 26344da..8f58c9e 100644
--- a/api/src/com/cloud/agent/api/to/StorageFilerTO.java
+++ b/api/src/com/cloud/agent/api/to/StorageFilerTO.java
@@ -27,7 +27,7 @@ public class StorageFilerTO {
     String userInfo;
     int port;
     StoragePoolType type;
-    
+
     public StorageFilerTO(StoragePool pool) {
         this.id = pool.getId();
         this.host = pool.getHostAddress();
@@ -61,14 +61,14 @@ public class StorageFilerTO {
     public int getPort() {
         return port;
     }
-    
+
     public StoragePoolType getType() {
         return type;
     }
-    
+
     protected StorageFilerTO() {
     }
-    
+
     @Override
     public String toString() {
         return new StringBuilder("Pool[").append(id).append("|").append(host).append(":").append(port).append("|").append(path).append("]").toString();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/SwiftTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/SwiftTO.java b/api/src/com/cloud/agent/api/to/SwiftTO.java
index 7920ce8..32742c7 100644
--- a/api/src/com/cloud/agent/api/to/SwiftTO.java
+++ b/api/src/com/cloud/agent/api/to/SwiftTO.java
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 package com.cloud.agent.api.to;
-  
+
 public class SwiftTO {
     Long id;
     String url;
     String account;
-        
+
     String userName;
     String key;
-            
+
     public SwiftTO() { }
 
     public SwiftTO(Long id, String url, String account, String userName, String key) {
@@ -33,7 +33,7 @@ public class SwiftTO {
         this.userName = userName;
         this.key = key;
     }
-    
+
     public Long getId() {
         return id;
     }
@@ -53,6 +53,6 @@ public class SwiftTO {
     public String getKey() {
         return key;
     }
-    
+
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/TemplateTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/TemplateTO.java b/api/src/com/cloud/agent/api/to/TemplateTO.java
index e163340..d77b805 100644
--- a/api/src/com/cloud/agent/api/to/TemplateTO.java
+++ b/api/src/com/cloud/agent/api/to/TemplateTO.java
@@ -18,21 +18,22 @@ package com.cloud.agent.api.to;
 
 import com.cloud.storage.Storage.ImageFormat;
 import com.cloud.template.VirtualMachineTemplate;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class TemplateTO {
+public class TemplateTO implements InternalIdentity {
     private long id;
     private String uniqueName;
     private ImageFormat format;
-    
+
     protected TemplateTO() {
     }
-    
+
     public TemplateTO(VirtualMachineTemplate template) {
         this.id = template.getId();
         this.uniqueName = template.getUniqueName();
         this.format = template.getFormat();
     }
-    
+
     public long getId() {
         return id;
     }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
index a93c242..8f3f0eb 100644
--- a/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
+++ b/api/src/com/cloud/agent/api/to/VirtualMachineTO.java
@@ -108,7 +108,7 @@ public class VirtualMachineTO {
     public boolean getLimitCpuUse() {
     	return limitCpuUse;
     }
-    
+
     public long getMinRam() {
         return minRam;
     }
@@ -185,11 +185,11 @@ public class VirtualMachineTO {
     public void setNics(NicTO[] nics) {
         this.nics = nics;
     }
-    
+
     public String getVncPassword() {
     	return this.vncPassword;
     }
-    
+
     public void setVncPassword(String vncPassword) {
     	this.vncPassword = vncPassword;
     }
@@ -201,11 +201,11 @@ public class VirtualMachineTO {
     public void setVncAddr(String vncAddr) {
         this.vncAddr = vncAddr;
     }
-    
+
     public Map<String, String> getDetails() {
     	return params;
     }
-    
+
     public void setDetails(Map<String, String> params) {
     	this.params = params;
     }
@@ -217,6 +217,6 @@ public class VirtualMachineTO {
     public void setUuid(String uuid) {
         this.uuid = uuid;
     }
-    
-    
+
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/agent/api/to/VolumeTO.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java
index ca0acb5..ff739c5 100644
--- a/api/src/com/cloud/agent/api/to/VolumeTO.java
+++ b/api/src/com/cloud/agent/api/to/VolumeTO.java
@@ -19,8 +19,9 @@ package com.cloud.agent.api.to;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.StoragePool;
 import com.cloud.storage.Volume;
+import org.apache.cloudstack.api.InternalIdentity;
 
-public class VolumeTO {
+public class VolumeTO implements InternalIdentity {
     protected VolumeTO() {
     }
 

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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c4c9d2d8/api/src/com/cloud/alert/Alert.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/alert/Alert.java b/api/src/com/cloud/alert/Alert.java
index c9368a3..defd154 100644
--- a/api/src/com/cloud/alert/Alert.java
+++ b/api/src/com/cloud/alert/Alert.java
@@ -16,10 +16,12 @@
 // under the License.
 package com.cloud.alert;
 
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
 import java.util.Date;
 
-public interface Alert {
-    long getId();
+public interface Alert extends Identity, InternalIdentity {
     short getType();
     String getSubject();
     Long getPodId();


Mime
View raw message