From ff86c865e204ccf7c8fd90abf353ee6dd9acc384 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Sat, 4 Jun 2011 21:27:18 -0700
Subject: [PATCH 01/13] bug 10135: Add SSL encryption for non-NIO link

Now Link.write() support SSL encryption. And since there is no user of
Link.read(), we comment it out.
---
 .../agent/manager/ClusteredAgentAttache.java  |   9 +-
 .../manager/ClusteredAgentManagerImpl.java    |  29 ++-
 utils/src/com/cloud/utils/nio/Link.java       | 233 ++++++++++++++----
 utils/src/com/cloud/utils/nio/NioClient.java  |   4 +-
 .../com/cloud/utils/nio/NioConnection.java    | 142 +----------
 5 files changed, 219 insertions(+), 198 deletions(-)

diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java b/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java
index 4d28ee16c1e..a4929f18799 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentAttache.java
@@ -10,6 +10,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SocketChannel;
 
+import javax.net.ssl.SSLEngine;
+
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
@@ -126,6 +128,11 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
                     }
                     continue;
                 }
+                
+                SSLEngine sslEngine = s_clusteredAgentMgr.getSSLEngine(peerName);
+                if (sslEngine == null) {
+                    throw new AgentUnavailableException("Unable to get SSLEngine of peer " + peerName, _id);
+                }
 
                 try {
                     if (s_logger.isDebugEnabled()) {
@@ -135,7 +142,7 @@ public class ClusteredAgentAttache extends ConnectedAgentAttache implements Rout
                         SynchronousListener synchronous = (SynchronousListener)listener;
                         synchronous.setPeer(peerName);
                     }
-                    Link.write(ch, req.toBytes());
+                    Link.write(ch, req.toBytes(), sslEngine);
                     error = false;
                     return;
                 } catch (IOException e) {
diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index d916200e387..4090f148e3b 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -27,6 +27,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 
 import org.apache.log4j.Logger;
 
@@ -89,6 +91,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     protected ClusterManager _clusterMgr = null;
 
     protected HashMap<String, SocketChannel> _peers;
+    protected HashMap<String, SSLEngine> _sslEngines;
     private final Timer _timer = new Timer("ClusteredAgentManager Timer");
 
     @Inject
@@ -106,6 +109,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     @Override
     public boolean configure(String name, Map<String, Object> xmlParams) throws ConfigurationException {
         _peers = new HashMap<String, SocketChannel>(7);
+        _sslEngines = new HashMap<String, SSLEngine>(7);
         _nodeId = _clusterMgr.getManagementNodeId();
 
         ConfigurationDao configDao = ComponentLocator.getCurrentLocator().getDao(ConfigurationDao.class);
@@ -406,6 +410,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     public boolean routeToPeer(String peer, byte[] bytes) {
         int i = 0;
         SocketChannel ch = null;
+        SSLEngine sslEngine = null;
         while (i++ < 5) {
             ch = connectToPeer(peer, ch);
             if (ch == null) {
@@ -415,11 +420,16 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                 }
                 return false;
             }
+            sslEngine = getSSLEngine(peer);
+            if (sslEngine == null) {
+                logD(bytes, "Unable to get SSLEngine of peer: " + peer);
+                return false;
+            }
             try {
                 if (s_logger.isDebugEnabled()) {
                     logD(bytes, "Routing to peer");
                 }
-                Link.write(ch, new ByteBuffer[] { ByteBuffer.wrap(bytes) });
+                Link.write(ch, new ByteBuffer[] { ByteBuffer.wrap(bytes) }, sslEngine);
                 return true;
             } catch (IOException e) {
                 try {
@@ -434,6 +444,10 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     public String findPeer(long hostId) {
         return _clusterMgr.getPeerName(hostId);
     }
+    
+    public SSLEngine getSSLEngine(String peerName) {
+        return _sslEngines.get(peerName);
+    }
 
     public void cancel(String peerName, long hostId, long sequence, String reason) {
         CancelCommand cancel = new CancelCommand(sequence, reason);
@@ -453,12 +467,14 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                 }
             }
             _peers.remove(peerName);
+            _sslEngines.remove(peerName);
         }
     }
 
     public SocketChannel connectToPeer(String peerName, SocketChannel prevCh) {
         synchronized (_peers) {
             SocketChannel ch = _peers.get(peerName);
+            SSLEngine sslEngine = null;
             if (prevCh != null) {
                 try {
                     prevCh.close();
@@ -483,10 +499,21 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                     ch.configureBlocking(true); // make sure we are working at blocking mode
                     ch.socket().setKeepAlive(true);
                     ch.socket().setSoTimeout(60 * 1000);
+                    try {
+                        SSLContext sslContext = Link.initSSLContext(true);
+                        sslEngine = sslContext.createSSLEngine(ip, _port);
+                        sslEngine.setUseClientMode(true);
+
+                        Link.doHandshake(ch, sslEngine, true);
+                        s_logger.info("SSL: Handshake done");
+                    } catch (Exception e) {
+                        throw new IOException("SSL: Fail to init SSL! " + e);
+                    }
                     if (s_logger.isDebugEnabled()) {
                         s_logger.debug("Connection to peer opened: " + peerName + ", ip: " + ip);
                     }
                     _peers.put(peerName, ch);
+                    _sslEngines.put(peerName, sslEngine);
                 } catch (IOException e) {
                     s_logger.warn("Unable to connect to peer management server: " + peerName + ", ip: " + ip + " due to " + e.getMessage(), e);
                     return null;
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
index f285eeda7d2..d7f5c5b04c7 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -18,6 +18,8 @@
 package com.cloud.utils.nio;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -26,11 +28,16 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.WritableByteChannel;
+import java.security.KeyStore;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 
 import org.apache.log4j.Logger;
@@ -82,13 +89,14 @@ public class Link {
     }
 
     /**
+     * No user, so comment it out.
+     * 
      * Static methods for reading from a channel in case
      * you need to add a client that doesn't require nio.
      * @param ch channel to read from.
      * @param bytebuffer to use.
      * @return bytes read
      * @throws IOException if not read to completion.
-     */
     public static byte[] read(SocketChannel ch, ByteBuffer buff) throws IOException {
     	synchronized(buff) {
 	    	buff.clear();
@@ -121,7 +129,44 @@ public class Link {
 	        return output.toByteArray();
     	}
     }
-    	
+    */
+    
+    private static void doWrite(SocketChannel ch, ByteBuffer[] buffers, SSLEngine sslEngine) throws IOException {
+        ByteBuffer pkgBuf;
+        SSLSession sslSession = sslEngine.getSession();
+        SSLEngineResult engResult;
+
+        ByteBuffer headBuf = ByteBuffer.allocate(4);
+
+        pkgBuf = ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
+        engResult = sslEngine.wrap(buffers, pkgBuf);
+        if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED &&
+                engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
+                engResult.getStatus() != SSLEngineResult.Status.OK) {
+            throw new IOException("SSL: SSLEngine return bad result! " + engResult);
+        }
+
+        int dataRemaining = pkgBuf.position();
+        int headRemaining = 4;
+        pkgBuf.flip();
+        headBuf.putInt(dataRemaining);
+        headBuf.flip();
+
+        while (headRemaining > 0) {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace("Writing Header " + headRemaining);
+            }
+            long count = ch.write(headBuf);
+            headRemaining -= count;
+        }
+        while (dataRemaining > 0) {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.trace("Writing Data " + dataRemaining);
+            }
+            long count = ch.write(pkgBuf);
+            dataRemaining -= count;
+        }
+    }
     
     /**
      * write method to write to a socket.  This method writes to completion so
@@ -132,26 +177,10 @@ public class Link {
      * @param buffers buffers to write.
      * @throws IOException if unable to write to completion.
      */
-    public static void write(SocketChannel ch, ByteBuffer[] buffers) throws IOException {
+    public static void write(SocketChannel ch, ByteBuffer[] buffers, SSLEngine sslEngine) throws IOException {
         synchronized(ch) {
-    		int length = 0;
-    		ByteBuffer[] buff = new ByteBuffer[buffers.length + 1];
-    		for (int i = 0; i < buffers.length; i++) {
-    			length += buffers[i].remaining();
-    			buff[i + 1] = buffers[i];
-    		}
-    		buff[0] = ByteBuffer.allocate(4);
-    		buff[0].putInt(length);
-    		buff[0].flip();
-    		long count = 0;
-    		while (count < length + 4) {
-    			long written = ch.write(buff);
-    			if (written < 0) {
-    				throw new IOException("Unable to write after " + count);
-    			}
-    			count += written;
-    		}
-        }
+            doWrite(ch, buffers, sslEngine);
+        } 
     }
     
     public byte[] read(SocketChannel ch) throws IOException {
@@ -285,42 +314,10 @@ public class Link {
                 return true;
             }
 
-            ByteBuffer pkgBuf;
-            SSLSession sslSession = _sslEngine.getSession();
-            SSLEngineResult engResult;
-
-            ByteBuffer headBuf = ByteBuffer.allocate(4);
             ByteBuffer[] raw_data = new ByteBuffer[data.length - 1];
             System.arraycopy(data, 1, raw_data, 0, data.length - 1);
 
-            pkgBuf = ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
-            engResult = _sslEngine.wrap(raw_data, pkgBuf);
-            if (engResult.getHandshakeStatus() != HandshakeStatus.FINISHED &&
-                    engResult.getHandshakeStatus() != HandshakeStatus.NOT_HANDSHAKING &&
-                    engResult.getStatus() != SSLEngineResult.Status.OK) {
-                throw new IOException("SSL: SSLEngine return bad result! " + engResult);
-            }
-
-            int dataRemaining = pkgBuf.position();
-            int headRemaining = 4;
-            pkgBuf.flip();
-            headBuf.putInt(dataRemaining);
-            headBuf.flip();
-
-            while (headRemaining > 0) {
-                if (s_logger.isTraceEnabled()) {
-                    s_logger.trace("Writing Header " + headRemaining);
-                }
-                long count = ch.write(headBuf);
-                headRemaining -= count;
-            }
-            while (dataRemaining > 0) {
-                if (s_logger.isTraceEnabled()) {
-                    s_logger.trace("Writing Data " + dataRemaining);
-                }
-                long count = ch.write(pkgBuf);
-                dataRemaining -= count;
-            }
+            doWrite(ch, raw_data, _sslEngine);
         }
         return false;
     }
@@ -343,4 +340,132 @@ public class Link {
         }
         _connection.scheduleTask(task);
     }
+    
+    public static SSLContext initSSLContext(boolean isClient) throws Exception {
+        SSLContext sslContext = null;
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+        KeyStore ks = KeyStore.getInstance("JKS");
+        TrustManager[] tms;
+        
+        if (!isClient) {
+        	char[] passphrase = "vmops.com".toCharArray();
+        	String keystorePath = "/etc/cloud/management/cloud.keystore";
+        	if (new File(keystorePath).exists()) {
+        		ks.load(new FileInputStream(keystorePath), passphrase);
+        	} else {
+        		s_logger.warn("SSL: Fail to find the generated keystore. Loading fail-safe one to continue.");
+        		ks.load(NioConnection.class.getResourceAsStream("/cloud.keystore"), passphrase);
+        	}
+        	kmf.init(ks, passphrase);
+        	tmf.init(ks);
+        	tms = tmf.getTrustManagers();
+        } else {
+        	ks.load(null, null);
+        	kmf.init(ks, null);
+        	tms = new TrustManager[1];
+        	tms[0] = new TrustAllManager();
+        }
+        
+        sslContext = SSLContext.getInstance("TLS");
+        sslContext.init(kmf.getKeyManagers(), tms, null);
+        s_logger.info("SSL: SSLcontext has been initialized");
+
+        return sslContext;
+    }
+
+    public static void doHandshake(SocketChannel ch, SSLEngine sslEngine,
+                               boolean isClient) throws IOException {
+        s_logger.info("SSL: begin Handshake, isClient: " + isClient);
+
+        SSLEngineResult engResult;
+        SSLSession sslSession = sslEngine.getSession();
+        HandshakeStatus hsStatus;
+        ByteBuffer in_pkgBuf =
+            ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
+        ByteBuffer in_appBuf =
+            ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
+        ByteBuffer out_pkgBuf =
+            ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
+        ByteBuffer out_appBuf =
+            ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
+        int count;
+
+        if (isClient) {
+            hsStatus = SSLEngineResult.HandshakeStatus.NEED_WRAP;
+        } else {
+            hsStatus = SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
+        }
+
+        while (hsStatus != SSLEngineResult.HandshakeStatus.FINISHED) {
+            if (s_logger.isTraceEnabled()) {
+                s_logger.info("SSL: Handshake status " + hsStatus);
+            }
+            engResult = null;
+            if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
+                out_pkgBuf.clear();
+                out_appBuf.clear();
+                out_appBuf.put("Hello".getBytes());
+                engResult = sslEngine.wrap(out_appBuf, out_pkgBuf);
+                out_pkgBuf.flip();
+                int remain = out_pkgBuf.limit();
+                while (remain != 0) {
+                    remain -= ch.write(out_pkgBuf);
+                    if (remain < 0) {
+                        throw new IOException("Too much bytes sent?");
+                    }
+                }
+            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
+                in_appBuf.clear();
+                // One packet may contained multiply operation
+                if (in_pkgBuf.position() == 0 || !in_pkgBuf.hasRemaining()) {
+                    in_pkgBuf.clear();
+                    count = ch.read(in_pkgBuf);
+                    if (count == -1) {
+                        throw new IOException("Connection closed with -1 on reading size.");
+                    }
+                    in_pkgBuf.flip();
+                }
+                engResult = sslEngine.unwrap(in_pkgBuf, in_appBuf);
+                ByteBuffer tmp_pkgBuf =
+                    ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
+                while (engResult.getStatus() == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
+                    // We need more packets to complete this operation
+                    if (s_logger.isTraceEnabled()) {
+                        s_logger.info("SSL: Buffer overflowed, getting more packets");
+                    }
+                    tmp_pkgBuf.clear();
+                    count = ch.read(tmp_pkgBuf);
+                    tmp_pkgBuf.flip();
+                    
+                    in_pkgBuf.mark();
+                    in_pkgBuf.position(in_pkgBuf.limit());
+                    in_pkgBuf.limit(in_pkgBuf.limit() + tmp_pkgBuf.limit());
+                    in_pkgBuf.put(tmp_pkgBuf);
+                    in_pkgBuf.reset();
+                    
+                    in_appBuf.clear();
+                    engResult = sslEngine.unwrap(in_pkgBuf, in_appBuf);
+                }
+            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
+                Runnable run;
+                while ((run = sslEngine.getDelegatedTask()) != null) {
+                    if (s_logger.isTraceEnabled()) {
+                        s_logger.info("SSL: Running delegated task!");
+                    }
+                    run.run();
+                }
+            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
+                throw new IOException("NOT a handshaking!");
+            }
+            if (engResult != null && engResult.getStatus() != SSLEngineResult.Status.OK) {
+                throw new IOException("Fail to handshake! " + engResult.getStatus());
+            }
+            if (engResult != null)
+                hsStatus = engResult.getHandshakeStatus();
+            else
+                hsStatus = sslEngine.getHandshakeStatus();
+        }
+    }
+
 }
