Recalculate and update host used capacity (mem & cpu) in upgrade (2.1.x to 2.2.y)

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java

server/test/com/cloud/upgrade/HostCapacity218to22Test.java

@@ -0,0 +1,48 @@
+package com.cloud.upgrade;
+
+import java.sql.SQLException;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+import org.junit.After;
+import org.junit.Before;
+
+import com.cloud.upgrade.dao.VersionDaoImpl;
+import com.cloud.utils.component.ComponentLocator;
+import com.cloud.utils.db.DbTestUtils;
+
+public class HostCapacity218to22Test extends TestCase {
+    private static final Logger s_logger = Logger.getLogger(HostCapacity218to22Test.class);
+	
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+    }
+    
+    @Override
+    @After
+    public void tearDown() throws Exception {
+    }
+
+    public void test218to22Upgrade() throws SQLException {
+        s_logger.debug("Finding sample data from 2.1.8");
+        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8_sample_host_capacity.sql", false, true);
+        
+        VersionDaoImpl dao = ComponentLocator.inject(VersionDaoImpl.class);
+        DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class);
+        
+        String version = dao.getCurrentVersion();
+        
+        if (!version.equals("2.1.8")) {
+            s_logger.error("Version returned is not 2.1.8 but " + version);
+        } else {
+            s_logger.debug("Instance group test version is " + version);
+        }
+        
+        checker.upgrade("2.1.8", "2.2.4");
+        
+        // manually check into database for now to verify
+    }
+}