diff --git a/utils/src/com/cloud/utils/nio/NioClient.java b/utils/src/com/cloud/utils/nio/NioClient.java
index 8ddabc267a5..0344c5b443f 100755
--- a/utils/src/com/cloud/utils/nio/NioClient.java
+++ b/utils/src/com/cloud/utils/nio/NioClient.java
@@ -71,11 +71,11 @@ public class NioClient extends NioConnection {
         	// Begin SSL handshake in BLOCKING mode
         	sch.configureBlocking(true);
 
-        	SSLContext sslContext = initSSLContext(true);
+        	SSLContext sslContext = Link.initSSLContext(true);
         	sslEngine = sslContext.createSSLEngine(_host, _port);
         	sslEngine.setUseClientMode(true);
 
-        	doHandshake(sch, sslEngine, true);
+        	Link.doHandshake(sch, sslEngine, true);
         	s_logger.info("SSL: Handshake done");
         } catch (Exception e) {
         	throw new IOException("SSL: Fail to init SSL! " + e);
diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/com/cloud/utils/nio/NioConnection.java
index 2843136eede..83f4eee880f 100755
--- a/utils/src/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/com/cloud/utils/nio/NioConnection.java
@@ -17,20 +17,16 @@
  */
 package com.cloud.utils.nio;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -40,19 +36,12 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 
 import org.apache.log4j.Logger;
 
 import com.cloud.utils.concurrency.NamedThreadFactory;
-import com.cloud.utils.nio.TrustAllManager;
 
 /**
  * NioConnection abstracts the NIO socket operations.  The Java implementation
@@ -184,133 +173,6 @@ public abstract class NioConnection implements Runnable {
     abstract void registerLink(InetSocketAddress saddr, Link link);
     abstract void unregisterLink(InetSocketAddress saddr);
 
-    protected SSLContext initSSLContext(boolean isClient) throws Exception {
-        SSLContext sslContext = null;
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-        KeyStore ks = KeyStore.getInstance("JKS");
-        TrustManager[] tms;
-        
-        if (!isClient) {
-        	char[] passphrase = "vmops.com".toCharArray();
-        	String keystorePath = "/etc/cloud/management/cloud.keystore";
-        	if (new File(keystorePath).exists()) {
-        		ks.load(new FileInputStream(keystorePath), passphrase);
-        	} else {
-        		s_logger.warn("SSL: Fail to find the generated keystore. Loading fail-safe one to continue.");
-        		ks.load(NioConnection.class.getResourceAsStream("/cloud.keystore"), passphrase);
-        	}
-        	kmf.init(ks, passphrase);
-        	tmf.init(ks);
-        	tms = tmf.getTrustManagers();
-        } else {
-        	ks.load(null, null);
-        	kmf.init(ks, null);
-        	tms = new TrustManager[1];
-        	tms[0] = new TrustAllManager();
-        }
-        
-        sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(kmf.getKeyManagers(), tms, null);
-        s_logger.info("SSL: SSLcontext has been initialized");
-
-        return sslContext;
-    }
-
-    protected void doHandshake(SocketChannel ch, SSLEngine sslEngine,
-                               boolean isClient) throws IOException {
-        s_logger.info("SSL: begin Handshake, isClient: " + isClient);
-
-        SSLEngineResult engResult;
-        SSLSession sslSession = sslEngine.getSession();
-        HandshakeStatus hsStatus;
-        ByteBuffer in_pkgBuf =
-            ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
-        ByteBuffer in_appBuf =
-            ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
-        ByteBuffer out_pkgBuf =
-            ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
-        ByteBuffer out_appBuf =
-            ByteBuffer.allocate(sslSession.getApplicationBufferSize() + 40);
-        int count;
-
-        if (isClient) {
-            hsStatus = SSLEngineResult.HandshakeStatus.NEED_WRAP;
-        } else {
-            hsStatus = SSLEngineResult.HandshakeStatus.NEED_UNWRAP;
-        }
-
-        while (hsStatus != SSLEngineResult.HandshakeStatus.FINISHED) {
-            if (s_logger.isTraceEnabled()) {
-                s_logger.info("SSL: Handshake status " + hsStatus);
-            }
-            engResult = null;
-            if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_WRAP) {
-                out_pkgBuf.clear();
-                out_appBuf.clear();
-                out_appBuf.put("Hello".getBytes());
-                engResult = sslEngine.wrap(out_appBuf, out_pkgBuf);
-                out_pkgBuf.flip();
-                int remain = out_pkgBuf.limit();
-                while (remain != 0) {
-                    remain -= ch.write(out_pkgBuf);
-                    if (remain < 0) {
-                        throw new IOException("Too much bytes sent?");
-                    }
-                }
-            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
-                in_appBuf.clear();
-                // One packet may contained multiply operation
-                if (in_pkgBuf.position() == 0 || !in_pkgBuf.hasRemaining()) {
-                    in_pkgBuf.clear();
-                    count = ch.read(in_pkgBuf);
-                    if (count == -1) {
-                        throw new IOException("Connection closed with -1 on reading size.");
-                    }
-                    in_pkgBuf.flip();
-                }
-                engResult = sslEngine.unwrap(in_pkgBuf, in_appBuf);
-                ByteBuffer tmp_pkgBuf =
-                    ByteBuffer.allocate(sslSession.getPacketBufferSize() + 40);
-                while (engResult.getStatus() == SSLEngineResult.Status.BUFFER_UNDERFLOW) {
-                    // We need more packets to complete this operation
-                    if (s_logger.isTraceEnabled()) {
-                        s_logger.info("SSL: Buffer overflowed, getting more packets");
-                    }
-                    tmp_pkgBuf.clear();
-                    count = ch.read(tmp_pkgBuf);
-                    tmp_pkgBuf.flip();
-                    
-                    in_pkgBuf.mark();
-                    in_pkgBuf.position(in_pkgBuf.limit());
-                    in_pkgBuf.limit(in_pkgBuf.limit() + tmp_pkgBuf.limit());
-                    in_pkgBuf.put(tmp_pkgBuf);
-                    in_pkgBuf.reset();
-                    
-                    in_appBuf.clear();
-                    engResult = sslEngine.unwrap(in_pkgBuf, in_appBuf);
-                }
-            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NEED_TASK) {
-                Runnable run;
-                while ((run = sslEngine.getDelegatedTask()) != null) {
-                    if (s_logger.isTraceEnabled()) {
-                        s_logger.info("SSL: Running delegated task!");
-                    }
-                    run.run();
-                }
-            } else if (hsStatus == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) {
-                throw new IOException("NOT a handshaking!");
-            }
-            if (engResult != null && engResult.getStatus() != SSLEngineResult.Status.OK) {
-                throw new IOException("Fail to handshake! " + engResult.getStatus());
-            }
-            if (engResult != null)
-                hsStatus = engResult.getHandshakeStatus();
-            else
-                hsStatus = sslEngine.getHandshakeStatus();
-        }
-    }
-
     protected void accept(SelectionKey key) throws IOException {
         ServerSocketChannel serverSocketChannel = (ServerSocketChannel)key.channel();
 
@@ -327,12 +189,12 @@ public abstract class NioConnection implements Runnable {
 
         SSLEngine sslEngine = null;
         try {
-        	SSLContext sslContext = initSSLContext(false);
+        	SSLContext sslContext = Link.initSSLContext(false);
         	sslEngine = sslContext.createSSLEngine();
         	sslEngine.setUseClientMode(false);
         	sslEngine.setNeedClientAuth(false);
 
-        	doHandshake(socketChannel, sslEngine, false);
+        	Link.doHandshake(socketChannel, sslEngine, false);
         	s_logger.info("SSL: Handshake done");
         } catch (Exception e) {
         	throw new IOException("SSL: Fail to init SSL! " + e);

From 7cf312674b4a0a33eabf5b216bcf6d0ecb46f556 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Sat, 4 Jun 2011 21:28:03 -0700
Subject: [PATCH 02/13] bug 10135: Fix clustered agent manager's version bug

We are using v1 now, instead of v3. This bug result in all the commands from
the other clustered management server would be sent to agentmanager, and then dropped.

status 10135: resolved fixed
---
 .../src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 4090f148e3b..faabc788040 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -596,7 +596,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
 
                 final byte[] data = task.getData();
                 Version ver = Request.getVersion(data);
-                if (ver.ordinal() < Version.v3.ordinal()) {
+                if (ver.ordinal() != Version.v1.ordinal()) {
+                    s_logger.warn("Wrong version for clustered agent request");
                     super.doTask(task);
                     return;
                 }

From a0ce3da1913e580d767a0942de347b8cedf7a3f4 Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Sun, 5 Jun 2011 13:51:22 -0700
Subject: [PATCH 03/13] fixed problem with header

---
 .../com/cloud/agent/transport/Request.java    | 15 +++++---
 .../cloud/agent/transport/RequestTest.java    | 13 ++++---
 .../agent/manager/DirectAgentAttache.java     |  2 +-
 .../src/com/cloud/server/StatsCollector.java  | 38 +++++++++++--------
 4 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/core/src/com/cloud/agent/transport/Request.java b/core/src/com/cloud/agent/transport/Request.java
index 455f32db19d..afbb8b44b9d 100755
--- a/core/src/com/cloud/agent/transport/Request.java
+++ b/core/src/com/cloud/agent/transport/Request.java
@@ -324,7 +324,7 @@ public class Request {
                 assert false : "More gson errors on " + buff.toString();
                 return "";
             }
-            if (content.length() <= 4) {
+            if (content.length() <= (1 + _cmds.length * 3)) {
                 return null;
             }
         } else {
@@ -368,7 +368,7 @@ public class Request {
         final ByteBuffer buff = ByteBuffer.wrap(bytes);
         final byte ver = buff.get();
         final Version version = Version.get(ver);
-        if (version.ordinal() != Version.v1.ordinal()) {
+        if (version.ordinal() != Version.v1.ordinal() && version.ordinal() != Version.v3.ordinal()) {
             throw new UnsupportedVersionException("This version is no longer supported: " + version.toString(), UnsupportedVersionException.IncompatibleVersion);
         }
         final byte reserved = buff.get(); // tossed away for now.
@@ -379,7 +379,12 @@ public class Request {
         final int size = buff.getInt();
         final long mgmtId = buff.getLong();
         final long agentId = buff.getLong();
-        final long via = buff.getLong();
+        long via;
+        if (version.ordinal() == Version.v1.ordinal()) {
+            via = buff.getLong();
+        } else {
+            via = agentId;
+        }
 
         byte[] command = null;
         int offset = 0;
@@ -426,11 +431,11 @@ public class Request {
     }
 
     public static long getAgentId(final byte[] bytes) {
-        return NumbersUtil.bytesToLong(bytes, 28);
+        return NumbersUtil.bytesToLong(bytes, 24);
     }
 
     public static long getViaAgentId(final byte[] bytes) {
-        return NumbersUtil.bytesToLong(bytes, 24);
+        return NumbersUtil.bytesToLong(bytes, 32);
     }
     
     public static boolean fromServer(final byte[] bytes) {
diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/test/com/cloud/agent/transport/RequestTest.java
index 0198444fbff..683b2b506be 100644
--- a/core/test/com/cloud/agent/transport/RequestTest.java
+++ b/core/test/com/cloud/agent/transport/RequestTest.java
@@ -75,16 +75,17 @@ public class RequestTest extends TestCase {
         assert (!log.contains("password"));
 
         logger.setLevel(Level.INFO);
-        sreq.log("Info", true, Level.INFO);
-        assert (log.contains(UpdateHostPasswordCommand.class.getSimpleName()));
-        assert (log.contains(SecStorageFirewallCfgCommand.class.getSimpleName()));
-        assert (!log.contains(GetHostStatsCommand.class.getSimpleName()));
-        assert (!log.contains("username"));
-        assert (!log.contains("password"));
+        log = sreq.log("Info", true, Level.INFO);
+        assert (log == null);
 
         logger.setLevel(level);
 
         byte[] bytes = sreq.getBytes();
+        
+        assert Request.getSequence(bytes) == 1;
+        assert Request.getManagementServerId(bytes) == 3;
+        assert Request.getAgentId(bytes) == 2;
+        assert Request.getViaAgentId(bytes) == 2;
         Request creq = null;
         try {
             creq = Request.parse(bytes);
diff --git a/server/src/com/cloud/agent/manager/DirectAgentAttache.java b/server/src/com/cloud/agent/manager/DirectAgentAttache.java
index c36a3c77942..bfc02f9bbf6 100644
--- a/server/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/server/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -44,7 +44,7 @@ public class DirectAgentAttache extends AgentAttache {
     private final static Logger s_logger = Logger.getLogger(DirectAgentAttache.class);
 
     ServerResource _resource;
-    static ScheduledExecutorService s_executor = new ScheduledThreadPoolExecutor(100, new NamedThreadFactory("DirectAgent"));
+    static ScheduledExecutorService s_executor = new ScheduledThreadPoolExecutor(500, new NamedThreadFactory("DirectAgent"));
     List<ScheduledFuture<?>> _futures = new ArrayList<ScheduledFuture<?>>();
     AgentManagerImpl _mgr;
     long _seq = 0;
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index e52205867f3..c0d4bca5f54 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -128,10 +128,18 @@ public class StatsCollector {
 		 hostAndVmStatsInterval = NumbersUtil.parseLong(configs.get("vm.stats.interval"), 60000L);
 		 storageStatsInterval = NumbersUtil.parseLong(configs.get("storage.stats.interval"), 60000L);
 		 volumeStatsInterval = NumbersUtil.parseLong(configs.get("volume.stats.interval"), -1L);
-
-		_executor.scheduleWithFixedDelay(new HostCollector(), 15000L, hostStatsInterval, TimeUnit.MILLISECONDS);
-		_executor.scheduleWithFixedDelay(new VmStatsCollector(), 15000L, hostAndVmStatsInterval, TimeUnit.MILLISECONDS);
-		_executor.scheduleWithFixedDelay(new StorageCollector(), 15000L, storageStatsInterval, TimeUnit.MILLISECONDS);
+
+		 if (hostStatsInterval > 0) {
+		     _executor.scheduleWithFixedDelay(new HostCollector(), 15000L, hostStatsInterval, TimeUnit.MILLISECONDS);
+		 }
+		 
+		 if (hostAndVmStatsInterval > 0) {
+		     _executor.scheduleWithFixedDelay(new VmStatsCollector(), 15000L, hostAndVmStatsInterval, TimeUnit.MILLISECONDS);
+		 }
+		 
+		 if (storageStatsInterval > 0) {
+		     _executor.scheduleWithFixedDelay(new StorageCollector(), 15000L, storageStatsInterval, TimeUnit.MILLISECONDS);
+		 }
 		
 		// -1 means we don't even start this thread to pick up any data.
 		if (volumeStatsInterval > 0) {
@@ -199,7 +207,7 @@ public class StatsCollector {
 						vmIds.add(vm.getId());
 					}
 					
-					try 
+					try
 					{
 							HashMap<Long, VmStatsEntry> vmStatsById = _userVmMgr.getVirtualMachineStatistics(host.getId(), host.getName(), vmIds);
 							
@@ -250,7 +258,7 @@ public class StatsCollector {
 	class StorageCollector implements Runnable {
 		@Override
         public void run() {
-			try {               
+			try {
                 List<HostVO> hosts = _hostDao.listSecondaryStorageHosts();
                 ConcurrentHashMap<Long, StorageStats> storageStats = new ConcurrentHashMap<Long, StorageStats>();
                 for (HostVO host : hosts) {
@@ -260,13 +268,13 @@ public class StatsCollector {
                     if (answer != null && answer.getResult()) {
                         storageStats.put(hostId, (StorageStats)answer);
                         //Seems like we have dynamically updated the sec. storage as prev. size and the current do not match
-                        if (_storageStats.get(hostId)!=null && 
-                        		_storageStats.get(hostId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()){	                       	
+                        if (_storageStats.get(hostId)!=null &&
+                        		_storageStats.get(hostId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()){
 	                       	host.setTotalSize(((StorageStats)answer).getCapacityBytes());
 	                       	_hostDao.update(hostId, host);
-	                    }  
+	                    }
                     }
-                }				
+                }
                 _storageStats = storageStats;
 				ConcurrentHashMap<Long, StorageStats> storagePoolStats = new ConcurrentHashMap<Long, StorageStats>();
 
@@ -279,11 +287,11 @@ public class StatsCollector {
     					if (answer != null && answer.getResult()) {
     						storagePoolStats.put(pool.getId(), (StorageStats)answer);
     
-    						// Seems like we have dynamically updated the pool size since the prev. size and the current do not match 
+    						// Seems like we have dynamically updated the pool size since the prev. size and the current do not match
     						if (_storagePoolStats.get(poolId)!= null &&
-    								_storagePoolStats.get(poolId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()){	                        
-    		                    pool.setCapacityBytes(((StorageStats)answer).getCapacityBytes());	                    
-    		                    _storagePoolDao.update(pool.getId(), pool);                         
+    								_storagePoolStats.get(poolId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()){
+    		                    pool.setCapacityBytes(((StorageStats)answer).getCapacityBytes());
+    		                    _storagePoolDao.update(pool.getId(), pool);
     	                    }
     					}
                     } catch (StorageUnavailableException e) {
@@ -291,7 +299,7 @@ public class StatsCollector {
                     } catch (Exception e) {
                         s_logger.warn("Unable to get stats for " + pool);
                     }
-				}                               
+				}
                 _storagePoolStats = storagePoolStats;
 			} catch (Throwable t) {
 				s_logger.error("Error trying to retrieve storage stats", t);

From 019cc789766c2700f3f4ccd7b50bb0afaa78743b Mon Sep 17 00:00:00 2001
From: Alex Huang <alex@cloud.com>
Date: Sun, 5 Jun 2011 16:06:54 -0700
Subject: [PATCH 04/13] Fixes problems in routing between management servers

---
 core/test/com/cloud/agent/transport/RequestTest.java |  4 ++--
 server/src/com/cloud/agent/manager/AgentAttache.java |  8 +++-----
 .../com/cloud/agent/manager/AgentManagerImpl.java    |  3 +++
 .../agent/manager/ClusteredAgentManagerImpl.java     | 12 ++++++------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/core/test/com/cloud/agent/transport/RequestTest.java b/core/test/com/cloud/agent/transport/RequestTest.java
index 683b2b506be..173d749bcc7 100644
--- a/core/test/com/cloud/agent/transport/RequestTest.java
+++ b/core/test/com/cloud/agent/transport/RequestTest.java
@@ -53,7 +53,7 @@ public class RequestTest extends TestCase {
         cmd2.addPortConfig("abc", "24", true, "eth0");
         cmd2.addPortConfig("127.0.0.1", "44", false, "eth1");
         Request sreq = new Request(2, 3, new Command[] { cmd1, cmd2, cmd3 }, true, true);
-        sreq.setSequence(1);
+        sreq.setSequence(892403717);
 
         Logger logger = Logger.getLogger(GsonHelper.class);
         Level level = logger.getLevel();
@@ -82,7 +82,7 @@ public class RequestTest extends TestCase {
 
         byte[] bytes = sreq.getBytes();
         
-        assert Request.getSequence(bytes) == 1;
+        assert Request.getSequence(bytes) == 892403717;
         assert Request.getManagementServerId(bytes) == 3;
         assert Request.getAgentId(bytes) == 2;
         assert Request.getViaAgentId(bytes) == 2;
diff --git a/server/src/com/cloud/agent/manager/AgentAttache.java b/server/src/com/cloud/agent/manager/AgentAttache.java
index 470acb2c319..e8d1c77852e 100644
--- a/server/src/com/cloud/agent/manager/AgentAttache.java
+++ b/server/src/com/cloud/agent/manager/AgentAttache.java
@@ -329,9 +329,8 @@ public abstract class AgentAttache {
     public void send(Request req, final Listener listener) throws AgentUnavailableException {
         checkAvailability(req.getCommands());
 
-        long seq = getNextSequence();
-        req.setSequence(seq);
-
+        long seq = req.getSequence();
+        
         if (listener != null) {
             registerListener(seq, listener);
         } else if (s_logger.isDebugEnabled()) {
@@ -376,9 +375,8 @@ public abstract class AgentAttache {
 
     public Answer[] send(Request req, int wait) throws AgentUnavailableException, OperationTimedoutException {
         SynchronousListener sl = new SynchronousListener(null);
-        long seq = getNextSequence();
-        req.setSequence(seq);
 
+        long seq = req.getSequence();
         send(req, sl);
 
         try {
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index e7e68a86b5b..958c1fd4745 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -804,6 +804,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         }
 
         Request req = new Request(hostId, _nodeId, cmds, commands.stopOnError(), true);
+        req.setSequence(agent.getNextSequence());
         Answer[] answers = agent.send(req, timeout);
         notifyAnswersToMonitors(hostId, req.getSequence(), answers);
         commands.setAnswers(answers);
@@ -818,6 +819,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
 
         try {
             Request req = new Request(hostId, _nodeId, new CheckHealthCommand(), true);
+            req.setSequence(agent.getNextSequence());
             Answer[] answers = agent.send(req, 50 * 1000);
             if (answers != null && answers[0] != null) {
                 Status status = answers[0].getResult() ? Status.Up : Status.Down;
@@ -863,6 +865,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             return -1;
         }
         Request req = new Request(hostId, _nodeId, cmds, commands.stopOnError(), true);
+        req.setSequence(agent.getNextSequence());
         agent.send(req, listener);
         return req.getSequence();
     }
diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index faabc788040..67f744a2250 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -85,7 +85,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     public final static int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5; // 5 seconds
     public long _loadSize = 100;
     protected Set<Long> _agentToTransferIds = new HashSet<Long>();
-    private final long rebalanceTimeOut = 300000; // 5 mins - after this time remove the agent from the transfer list 
+    private final long rebalanceTimeOut = 300000; // 5 mins - after this time remove the agent from the transfer list
 
     @Inject
     protected ClusterManager _clusterMgr = null;
@@ -596,7 +596,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
 
                 final byte[] data = task.getData();
                 Version ver = Request.getVersion(data);
-                if (ver.ordinal() != Version.v1.ordinal()) {
+                if (ver.ordinal() != Version.v1.ordinal() && ver.ordinal() != Version.v3.ordinal()) {
                     s_logger.warn("Wrong version for clustered agent request");
                     super.doTask(task);
                     return;
@@ -718,7 +718,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
             return setToWaitForRebalance(agentId);
         } else if (event == Event.StartAgentRebalance) {
             return rebalanceHost(agentId);
-        } 
+        }
 
         return true;
     }
@@ -907,7 +907,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                 }
                 if (result) {
                     s_logger.debug("Got host id=" + hostId + " from management server " + map.getFutureOwner());
-                } 
+                }
                 
             } else {
                 s_logger.warn("Unable to find agent " + hostId + " on management server " + _nodeId);
@@ -935,10 +935,10 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
         if (map.getInitialOwner() != _nodeId) {
             s_logger.warn("Why finish rebalance called not by initial host owner???");
             return false;
-        }  
+        }
 
         boolean success = (event == Event.RebalanceCompleted) ? true : false;
-        if (s_logger.isDebugEnabled()) { 
+        if (s_logger.isDebugEnabled()) {
             s_logger.debug("Finishing rebalancing for the agent " + hostId + " with result " + success);
         }
         

From 14cdc7de14801c2b4446ca8da5e6e3d4dcd12c68 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Sun, 5 Jun 2011 17:29:46 -0700
Subject: [PATCH 05/13] bug 9127: covered failure scenarios for agent LB.
 status 9127: resolved fixed

The feature is completed; please file separate bugs if any issue arises during the testing.
Wiki link describing how agentLB works: http://intranet.lab.vmops.com/engineering/release-2.2-features/agent-load-balancing
---
 .../cloud/agent/api/TransferAgentCommand.java |   8 +-
 api/src/com/cloud/host/Status.java            |   2 +-
 .../cloud/agent/manager/AgentManagerImpl.java |  35 ++-
 .../manager/ClusteredAgentManagerImpl.java    | 265 +++++++++++-------
 .../src/com/cloud/cluster/ClusterManager.java |   2 +-
 .../com/cloud/cluster/ClusterManagerImpl.java |   8 +-
 .../ClusterServiceServletHttpHandler.java     |   2 +-
 .../ClusteredAgentRebalanceService.java       |   2 +-
 .../cluster/DummyClusterManagerImpl.java      |   2 +-
 .../cloud/cluster/ManagementServerHostVO.java |   7 +-
 .../agentlb/dao/HostTransferMapDao.java       |   6 +-
 .../agentlb/dao/HostTransferMapDaoImpl.java   |  29 +-
 .../security/SecurityGroupListener.java       |   2 +-
 setup/db/create-schema.sql                    |   2 +-
 setup/db/db/schema-225to226.sql               |   2 +-
 15 files changed, 243 insertions(+), 131 deletions(-)

diff --git a/api/src/com/cloud/agent/api/TransferAgentCommand.java b/api/src/com/cloud/agent/api/TransferAgentCommand.java
index b2fd36b72a0..aaaf5ed6398 100644
--- a/api/src/com/cloud/agent/api/TransferAgentCommand.java
+++ b/api/src/com/cloud/agent/api/TransferAgentCommand.java
@@ -22,13 +22,15 @@ import com.cloud.host.Status.Event;
 public class TransferAgentCommand extends Command {
     protected long agentId;
     protected long futureOwner;
+    protected long currentOwner;
     Event event;
     
     protected TransferAgentCommand() {
     }
     
-    public TransferAgentCommand(long agentId, long futureOwner, Event event) {
+    public TransferAgentCommand(long agentId, long currentOwner, long futureOwner, Event event) {
         this.agentId = agentId;
+        this.currentOwner = currentOwner;
         this.futureOwner = futureOwner;
         this.event = event;
     }
@@ -45,6 +47,10 @@ public class TransferAgentCommand extends Command {
         return event;
     }
 
+    public long getCurrentOwner() {
+        return currentOwner;
+    }
+
     @Override
     public boolean executeInSequence() {
         return false;
diff --git a/api/src/com/cloud/host/Status.java b/api/src/com/cloud/host/Status.java
index cbcdb40776d..257505204cd 100644
--- a/api/src/com/cloud/host/Status.java
+++ b/api/src/com/cloud/host/Status.java
@@ -183,7 +183,7 @@ public enum Status {
         s_fsm.addTransition(Status.Alert, Event.Ping, Status.Up);
         s_fsm.addTransition(Status.Alert, Event.Remove, Status.Removed);
         s_fsm.addTransition(Status.Alert, Event.ManagementServerDown, Status.Alert);
-        s_fsm.addTransition(Status.Rebalancing, Event.RebalanceFailed, Status.Alert);
+        s_fsm.addTransition(Status.Rebalancing, Event.RebalanceFailed, Status.Disconnected);
         s_fsm.addTransition(Status.Rebalancing, Event.RebalanceCompleted, Status.Connecting);
     }
 
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 958c1fd4745..7603442c09d 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1136,12 +1136,12 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
     public void startDirectlyConnectedHosts() {
         List<HostVO> hosts = _hostDao.findDirectlyConnectedHosts();
         for (HostVO host : hosts) {
-            loadDirectlyConnectedHost(host);
+            loadDirectlyConnectedHost(host, false);
         }
     }
 
     @SuppressWarnings("rawtypes")
-    protected void loadDirectlyConnectedHost(HostVO host) {
+    protected boolean loadDirectlyConnectedHost(HostVO host, boolean executeNow) {
         String resourceName = host.getResource();
         ServerResource resource = null;
         try {
@@ -1150,25 +1150,25 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             resource = (ServerResource) constructor.newInstance();
         } catch (ClassNotFoundException e) {
             s_logger.warn("Unable to find class " + host.getResource(), e);
-            return;
+            return false;
         } catch (InstantiationException e) {
             s_logger.warn("Unablet to instantiate class " + host.getResource(), e);
-            return;
+            return false;
         } catch (IllegalAccessException e) {
             s_logger.warn("Illegal access " + host.getResource(), e);
-            return;
+            return false;
         } catch (SecurityException e) {
             s_logger.warn("Security error on " + host.getResource(), e);
-            return;
+            return false;
         } catch (NoSuchMethodException e) {
             s_logger.warn("NoSuchMethodException error on " + host.getResource(), e);
-            return;
+            return false;
         } catch (IllegalArgumentException e) {
             s_logger.warn("IllegalArgumentException error on " + host.getResource(), e);
-            return;
+            return false;
         } catch (InvocationTargetException e) {
             s_logger.warn("InvocationTargetException error on " + host.getResource(), e);
-            return;
+            return false;
         }
 
         _hostDao.loadDetails(host);
@@ -1204,14 +1204,25 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         } catch (ConfigurationException e) {
             e.printStackTrace();
             s_logger.warn("Unable to configure resource due to ", e);
-            return;
+            return false; 
         }
 
         if (!resource.start()) {
             s_logger.warn("Unable to start the resource");
-            return;
+            return false;
+        }
+        
+        if (executeNow) {
+            AgentAttache attache = simulateStart(host.getId(), resource, host.getDetails(), false, null, null);
+            if (attache == null) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            _executor.execute(new SimulateStartTask(host.getId(), resource, host.getDetails(), null));
+            return true;
         }
-        _executor.execute(new SimulateStartTask(host.getId(), resource, host.getDetails(), null));
     }
 
     @Override
diff --git a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 67f744a2250..fbb90bd959c 100644
--- a/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -85,7 +86,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     public final static int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 5; // 5 seconds
     public long _loadSize = 100;
     protected Set<Long> _agentToTransferIds = new HashSet<Long>();
-    private final long rebalanceTimeOut = 300000; // 5 mins - after this time remove the agent from the transfer list
+
+    private final long rebalanceTimeOut = 300000; // 5 mins - after this time remove the agent from the transfer list 
 
     @Inject
     protected ClusterManager _clusterMgr = null;
@@ -194,7 +196,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                     if (s_logger.isDebugEnabled()) {
                         s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ")");
                     }
-                    loadDirectlyConnectedHost(host);
+                    loadDirectlyConnectedHost(host, false);
                 } catch (Throwable e) {
                     s_logger.debug(" can not load directly connected host " + host.getId() + "(" + host.getName() + ") due to " + e.toString());
                 }
@@ -569,7 +571,11 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
             }
         }
         _timer.cancel();
+        
+        //cancel all transfer tasks
         s_transferExecutor.shutdownNow();
+        cleanupTransferMap();
+        
         return super.stop();
     }
 
@@ -713,12 +719,12 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     }
 
     @Override
-    public boolean executeRebalanceRequest(long agentId, Event event) throws AgentUnavailableException, OperationTimedoutException {
+    public boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException, OperationTimedoutException {
         if (event == Event.RequestAgentRebalance) {
-            return setToWaitForRebalance(agentId);
-        } else if (event == Event.StartAgentRebalance) {
-            return rebalanceHost(agentId);
-        }
+            return setToWaitForRebalance(agentId, currentOwnerId, futureOwnerId);
+        } else if (event == Event.StartAgentRebalance) {
+            return rebalanceHost(agentId, currentOwnerId, futureOwnerId);
+        } 
 
         return true;
     }
@@ -765,9 +771,15 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                         long hostId = host.getId();
                         s_logger.debug("Asking management server " + node.getMsid() + " to give away host id=" + hostId);
                         boolean result = true;
+                        
+                        if (_hostTransferDao.findById(hostId) != null) {
+                            s_logger.warn("Somebody else is already rebalancing host id: " + hostId);
+                            continue;
+                        }
+                        
                         HostTransferMapVO transfer = _hostTransferDao.startAgentTransfering(hostId, node.getMsid(), _nodeId);
                         try {
-                            Answer[] answer = sendRebalanceCommand(hostId, node.getMsid(), Event.RequestAgentRebalance);
+                            Answer[] answer = sendRebalanceCommand(node.getMsid(), hostId, node.getMsid(), _nodeId, Event.RequestAgentRebalance);
                             if (answer == null) {
                                 s_logger.warn("Failed to get host id=" + hostId + " from management server " + node.getMsid());
                                 result = false;
@@ -776,8 +788,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                             s_logger.warn("Failed to get host id=" + hostId + " from management server " + node.getMsid(), ex);
                             result = false;
                         } finally {
-                            HostTransferMapVO updatedTransfer = _hostTransferDao.findById(transfer.getId());
-                            if (!result && updatedTransfer.getState() == HostTransferState.TransferRequested) {
+                            HostTransferMapVO transferState = _hostTransferDao.findByIdAndFutureOwnerId(transfer.getId(), _nodeId);
+                            if (!result && transferState != null && transferState.getState() == HostTransferState.TransferRequested) {
                                 if (s_logger.isDebugEnabled()) {
                                     s_logger.debug("Removing mapping from op_host_transfer as it failed to be set to transfer mode");
                                 }
@@ -793,23 +805,22 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
         }
     }
 
-    private Answer[] sendRebalanceCommand(long agentId, long peer, Event event) {
-        TransferAgentCommand transfer = new TransferAgentCommand(agentId, peer, event);
+    private Answer[] sendRebalanceCommand(long peer, long agentId, long currentOwnerId, long futureOwnerId, Event event) {
+        TransferAgentCommand transfer = new TransferAgentCommand(agentId, currentOwnerId, futureOwnerId, event);
         Commands commands = new Commands(OnError.Stop);
         commands.addCommand(transfer);
 
         Command[] cmds = commands.toCommands();
 
-        String peerName = Long.toString(peer);
-
         try {
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("Forwarding " + cmds[0].toString() + " to " + peer);
             }
+            String peerName = Long.toString(peer);
             Answer[] answers = _clusterMgr.execute(peerName, agentId, cmds, true);
             return answers;
         } catch (Exception e) {
-            s_logger.warn("Caught exception while talking to " + peer, e);
+            s_logger.warn("Caught exception while talking to " + currentOwnerId, e);
             return null;
         }
     }
@@ -819,45 +830,52 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
             @Override
             public void run() {
                 try {
-                    // TODO - change to trace level later on
-                    if (s_logger.isDebugEnabled()) {
-                        s_logger.debug("Clustered agent transfer scan check, management server id:" + _nodeId);
+                    if (s_logger.isTraceEnabled()) {
+                        s_logger.trace("Clustered agent transfer scan check, management server id:" + _nodeId);
                     }
 
                     if (_agentToTransferIds.size() > 0) {
                         s_logger.debug("Found " + _agentToTransferIds.size() + " agents to transfer");
                         for (Long hostId : _agentToTransferIds) {
                             AgentAttache attache = findAttache(hostId);
-                            if (attache.getQueueSize() == 0 && attache.getNonRecurringListenersSize() == 0) {
-                                boolean result = false;
-                                _agentToTransferIds.remove(hostId);
-                                try {
-                                    _hostTransferDao.startAgentTransfer(hostId);
-                                    result = rebalanceHost(hostId);
-                                } finally {
-                                    if (result) {
-                                        finishRebalance(hostId, Event.RebalanceCompleted);
-                                    } else {
-                                        finishRebalance(hostId, Event.RebalanceFailed);
-                                    }
-                                }
-                            } else {
-                                // if we timed out waiting for the host to reconnect, remove host from rebalance list and delete from op_host_transfer DB
-                                // no need to do anything with the real attache
-                                Date cutTime = DateUtil.currentGMTTime();
-                                if (_hostTransferDao.isNotActive(hostId, new Date(cutTime.getTime() - rebalanceTimeOut))) {
-                                    s_logger.debug("Timed out waiting for the host id=" + hostId + " to be ready to transfer, failing rebalance for this host");
-                                    _agentToTransferIds.remove(hostId);
-                                    _hostTransferDao.completeAgentTransfer(hostId);
-                                } else {
-                                    s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + " and listener queue size is " + attache.getNonRecurringListenersSize());
-                                }
+                            
+                            // if the thread:
+                            // 1) timed out waiting for the host to reconnect
+                            // 2) recipient management server is not active any more
+                            // remove the host from re-balance list and delete from op_host_transfer DB
+                            // no need to do anything with the real attache as we haven't modified it yet
+                            Date cutTime = DateUtil.currentGMTTime();
+                            if (_hostTransferDao.isNotActive(hostId, new Date(cutTime.getTime() - rebalanceTimeOut))) {
+                                s_logger.debug("Timed out waiting for the host id=" + hostId + " to be ready to transfer, skipping rebalance for the host");
+                                failStartRebalance(hostId);
+                                return;
+                            }  
+                            
+                            HostTransferMapVO transferMap = _hostTransferDao.findByIdAndCurrentOwnerId(hostId, _nodeId);
+                            
+                            if (transferMap == null) {
+                                s_logger.debug("Can't transfer host id=" + hostId + "; record for the host no longer exists in op_host_transfer table");
+                                failStartRebalance(hostId);
+                                return;
                             }
+                            
+                            ManagementServerHostVO ms = _mshostDao.findByMsid(transferMap.getFutureOwner());
+                            if (ms != null && ms.getState() != ManagementServerHost.State.Up) {
+                                s_logger.debug("Can't transfer host " + hostId + " as it's future owner is not in UP state: " + ms + ", skipping rebalance for the host");
+                                failStartRebalance(hostId);
+                                return;
+                            } 
+                            
+                            if (attache.getQueueSize() == 0 && attache.getNonRecurringListenersSize() == 0) {
+                                rebalanceHost(hostId, transferMap.getInitialOwner(), transferMap.getFutureOwner());
+                            } else {
+                                s_logger.debug("Agent " + hostId + " can't be transfered yet as its request queue size is " + attache.getQueueSize() + " and listener queue size is " + attache.getNonRecurringListenersSize()); 
+                            }
+                            
                         }
                     } else {
-                        // TODO - change to trace level later on
-                        if (s_logger.isDebugEnabled()) {
-                            s_logger.debug("Found no agents to be transfered by the management server " + _nodeId);
+                        if (s_logger.isTraceEnabled()) {
+                            s_logger.trace("Found no agents to be transfered by the management server " + _nodeId);
                         }
                     }
 
@@ -869,7 +887,7 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     }
     
     
-    private boolean setToWaitForRebalance(final long hostId) {
+    private boolean setToWaitForRebalance(final long hostId, long currentOwnerId, long futureOwnerId) {
         s_logger.debug("Adding agent " + hostId + " to the list of agents to transfer");
         synchronized (_agentToTransferIds) {
             return  _agentToTransferIds.add(hostId);
@@ -877,65 +895,52 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
     }
     
     
-    private boolean rebalanceHost(final long hostId) {
-        HostTransferMapVO map = _hostTransferDao.findById(hostId);
-        HostVO host = _hostDao.findById(hostId);
-        
+    protected boolean rebalanceHost(final long hostId, long currentOwnerId, long futureOwnerId) throws AgentUnavailableException{
+
         boolean result = true;
-        if (map.getInitialOwner() == _nodeId) {
-            ClusteredDirectAgentAttache attache = (ClusteredDirectAgentAttache)findAttache(hostId);
-            
-            if (attache != null && !attache.getTransferMode()) {
-                attache.setTransferMode(true);
-                s_logger.debug("Putting agent id=" + hostId + " to transfer mode");
-                _agents.put(hostId, attache);
-                if (host != null && host.getRemoved() == null) {
-                    host.setManagementServerId(null);
-                    s_logger.debug("Updating host id=" + hostId + " with the status " + Status.Rebalancing);
-                    _hostDao.updateStatus(host, Event.StartAgentRebalance, _nodeId);
-                }
-                
-                try {
-                    Answer[] answer = sendRebalanceCommand(hostId, map.getFutureOwner(), Event.StartAgentRebalance);
-                    if (answer == null) {
-                        s_logger.warn("Host " + hostId + " failed to connect to the  management server " + map.getFutureOwner() + " as a part of rebalance process");
-                        result = false;
-                    }
-                } catch (Exception ex) {
-                    s_logger.warn("Host " + hostId + " failed to connect to the  management server " + map.getFutureOwner() + " as a part of rebalance process", ex);
+        if (currentOwnerId == _nodeId) {
+            if (!startRebalance(hostId)) {
+                s_logger.debug("Failed to start agent rebalancing");
+                failStartRebalance(hostId);
+                return false;
+            }
+            try {
+                Answer[] answer = sendRebalanceCommand(futureOwnerId, hostId, currentOwnerId, futureOwnerId, Event.StartAgentRebalance);
+                if (answer == null || !answer[0].getResult()) {
+                    s_logger.warn("Host " + hostId + " failed to connect to the  management server " + futureOwnerId + " as a part of rebalance process");
                     result = false;
                 }
-                if (result) {
-                    s_logger.debug("Got host id=" + hostId + " from management server " + map.getFutureOwner());
-                }
-                
-            } else {
-                s_logger.warn("Unable to find agent " + hostId + " on management server " + _nodeId);
+
+            } catch (Exception ex) {
+                s_logger.warn("Host " + hostId + " failed to connect to the  management server " + futureOwnerId + " as a part of rebalance process", ex);
                 result = false;
             }
-        } else if (map.getFutureOwner() == _nodeId) {
+            
+            if (result) {
+                s_logger.debug("Got host id=" + hostId + " from management server " + futureOwnerId);
+                finishRebalance(hostId, futureOwnerId, Event.RebalanceCompleted);
+            } else {
+                finishRebalance(hostId, futureOwnerId, Event.RebalanceFailed);
+            }
+                
+        } else if (futureOwnerId == _nodeId) {
+            HostVO host = _hostDao.findById(hostId);
             try {
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("Loading directly connected host " + host.getId() + "(" + host.getName() + ") as a part of rebalance process");
                 }
-                //TODO - 1) no need to do vmfullSync/storageSetup on the agent side 2) Make sure that if connection fails, host goes from Rebalance state to Alert
-                loadDirectlyConnectedHost(host);
+                result = loadDirectlyConnectedHost(host, true);
             } catch (Exception ex) {
                 s_logger.warn("Unable to load directly connected host " + host.getId() + " as a part of rebalance due to exception: ", ex);
                 result = false;
             }
         }
-        
+
         return result;
     }
     
-    private boolean finishRebalance(final long hostId, Event event) {
-        HostTransferMapVO map = _hostTransferDao.findById(hostId);
-        
-        if (map.getInitialOwner() != _nodeId) {
-            s_logger.warn("Why finish rebalance called not by initial host owner???");
-            return false;
-        }
+
+    protected void finishRebalance(final long hostId, long futureOwnerId, Event event) throws AgentUnavailableException{
 
         boolean success = (event == Event.RebalanceCompleted) ? true : false;
         if (s_logger.isDebugEnabled()) {
@@ -945,7 +950,8 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
         AgentAttache attache = findAttache(hostId);
         if (attache == null) {
             s_logger.debug("Unable to find attache for the host id=" + hostId + ", assuming that the agent disconnected already");
-            return true;
+            _hostTransferDao.completeAgentTransfer(hostId);
+            return;
         } else if (success) {
             s_logger.debug("Management server " + _nodeId + " is completing agent " + hostId + " rebalance");
             //1) Get all the requests before removing transfer attache
@@ -957,22 +963,87 @@ public class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
                 getAttache(hostId);
                 //3) forward all the requests to the management server which owns the host now
                 if (!requests.isEmpty()) {
-                    s_logger.debug("Forwarding requests held in transfer attache " + hostId + " from the management server " + _nodeId + " to " + map.getFutureOwner());
-                    for (Request request : requests) {
-                        routeToPeer(Long.toString(map.getFutureOwner()), request.getBytes());
+                    s_logger.debug("Forwarding requests held in transfer attache " + hostId + " from the management server " + _nodeId + " to " + futureOwnerId);
+                    
+                    for (Iterator<Request> iter = requests.iterator(); iter.hasNext();) {
+                        Request req = iter.next();
+                        boolean routeResult = routeToPeer(Long.toString(futureOwnerId), req.getBytes());
+                        if (!routeResult) {
+                            logD(req.getBytes(), "Failed to route request to peer");
+                        }
                     }
                 }
+                
             } catch (AgentUnavailableException ex) {
-                s_logger.warn("Not creating forward attache as agent is not available", ex);
-                //TODO - - have to handle the case when requests can't be forwarded due to lack of forward attache
+                s_logger.warn("Failed to finish host " + hostId + " rebalance: couldn't create forward attache as agent is not available", ex);
+                failRebalance(hostId);
             }
-            
         } else {
-            ((ClusteredDirectAgentAttache) attache).setTransferMode(false);
-            //TODO - have to handle the case when agent fails to rebalance 1) Either connect it back 2) Or disconnect it
+            failRebalance(hostId);
         }
         
         _hostTransferDao.completeAgentTransfer(hostId);
+    }
+    
+    protected void failRebalance(final long hostId) throws AgentUnavailableException{
+        reconnect(hostId);
+        _hostTransferDao.completeAgentTransfer(hostId);
+    }
+    
+    @DB
+    protected boolean startRebalance(final long hostId) {
+        HostVO host = _hostDao.findById(hostId);
+        
+        if (host == null || host.getRemoved() != null) {
+            s_logger.warn("Unable to find host record, fail start rebalancing process");
+            return false;
+        } 
+        
+        synchronized (_agents) {
+            ClusteredDirectAgentAttache attache = (ClusteredDirectAgentAttache)_agents.get(hostId);
+            if (attache != null && attache.getQueueSize() == 0 && attache.getNonRecurringListenersSize() == 0) {
+                _agentToTransferIds.remove(hostId);
+                s_logger.debug("Putting agent id=" + hostId + " to transfer mode");
+                attache.setTransferMode(true);
+                _agents.put(hostId, attache);
+            } else {
+                if (attache == null) {
+                    s_logger.warn("Attache for the agent " + hostId + " no longer exists on management server " + _nodeId + ", can't start host rebalancing");
+                } else {
+                    s_logger.warn("Attache for the agent " + hostId + " has request queue size= " + attache.getQueueSize() + " and listener queue size " + attache.getNonRecurringListenersSize() + ", can't start host rebalancing");
+                }
+                return false;
+            }
+        }
+        
+        Transaction txn = Transaction.currentTxn();
+        txn.start();
+        
+        s_logger.debug("Updating host id=" + hostId + " with the status " + Status.Rebalancing);
+        host.setManagementServerId(null);
+        _hostDao.updateStatus(host, Event.StartAgentRebalance, _nodeId);
+        _hostTransferDao.startAgentTransfer(hostId);
+        txn.commit();
+        
         return true;
     }
+    
+    protected void failStartRebalance(final long hostId) {
+        _agentToTransferIds.remove(hostId);
+        _hostTransferDao.completeAgentTransfer(hostId);
+    }
+    
+    protected void cleanupTransferMap() {
+        List<HostTransferMapVO> hostsJoingingCluster = _hostTransferDao.listHostsJoiningCluster(_nodeId);
+        
+        for (HostTransferMapVO hostJoingingCluster : hostsJoingingCluster) {
+            _hostTransferDao.remove(hostJoingingCluster.getId());
+        }
+        
+        List<HostTransferMapVO> hostsLeavingCluster = _hostTransferDao.listHostsLeavingCluster(_nodeId);
+        for (HostTransferMapVO hostLeavingCluster : hostsLeavingCluster) {
+            _hostTransferDao.remove(hostLeavingCluster.getId());
+        }
+    }
+    
 }
diff --git a/server/src/com/cloud/cluster/ClusterManager.java b/server/src/com/cloud/cluster/ClusterManager.java
index c400558a4c1..1e4f835a306 100644
--- a/server/src/com/cloud/cluster/ClusterManager.java
+++ b/server/src/com/cloud/cluster/ClusterManager.java
@@ -63,7 +63,7 @@ public interface ClusterManager extends Manager {
      */
     public void broadcast(long agentId, Command[] cmds);
     
-    boolean rebalanceAgent(long agentId, Event event) throws AgentUnavailableException, OperationTimedoutException;
+    boolean rebalanceAgent(long agentId, Event event, long currentOwnerId, long futureOwnerId) throws AgentUnavailableException, OperationTimedoutException;
     
     boolean isAgentRebalanceEnabled();
 }
diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index 0ee0f796230..269df602e6c 100644
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -928,9 +928,7 @@ public class ClusterManagerImpl implements ClusterManager {
                      }
                  }
              } catch (final InterruptedException e) {
-             } finally {
-                 s_logger.debug("Agent rebalancing is completed, management server " + _mshostId + " is ready");
-             }
+             } 
 
         } catch (Throwable e) {
             s_logger.error("Unexpected exception : ", e);
@@ -1169,8 +1167,8 @@ public class ClusterManagerImpl implements ClusterManager {
     }
 
     @Override
-    public boolean rebalanceAgent(long agentId, Event event) throws AgentUnavailableException, OperationTimedoutException {
-        return _rebalanceService.executeRebalanceRequest(agentId, event);
+    public boolean rebalanceAgent(long agentId, Event event, long currentOwnerId, long futureOwnerId) throws AgentUnavailableException, OperationTimedoutException {
+        return _rebalanceService.executeRebalanceRequest(agentId, currentOwnerId, futureOwnerId, event);
     }
     
     @Override
diff --git a/server/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java b/server/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java
index 1347825c1f8..c16ab94016d 100644
--- a/server/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java
+++ b/server/src/com/cloud/cluster/ClusterServiceServletHttpHandler.java
@@ -213,7 +213,7 @@ public class ClusterServiceServletHttpHandler implements HttpRequestHandler {
             }
             boolean result = false;
             try {
-                result = manager.rebalanceAgent(cmd.getAgentId(), cmd.getEvent());
+                result = manager.rebalanceAgent(cmd.getAgentId(), cmd.getEvent(), cmd.getCurrentOwner(), cmd.getFutureOwner());
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("Result is " + result);
                 }
diff --git a/server/src/com/cloud/cluster/ClusteredAgentRebalanceService.java b/server/src/com/cloud/cluster/ClusteredAgentRebalanceService.java
index a655101f9ae..73177c6e47f 100644
--- a/server/src/com/cloud/cluster/ClusteredAgentRebalanceService.java
+++ b/server/src/com/cloud/cluster/ClusteredAgentRebalanceService.java
@@ -9,6 +9,6 @@ public interface ClusteredAgentRebalanceService {
 
     void startRebalanceAgents();
 
-    boolean executeRebalanceRequest(long agentId, Event event) throws AgentUnavailableException, OperationTimedoutException;
+    boolean executeRebalanceRequest(long agentId, long currentOwnerId, long futureOwnerId, Event event) throws AgentUnavailableException, OperationTimedoutException;
 
 }
diff --git a/server/src/com/cloud/cluster/DummyClusterManagerImpl.java b/server/src/com/cloud/cluster/DummyClusterManagerImpl.java
index 0844757e69d..c4218b2b8bb 100644
--- a/server/src/com/cloud/cluster/DummyClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/DummyClusterManagerImpl.java
@@ -167,7 +167,7 @@ public class DummyClusterManagerImpl implements ClusterManager {
 	}
 	
 	@Override
-	public boolean rebalanceAgent(long agentId, Event event) throws AgentUnavailableException, OperationTimedoutException {
+	public boolean rebalanceAgent(long agentId, Event event, long currentOwnerId, long futureOwnerId) throws AgentUnavailableException, OperationTimedoutException {
 	    return false;
 	}
 	
diff --git a/server/src/com/cloud/cluster/ManagementServerHostVO.java b/server/src/com/cloud/cluster/ManagementServerHostVO.java
index 42e3296ed59..612183c2b6c 100644
--- a/server/src/com/cloud/cluster/ManagementServerHostVO.java
+++ b/server/src/com/cloud/cluster/ManagementServerHostVO.java
@@ -174,5 +174,10 @@ public class ManagementServerHostVO implements ManagementServerHost{
 	
 	public void setAlertCount(int count) {
 		alertCount = count;
-	}
+	}
+	
+	@Override
+    public String toString() {
+        return new StringBuilder("ManagementServer[").append("-").append(id).append("-").append(msid).append("-").append(state).append("]").toString();
+    }
 }
diff --git a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java
index 55e7802431f..517cad044ce 100644
--- a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java
+++ b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDao.java
@@ -27,7 +27,7 @@ import com.cloud.utils.db.GenericDao;
 
 public interface HostTransferMapDao extends GenericDao<HostTransferMapVO, Long> {
 
-    List<HostTransferMapVO> listHostsLeavingCluster(long clusterId);
+    List<HostTransferMapVO> listHostsLeavingCluster(long currentOwnerId);
 
     List<HostTransferMapVO> listHostsJoiningCluster(long futureOwnerId);
 
@@ -40,4 +40,8 @@ public interface HostTransferMapDao extends GenericDao<HostTransferMapVO, Long>
     boolean isNotActive(long hostId, Date cutTime);
     
     boolean startAgentTransfer(long hostId);
+    
+    HostTransferMapVO findByIdAndFutureOwnerId(long id, long futureOwnerId);
+    
+    HostTransferMapVO findByIdAndCurrentOwnerId(long id, long currentOwnerId);
 }
diff --git a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
index e600011e865..0fff8268870 100644
--- a/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
+++ b/server/src/com/cloud/cluster/agentlb/dao/HostTransferMapDaoImpl.java
@@ -63,10 +63,9 @@ public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Lo
     }
 
     @Override
-    public List<HostTransferMapVO> listHostsLeavingCluster(long clusterId) {
+    public List<HostTransferMapVO> listHostsLeavingCluster(long currentOwnerId) {
         SearchCriteria<HostTransferMapVO> sc = IntermediateStateSearch.create();
-        sc.setParameters("initialOwner", clusterId);
-        sc.setParameters("state", HostTransferState.TransferRequested, HostTransferState.TransferStarted);
+        sc.setParameters("initialOwner", currentOwnerId);
 
         return listBy(sc);
     }
@@ -75,12 +74,10 @@ public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Lo
     public List<HostTransferMapVO> listHostsJoiningCluster(long futureOwnerId) {
         SearchCriteria<HostTransferMapVO> sc = IntermediateStateSearch.create();
         sc.setParameters("futureOwner", futureOwnerId);
-        sc.setParameters("state", HostTransferState.TransferRequested);
+
         return listBy(sc);
     }
     
-    
-
     @Override
     public HostTransferMapVO startAgentTransfering(long hostId, long initialOwner, long futureOwner) {
         HostTransferMapVO transfer = new HostTransferMapVO(hostId, initialOwner, futureOwner);
@@ -122,4 +119,24 @@ public class HostTransferMapDaoImpl extends GenericDaoBase<HostTransferMapVO, Lo
         return update(hostId, transfer);
     }
     
+    
+    @Override
+    public HostTransferMapVO findByIdAndFutureOwnerId(long id, long futureOwnerId) {
+        SearchCriteria<HostTransferMapVO> sc = AllFieldsSearch.create();
+        sc.setParameters("futureOwner", futureOwnerId);
+        sc.setParameters("id", id);
+
+        return findOneBy(sc);
+    }
+    
+    
+    @Override
+    public HostTransferMapVO findByIdAndCurrentOwnerId(long id, long currentOwnerId) {
+        SearchCriteria<HostTransferMapVO> sc = AllFieldsSearch.create();
+        sc.setParameters("initialOwner", currentOwnerId);
+        sc.setParameters("id", id);
+
+        return findOneBy(sc);
+    }
+    
 }
diff --git a/server/src/com/cloud/network/security/SecurityGroupListener.java b/server/src/com/cloud/network/security/SecurityGroupListener.java
index 9b0c94ab259..d22380699eb 100644
--- a/server/src/com/cloud/network/security/SecurityGroupListener.java
+++ b/server/src/com/cloud/network/security/SecurityGroupListener.java
@@ -69,7 +69,7 @@ public class SecurityGroupListener implements Listener {
 
 	@Override
 	public boolean isRecurring() {
-		return false;
+		return true;
 	}
 
 
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 5f06f195342..6babffaaac6 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1530,7 +1530,7 @@ CREATE TABLE `cloud`.`op_host_transfer` (
   `state` varchar(32) NOT NULL COMMENT 'the transfer state of the host',
   `created` datetime NOT NULL COMMENT 'date created',
   PRIMARY KEY (`id`),
-  CONSTRAINT `fk_op_host_transfer__id` FOREIGN KEY `fk_op_host_transfer__id` (`id`) REFERENCES `host` (`id`),
+  CONSTRAINT `fk_op_host_transfer__id` FOREIGN KEY `fk_op_host_transfer__id` (`id`) REFERENCES `host` (`id`) ON DELETE CASCADE,
   CONSTRAINT `fk_op_host_transfer__initial_mgmt_server_id` FOREIGN KEY `fk_op_host_transfer__initial_mgmt_server_id`(`initial_mgmt_server_id`) REFERENCES `mshost`(`msid`),
   CONSTRAINT `fk_op_host_transfer__future_mgmt_server_id` FOREIGN KEY `fk_op_host_transfer__future_mgmt_server_id`(`future_mgmt_server_id`) REFERENCES `mshost`(`msid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/setup/db/db/schema-225to226.sql b/setup/db/db/schema-225to226.sql
index dd7b7bbd484..4992f6b731a 100644
--- a/setup/db/db/schema-225to226.sql
+++ b/setup/db/db/schema-225to226.sql
@@ -90,7 +90,7 @@ CREATE TABLE `cloud`.`op_host_transfer` (
   `state` varchar(32) NOT NULL COMMENT 'the transfer state of the host',
   `created` datetime NOT NULL COMMENT 'date created',
   PRIMARY KEY (`id`),
-  CONSTRAINT `fk_op_host_transfer__id` FOREIGN KEY `fk_op_host_transfer__id` (`id`) REFERENCES `host` (`id`),
+  CONSTRAINT `fk_op_host_transfer__id` FOREIGN KEY `fk_op_host_transfer__id` (`id`) REFERENCES `host` (`id`) ON DELETE CASCADE,
   CONSTRAINT `fk_op_host_transfer__initial_mgmt_server_id` FOREIGN KEY `fk_op_host_transfer__initial_mgmt_server_id`(`initial_mgmt_server_id`) REFERENCES `mshost`(`msid`),
   CONSTRAINT `fk_op_host_transfer__future_mgmt_server_id` FOREIGN KEY `fk_op_host_transfer__future_mgmt_server_id`(`future_mgmt_server_id`) REFERENCES `mshost`(`msid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

From b82fac179a5d3cde5bb4642d3bff37bbcdc9126b Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Mon, 6 Jun 2011 13:32:46 +0530
Subject: [PATCH 06/13] bug 9785: Added Vlan Assign Release events status 9785:
 resolved fixed

---
 api/src/com/cloud/event/EventTypes.java                 | 3 +++
 server/src/com/cloud/network/guru/GuestNetworkGuru.java | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index 4c1d5c76622..096c56c6601 100755
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -196,4 +196,7 @@ public class EventTypes {
 	public static final String EVENT_ENABLE_STATIC_NAT = "STATICNAT.ENABLE";
 	public static final String EVENT_DISABLE_STATIC_NAT = "STATICNAT.DISABLE";
 	
+	public static final String EVENT_ZONE_VLAN_ASSIGN = "ZONE.VLAN.ASSIGN";
+	public static final String EVENT_ZONE_VLAN_RELEASE = "ZONE.VLAN.RELEASE";
+	
 }
diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
index de9dd38cebd..bd290290863 100644
--- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java
@@ -32,6 +32,9 @@ import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.VlanDao;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
+import com.cloud.event.EventTypes;
+import com.cloud.event.EventUtils;
+import com.cloud.event.EventVO;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapcityException;
 import com.cloud.exception.InvalidParameterValueException;
@@ -48,6 +51,7 @@ import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
+import com.cloud.user.UserContext;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.component.Inject;
 import com.cloud.utils.db.DB;
@@ -155,6 +159,7 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
                 throw new InsufficientVirtualNetworkCapcityException("Unable to allocate vnet as a part of network " + network + " implement ", DataCenter.class, dcId);
             }
             implemented.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vnet));
+            EventUtils.saveEvent(UserContext.current().getCallerUserId(), network.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_ASSIGN, "Assignbed Zone Vlan: "+vnet+ " Network Id: "+network.getId(), 0);
         } else {
             implemented.setBroadcastUri(network.getBroadcastUri());
         }
@@ -166,7 +171,6 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
         if (network.getCidr() != null) {
             implemented.setCidr(network.getCidr());
         }
-
         return implemented;
     }
 
@@ -261,6 +265,8 @@ public class GuestNetworkGuru extends AdapterBase implements NetworkGuru {
         s_logger.debug("Releasing vnet for the network id=" + profile.getId());
         if (profile.getBroadcastUri() != null) {
             _dcDao.releaseVnet(profile.getBroadcastUri().getHost(), profile.getDataCenterId(), profile.getAccountId(), profile.getReservationId());
+            EventUtils.saveEvent(UserContext.current().getCallerUserId(), profile.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VLAN_RELEASE, "Released Zone Vlan: "
+                    +profile.getBroadcastUri().getHost()+" for Network: "+profile.getId(), 0);
             profile.setBroadcastUri(null);
         }
     }

From c46ddeab2d7ae4349a1c4db3740cf2bde1d0b072 Mon Sep 17 00:00:00 2001
From: nit <nitin@cloud.com>
Date: Mon, 6 Jun 2011 16:11:32 +0530
Subject: [PATCH 07/13] bug 9886 : ExtractVolume - Put in the ACL layer check
 and allow datadisk to be extractable if they pass the acl layer check. status
 9886: resolved fixed

---
 .../cloud/server/ManagementServerImpl.java    | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index ba2a83516a9..3a0434e57ff 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -4261,10 +4261,12 @@ public class ManagementServerImpl implements ManagementServer {
         }
 
         VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
-        boolean isExtractable = template != null && template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM;
-        if (!isExtractable && account != null && account.getType() != Account.ACCOUNT_TYPE_ADMIN) { // Global admins are allowed
-            // to extract
-            throw new PermissionDeniedException("The volume:" + volumeId + " is not allowed to be extracted");
+        if (volume.getVolumeType() != Volume.Type.DATADISK){ //Datadisk dont have any template dependence.
+            boolean isExtractable = template != null && template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM;
+            if (!isExtractable && account != null && account.getType() != Account.ACCOUNT_TYPE_ADMIN) { // Global admins are allowed
+                // to extract
+                throw new PermissionDeniedException("The volume:" + volumeId + " is not allowed to be extracted");
+            }
         }
 
         Upload.Mode extractMode;
@@ -4274,19 +4276,7 @@ public class ManagementServerImpl implements ManagementServer {
             extractMode = mode.equals(Upload.Mode.FTP_UPLOAD.toString()) ? Upload.Mode.FTP_UPLOAD : Upload.Mode.HTTP_DOWNLOAD;
         }
 
-        if (account != null) {
-            if (!isAdmin(account.getType())) {
-                if (volume.getAccountId() != account.getId()) {
-                    throw new PermissionDeniedException("Unable to find volume with ID: " + volumeId + " for account: " + account.getAccountName());
-                }
-            } else {
-                Account userAccount = _accountDao.findById(volume.getAccountId());
-                if ((userAccount == null) || !_domainDao.isChildDomain(account.getDomainId(), userAccount.getDomainId())) {
-                    throw new PermissionDeniedException("Unable to extract volume:" + volumeId + " - permission denied.");
-                }
-            }
-        }
-
+        _accountMgr.checkAccess(account, volume);
         // If mode is upload perform extra checks on url and also see if there is an ongoing upload on the same.
         if (extractMode == Upload.Mode.FTP_UPLOAD) {
             URI uri = new URI(url);

From 5913c5a4415c5c593151f9d88023c4df9c2416de Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Mon, 6 Jun 2011 11:47:59 -0700
Subject: [PATCH 08/13] Added an acknowledge process for the registration
 complete process of cloudzones.  Only after a expires=true will the token be
 truly expired.

---
 .../servlet/RegisterCompleteServlet.java      | 50 +++++++++++--------
 .../com/cloud/user/AccountManagerImpl.java    |  1 -
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/server/src/com/cloud/servlet/RegisterCompleteServlet.java b/server/src/com/cloud/servlet/RegisterCompleteServlet.java
index c5b4e49ffda..a9c70d74ae7 100644
--- a/server/src/com/cloud/servlet/RegisterCompleteServlet.java
+++ b/server/src/com/cloud/servlet/RegisterCompleteServlet.java
@@ -80,6 +80,7 @@ public class RegisterCompleteServlet extends HttpServlet implements ServletConte
 	@Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
 		String registrationToken = req.getParameter("token");
+		String expires = req.getParameter("expires");
 		int statusCode = HttpServletResponse.SC_OK;
 		String responseMessage = null;
 		
@@ -90,29 +91,34 @@ public class RegisterCompleteServlet extends HttpServlet implements ServletConte
 			s_logger.info("Attempting to register user account with token = "+registrationToken);
 			User resourceAdminUser = _accountSvc.getActiveUserByRegistrationToken(registrationToken);
 			if (resourceAdminUser != null) {
-				if(!resourceAdminUser.isRegistered()){
-					_accountSvc.markUserRegistered(resourceAdminUser.getId());
+				if(resourceAdminUser.isRegistered()) {
+					statusCode = 503;
+					responseMessage = "{ \"registration_info\" : { \"errorcode\" : \"503\", \"errortext\" : \"Expired token = " + registrationToken + "\" } }";
+				} else {
+					if(expires != null && expires.toLowerCase().equals("true")){
+						_accountSvc.markUserRegistered(resourceAdminUser.getId());
+					}
+					
+					Account resourceAdminAccount = _accountSvc.getActiveAccount(resourceAdminUser.getAccountId());
+					Account rsUserAccount = _accountSvc.getActiveAccount(resourceAdminAccount.getAccountName()+"-user", resourceAdminAccount.getDomainId());
+					
+					List<UserVO> users =  _userDao.listByAccount(rsUserAccount.getId());
+					User rsUser = users.get(0);
+					
+					Configuration config = _configDao.findByName("endpointe.url");
+					
+					StringBuffer sb = new StringBuffer();
+			        sb.append("{ \"registration_info\" : { \"endpoint_url\" : \""+encodeParam(config.getValue())+"\", ");
+			        sb.append("\"domain_id\" : \""+resourceAdminAccount.getDomainId()+"\", ");
+			        sb.append("\"admin_account\" : \""+encodeParam(resourceAdminUser.getUsername())+"\", ");
+			        sb.append("\"admin_account_api_key\" : \""+resourceAdminUser.getApiKey()+"\", ");
+			        sb.append("\"admin_account_secret_key\" : \""+resourceAdminUser.getSecretKey()+"\", ");
+			        sb.append("\"user_account\" : \""+encodeParam(rsUser.getUsername())+"\", ");
+			        sb.append("\"user_account_api_key\" : \""+rsUser.getApiKey()+"\", ");
+			        sb.append("\"user_account_secret_key\" : \""+rsUser.getSecretKey()+"\" ");
+			        sb.append("} }");
+			        responseMessage = sb.toString();
 				}
-				
-				Account resourceAdminAccount = _accountSvc.getActiveAccount(resourceAdminUser.getAccountId());
-				Account rsUserAccount = _accountSvc.getActiveAccount(resourceAdminAccount.getAccountName()+"-user", resourceAdminAccount.getDomainId());
-				
-				List<UserVO> users =  _userDao.listByAccount(rsUserAccount.getId());
-				User rsUser = users.get(0);
-				
-				Configuration config = _configDao.findByName("endpointe.url");
-				
-				StringBuffer sb = new StringBuffer();
-		        sb.append("{ \"registration_info\" : { \"endpoint_url\" : \""+encodeParam(config.getValue())+"\", ");
-		        sb.append("\"domain_id\" : \""+resourceAdminAccount.getDomainId()+"\", ");
-		        sb.append("\"admin_account\" : \""+encodeParam(resourceAdminUser.getUsername())+"\", ");
-		        sb.append("\"admin_account_api_key\" : \""+resourceAdminUser.getApiKey()+"\", ");
-		        sb.append("\"admin_account_secret_key\" : \""+resourceAdminUser.getSecretKey()+"\", ");
-		        sb.append("\"user_account\" : \""+encodeParam(rsUser.getUsername())+"\", ");
-		        sb.append("\"user_account_api_key\" : \""+rsUser.getApiKey()+"\", ");
-		        sb.append("\"user_account_secret_key\" : \""+rsUser.getSecretKey()+"\" ");
-		        sb.append("} }");
-		        responseMessage = sb.toString();
 			} else {
 				statusCode = 503;
 				responseMessage = "{ \"registration_info\" : { \"errorcode\" : \"503\", \"errortext\" : \"Invalid token = " + registrationToken + "\" } }";
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 01c51146a87..82fae0a8f38 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1800,7 +1800,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
 	public void markUserRegistered(long userId) {
         UserVO userForUpdate = _userDao.createForUpdate();
         userForUpdate.setRegistered(true);
-        userForUpdate.setRegistrationToken(null);
         _userDao.update(Long.valueOf(userId), userForUpdate);		
 	}
 }

From 0830f71baefcc749ba739e4198f331fcd53b3d4a Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 6 Jun 2011 10:31:18 -0700
Subject: [PATCH 09/13] Fixed the name for system vm template

---
 setup/db/db/schema-21to22.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql
index 8cd483f4495..d2bfe99a019 100755
--- a/setup/db/db/schema-21to22.sql
+++ b/setup/db/db/schema-21to22.sql
@@ -953,7 +953,7 @@ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type,
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
     VALUES (7, 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
 UPDATE vm_instance SET guest_os_id=15 where vm_template_id=1;
-UPDATE vm_instance SET vm_template_id=(SELECT id FROM vm_template WHERE unique_name='routing-xenserver-2.2.4' AND removed IS NULL) where vm_template_id=1;
+UPDATE vm_instance SET vm_template_id=(SELECT id FROM vm_template WHERE unique_name='systemvm-xenserver-2.2.4' AND removed IS NULL) where vm_template_id=1;
 
 
 ALTER TABLE `cloud`.`instance_group` ADD CONSTRAINT `fk_instance_group__account_id` FOREIGN KEY `fk_instance_group__account_id` (`account_id`) REFERENCES `account` (`id`);

From 9a2cc8008b365fac7b3ea0262563c4e309c95b0a Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 6 Jun 2011 10:50:18 -0700
Subject: [PATCH 10/13] Db upgarde: changed 225-226 to be 226-227

---
 .../cloud/upgrade/DatabaseUpgradeChecker.java    | 16 ++++++++--------
 ...Upgrade225to226.java => Upgrade226to227.java} |  6 +++---
 .../{schema-225to226.sql => schema-226to227.sql} |  0
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename server/src/com/cloud/upgrade/dao/{Upgrade225to226.java => Upgrade226to227.java} (94%)
 rename setup/db/db/{schema-225to226.sql => schema-226to227.sql} (100%)

diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index c926e15eb8c..b4fbc504218 100644
--- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -42,7 +42,7 @@ import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
 import com.cloud.upgrade.dao.Upgrade221to222;
 import com.cloud.upgrade.dao.Upgrade222to224;
 import com.cloud.upgrade.dao.Upgrade224to225;
-import com.cloud.upgrade.dao.Upgrade225to226;
+import com.cloud.upgrade.dao.Upgrade226to227;
 import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
 import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
 import com.cloud.upgrade.dao.VersionDao;
@@ -65,14 +65,14 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
 
     public DatabaseUpgradeChecker() {
         _dao = ComponentLocator.inject(VersionDaoImpl.class);
-        _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226() });
-        _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226() });
-        _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226() });
+        _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade226to227() });
+        _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade226to227() });
+        _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade226to227() });
         _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225()});
-        _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226() });
-        _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226() });
-        _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226() });
-        _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226()});
+        _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade226to227()});
     }
 
     protected void runScript(Connection conn, File file) {
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade225to226.java b/server/src/com/cloud/upgrade/dao/Upgrade226to227.java
similarity index 94%
rename from server/src/com/cloud/upgrade/dao/Upgrade225to226.java
rename to server/src/com/cloud/upgrade/dao/Upgrade226to227.java
index 127150beddd..05057db28cf 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade225to226.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade226to227.java
@@ -32,7 +32,7 @@ import com.cloud.utils.component.Inject;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.script.Script;
 
-public class Upgrade225to226 implements DbUpgrade {
+public class Upgrade226to227 implements DbUpgrade {
     @Inject
     protected SnapshotDao _snapshotDao;
     @Inject
@@ -59,9 +59,9 @@ public class Upgrade225to226 implements DbUpgrade {
 
     @Override
     public File[] getPrepareScripts() {
-        String script = Script.findScript("", "db/schema-225to226.sql");
+        String script = Script.findScript("", "db/schema-226to227.sql");
         if (script == null) {
-            throw new CloudRuntimeException("Unable to find db/schema-224to225.sql");
+            throw new CloudRuntimeException("Unable to find db/schema-226to227.sql");
         }
         
         return new File[] { new File(script) };
diff --git a/setup/db/db/schema-225to226.sql b/setup/db/db/schema-226to227.sql
similarity index 100%
rename from setup/db/db/schema-225to226.sql
rename to setup/db/db/schema-226to227.sql

From 64252b48f2ed53bbb678fd1a723ba3f28685fa5c Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 6 Jun 2011 12:28:53 -0700
Subject: [PATCH 11/13] bug 10166: drop account_id/domain_id fields (if exist)
 in domain_router table status 10166: resolved fixed

---
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java |  59 ++++++++++
 .../cloud/upgrade/dao/Upgrade224to225.java    |  50 +-------
 .../cloud/upgrade/dao/Upgrade225to226.java    | 109 ++++++++++++++++++
 setup/db/create-schema.sql                    |   2 +-
 setup/db/db/schema-21to22-cleanup.sql         |   3 -
 setup/db/db/schema-21to22.sql                 |   2 +-
 setup/db/db/schema-225to226.sql               |   7 ++
 7 files changed, 180 insertions(+), 52 deletions(-)
 create mode 100644 server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
 create mode 100644 server/src/com/cloud/upgrade/dao/Upgrade225to226.java
 create mode 100644 setup/db/db/schema-225to226.sql

diff --git a/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java b/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
new file mode 100644
index 00000000000..574bc79fba9
--- /dev/null
+++ b/server/src/com/cloud/upgrade/dao/DbUpgradeUtils.java
@@ -0,0 +1,59 @@
+package com.cloud.upgrade.dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+
+public class DbUpgradeUtils {
+    final static Logger s_logger = Logger.getLogger(DbUpgradeUtils.class);
+
+    public static void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
+        for (String key : keys) {
+            try {
+                PreparedStatement pstmt = null;
+                if (isForeignKey) {
+                    pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP FOREIGN KEY " + key);
+                } else {
+                    pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP KEY " + key);
+                }
+                pstmt.executeUpdate();
+                s_logger.debug("Key " + key + " is dropped successfully from the table " + tableName);
+                pstmt.close();
+            } catch (SQLException e) {
+                // do nothing here
+                continue;
+            }
+        }
+    }
+    
+    
+    public static void dropTableColumnsIfExist(Connection conn, String tableName, List<String> columns) {
+        PreparedStatement pstmt = null;
+        try {
+            for (String column : columns) {
+                try {
+                    pstmt = conn.prepareStatement("SELECT " + column + " FROM " + tableName);
+                    pstmt.executeQuery();
+
+                } catch (SQLException e) {
+                    // if there is an exception, it means that field doesn't exist, so do nothing here
+                    s_logger.trace("Field " + column + " doesn't exist in " + tableName);
+                    continue;
+                }
+
+                pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP COLUMN " + column);
+                pstmt.executeUpdate();
+                s_logger.debug("Column " + column + " is dropped successfully from the table " + tableName);
+                pstmt.close();
+            }
+        } catch (SQLException e) {
+            s_logger.warn("Unable to drop columns using query " + pstmt + " due to exception", e);
+            throw new CloudRuntimeException("Unable to drop columns due to ", e);
+        }
+    }
+}
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade224to225.java b/server/src/com/cloud/upgrade/dao/Upgrade224to225.java
index 69b03234615..bff1b461e8c 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade224to225.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade224to225.java
@@ -209,32 +209,7 @@ public class Upgrade224to225 implements DbUpgrade {
 
         s_logger.debug("Dropping columns that don't exist in 2.2.5 version of the DB...");
         for (String tableName : tablesToModify.keySet()) {
-            dropTableColumnsIfExist(conn, tableName, tablesToModify.get(tableName));
-        }
-    }
-
-    private void dropTableColumnsIfExist(Connection conn, String tableName, List<String> columns) {
-        PreparedStatement pstmt = null;
-        try {
-            for (String column : columns) {
-                try {
-                    pstmt = conn.prepareStatement("SELECT " + column + " FROM " + tableName);
-                    pstmt.executeQuery();
-
-                } catch (SQLException e) {
-                    // if there is an exception, it means that field doesn't exist, so do nothing here
-                    s_logger.trace("Field " + column + " doesn't exist in " + tableName);
-                    continue;
-                }
-
-                pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP COLUMN " + column);
-                pstmt.executeUpdate();
-                s_logger.debug("Column " + column + " is dropped successfully from the table " + tableName);
-                pstmt.close();
-            }
-        } catch (SQLException e) {
-            s_logger.warn("Unable to drop columns using query " + pstmt + " due to exception", e);
-            throw new CloudRuntimeException("Unable to drop columns due to ", e);
+            DbUpgradeUtils.dropTableColumnsIfExist(conn, tableName, tablesToModify.get(tableName));
         }
     }
 
@@ -303,31 +278,12 @@ public class Upgrade224to225 implements DbUpgrade {
         // drop all foreign keys first
         s_logger.debug("Dropping keys that don't exist in 2.2.5 version of the DB...");
         for (String tableName : foreignKeys.keySet()) {
-            dropKeysIfExist(conn, tableName, foreignKeys.get(tableName), true);
+            DbUpgradeUtils.dropKeysIfExist(conn, tableName, foreignKeys.get(tableName), true);
         }
 
         // drop indexes now
         for (String tableName : indexes.keySet()) {
-            dropKeysIfExist(conn, tableName, indexes.get(tableName), false);
-        }
-    }
-
-    private void dropKeysIfExist(Connection conn, String tableName, List<String> keys, boolean isForeignKey) {
-        for (String key : keys) {
-            try {
-                PreparedStatement pstmt = null;
-                if (isForeignKey) {
-                    pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP FOREIGN KEY " + key);
-                } else {
-                    pstmt = conn.prepareStatement("ALTER TABLE " + tableName + " DROP KEY " + key);
-                }
-                pstmt.executeUpdate();
-                s_logger.debug("Key " + key + " is dropped successfully from the table " + tableName);
-                pstmt.close();
-            } catch (SQLException e) {
-                // do nothing here
-                continue;
-            }
+            DbUpgradeUtils.dropKeysIfExist(conn, tableName, indexes.get(tableName), false);
         }
     }
 
diff --git a/server/src/com/cloud/upgrade/dao/Upgrade225to226.java b/server/src/com/cloud/upgrade/dao/Upgrade225to226.java
new file mode 100644
index 00000000000..a9e7382adf9
--- /dev/null
+++ b/server/src/com/cloud/upgrade/dao/Upgrade225to226.java
@@ -0,0 +1,109 @@
+/**
+ *  Copyright (C) 2010 Cloud.com, Inc.  All rights reserved.
+ * 
+ * This software is licensed under the GNU General Public License v3 or later.
+ * 
+ * It is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+package com.cloud.upgrade.dao;
+
+import java.io.File;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+
+public class Upgrade225to226 implements DbUpgrade {
+    final static Logger s_logger = Logger.getLogger(Upgrade225to226.class);
+
+    @Override
+    public File[] getPrepareScripts() {
+        String file = Script.findScript("", "db/schema-225to226.sql");
+        if (file == null) {
+            throw new CloudRuntimeException("Unable to find the upgrade script, schema-225to226.sql");
+        }
+
+        return new File[] { new File(file) };
+    }
+
+    @Override
+    public void performDataMigration(Connection conn) {
+        dropKeysIfExist(conn);
+        dropTableColumnsIfExist(conn);
+    }
+
+    @Override
+    public File[] getCleanupScripts() {
+        return null;
+    }
+
+    @Override
+    public String[] getUpgradableVersionRange() {
+        return new String[] { "2.2.5", "2.2.5" };
+    }
+
+    @Override
+    public String getUpgradedVersion() {
+        return "2.2.6";
+    }
+
+    @Override
+    public boolean supportsRollingUpgrade() {
+        return false;
+    }
+
+    private void dropTableColumnsIfExist(Connection conn) {
+        HashMap<String, List<String>> tablesToModify = new HashMap<String, List<String>>();
+
+        // domain router table
+        List<String> columns = new ArrayList<String>();
+        columns.add("account_id");
+        columns.add("domain_id");
+        tablesToModify.put("domain_router", columns);
+
+        s_logger.debug("Dropping columns that don't exist in 2.2.6 version of the DB...");
+        for (String tableName : tablesToModify.keySet()) {
+            DbUpgradeUtils.dropTableColumnsIfExist(conn, tableName, tablesToModify.get(tableName));
+        }
+    }
+
+    private void dropKeysIfExist(Connection conn) {
+        HashMap<String, List<String>> foreignKeys = new HashMap<String, List<String>>();
+        HashMap<String, List<String>> indexes = new HashMap<String, List<String>>();
+
+        // domain router table
+        List<String> keys = new ArrayList<String>();
+        keys.add("fk_domain_router__account_id");
+        foreignKeys.put("domain_router", keys);
+
+        keys = new ArrayList<String>();
+        keys.add("i_domain_router__account_id");
+        indexes.put("domain_router", keys);
+
+        // drop all foreign keys first
+        s_logger.debug("Dropping keys that don't exist in 2.2.6 version of the DB...");
+        for (String tableName : foreignKeys.keySet()) {
+            DbUpgradeUtils.dropKeysIfExist(conn, tableName, foreignKeys.get(tableName), true);
+        }
+
+        // drop indexes now
+        for (String tableName : indexes.keySet()) {
+            DbUpgradeUtils.dropKeysIfExist(conn, tableName, indexes.get(tableName), false);
+        }
+    }
+}
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 6babffaaac6..5ea17ed5f32 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1198,7 +1198,7 @@ CREATE TABLE  `cloud`.`storage_pool` (
   `cluster_id` bigint unsigned COMMENT 'foreign key to cluster',
   `available_bytes` bigint unsigned,
   `capacity_bytes` bigint unsigned,
-  `host_address` char(40) NOT NULL COMMENT 'FQDN or IP of storage server',
+  `host_address` varchar(255) NOT NULL COMMENT 'FQDN or IP of storage server',
   `path` varchar(255) NOT NULL COMMENT 'Filesystem path that is shared',
   `created` datetime COMMENT 'date the pool created',
   `removed` datetime COMMENT 'date removed if not null',
diff --git a/setup/db/db/schema-21to22-cleanup.sql b/setup/db/db/schema-21to22-cleanup.sql
index 2d7d7a7f623..a0a2788f75f 100644
--- a/setup/db/db/schema-21to22-cleanup.sql
+++ b/setup/db/db/schema-21to22-cleanup.sql
@@ -26,9 +26,6 @@ ALTER TABLE `cloud`.`user_vm` DROP COLUMN `service_offering_id`;
 ALTER TABLE `cloud`.`user_vm` DROP COLUMN `account_id`;
 ALTER TABLE `cloud`.`user_vm` DROP COLUMN `domain_id`;
 
-ALTER TABLE `cloud`.`domain_router` DROP FOREIGN KEY `fk_domain_router__account_id`;
-ALTER TABLE `cloud`.`domain_router` DROP INDEX `i_domain_router__account_id`;
-
 #ALTER TABLE `cloud`.`secondary_storage_vm` DROP COLUMN `guid`;
 
 #ALTER TABLE `cloud`.`vlan` ADD CONSTRAINT `fk_vlan__network_id` FOREIGN KEY `fk_vlan__network_id`(`network_id`) REFERENCES `networks`(`id`);
diff --git a/setup/db/db/schema-21to22.sql b/setup/db/db/schema-21to22.sql
index d2bfe99a019..697461c07bb 100755
--- a/setup/db/db/schema-21to22.sql
+++ b/setup/db/db/schema-21to22.sql
@@ -953,7 +953,7 @@ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type,
 INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text,  format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
     VALUES (7, 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
 UPDATE vm_instance SET guest_os_id=15 where vm_template_id=1;
-UPDATE vm_instance SET vm_template_id=(SELECT id FROM vm_template WHERE unique_name='systemvm-xenserver-2.2.4' AND removed IS NULL) where vm_template_id=1;
+UPDATE vm_instance SET vm_template_id=(SELECT id FROM vm_template WHERE name='systemvm-xenserver-2.2.4' AND removed IS NULL) where vm_template_id=1;
 
 
 ALTER TABLE `cloud`.`instance_group` ADD CONSTRAINT `fk_instance_group__account_id` FOREIGN KEY `fk_instance_group__account_id` (`account_id`) REFERENCES `account` (`id`);
diff --git a/setup/db/db/schema-225to226.sql b/setup/db/db/schema-225to226.sql
new file mode 100644
index 00000000000..0a2953f4600
--- /dev/null
+++ b/setup/db/db/schema-225to226.sql
@@ -0,0 +1,7 @@
+--;
+-- Schema upgrade from 2.2.5 to 2.2.6;
+--;
+
+ALTER TABLE `cloud`.`storage_pool` MODIFY `host_address` varchar(255) NOT NULL;
+
+

From a03e2b8a123287f5511bb8791467bcceb576ac2e Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 6 Jun 2011 12:49:17 -0700
Subject: [PATCH 12/13] Added upgrade path from 225 to 226

Conflicts:

	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
---
 .../cloud/upgrade/DatabaseUpgradeChecker.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index b4fbc504218..80ef8dd67f1 100644
--- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -42,6 +42,7 @@ import com.cloud.upgrade.dao.Upgrade218to224DomainVlans;
 import com.cloud.upgrade.dao.Upgrade221to222;
 import com.cloud.upgrade.dao.Upgrade222to224;
 import com.cloud.upgrade.dao.Upgrade224to225;
+import com.cloud.upgrade.dao.Upgrade225to226;
 import com.cloud.upgrade.dao.Upgrade226to227;
 import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
 import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
@@ -65,14 +66,15 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker {
 
     public DatabaseUpgradeChecker() {
         _dao = ComponentLocator.inject(VersionDaoImpl.class);
-        _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225()});
-        _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade226to227() });
-        _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade226to227()});
+        _upgradeMap.put("2.1.7", new DbUpgrade[] { new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222(), new UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227()});
+        _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade226to227() });
+        _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade226to227()});
     }
 
     protected void runScript(Connection conn, File file) {

From cec4e7235b45184dc2ce619731e0b47c1b60aa0d Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 6 Jun 2011 14:03:38 -0700
Subject: [PATCH 13/13] Allow to use securityGroupNames in deployVm command
 (the code transforms them to the ids)

---
 .../com/cloud/api/commands/DeployVMCmd.java   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/api/src/com/cloud/api/commands/DeployVMCmd.java b/api/src/com/cloud/api/commands/DeployVMCmd.java
index bea7e431721..b0a8a973bb6 100644
--- a/api/src/com/cloud/api/commands/DeployVMCmd.java
+++ b/api/src/com/cloud/api/commands/DeployVMCmd.java
@@ -145,24 +145,27 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
     }
 
     public List<Long> getSecurityGroupIdList() {
-        if (securityGroupIdList != null && securityGroupIdList != null) {
+        if (securityGroupNameList != null && securityGroupIdList != null) {
             throw new InvalidParameterValueException("securitygroupids parameter is mutually exclusive with securitygroupnames parameter");
+        } else if (securityGroupNameList == null && securityGroupIdList == null) {
+            throw new InvalidParameterValueException("securitygroupids or securitygroupnames must be specified");
         }
         
        //transform group names to ids here
        if (securityGroupNameList != null) {
-            securityGroupIdList = new ArrayList<Long>();
+            List<Long> securityGroupIds = new ArrayList<Long>();
             for (String groupName : securityGroupNameList) {
                 Long groupId = _responseGenerator.getSecurityGroupId(groupName, getEntityOwnerId());
                 if (groupId == null) {
                     throw new InvalidParameterValueException("Unable to find group by name " + groupName + " for account " + getEntityOwnerId());
                 } else {
-                    securityGroupIdList.add(groupId);
+                    securityGroupIds.add(groupId);
                 }
             }    
+            return securityGroupIds;
+        } else {
+            return securityGroupIdList;
         }
-       
-       return securityGroupIdList;
     }
 
     public Long getServiceOfferingId() {
@@ -320,15 +323,15 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
                     if (getNetworkIds() != null) {
                         throw new InvalidParameterValueException("Can't specify network Ids in Basic zone");
                     } else {
-                        vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, securityGroupIdList, owner, name,
+                        vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name,
                                 displayName, diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName);
                     }
                 } else {
                     if (zone.isSecurityGroupEnabled()) {
-                        vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), securityGroupIdList,
+                        vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(),
                                 owner, name, displayName, diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName);
                     } else {
-                        if (securityGroupIdList != null && !securityGroupIdList.isEmpty()) {
+                        if (getSecurityGroupIdList() != null && !getSecurityGroupIdList().isEmpty()) {
                             throw new InvalidParameterValueException("Can't create vm with security groups; security group feature is not enabled per zone");
                         }
                         vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName,