diff --git a/server/src/com/cloud/upgrade/dao/Upgrade229to2210.java b/server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
index 7d5e4a8f6ee..807978ff818 100644
--- a/server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
+++ b/server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
@@ -112,7 +112,7 @@ public class Upgrade229to2210 implements DbUpgrade {
         long currentRuleId = 0;
         try {
             // Host and Primary storage capacity types
-            pstmt = conn.prepareStatement("select id, ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id from firewall_rules");
+            pstmt = conn.prepareStatement("select id, ip_address_id, start_port, end_port, protocol, account_id, domain_id, network_id from firewall_rules where state != 'Revoke'");
             rs = pstmt.executeQuery();
             while (rs.next()) {
                 long id = rs.getLong(1);
@@ -142,12 +142,13 @@ public class Upgrade229to2210 implements DbUpgrade {
                 pstmt.executeUpdate();
                 
                 //get new FirewallRule update
-                pstmt = conn.prepareStatement("SELECT id from firewall_rules where purpose='Firewall' and start_port=? and end_port=? and protocol=? and ip_address_id=? and network_id=?");
+                pstmt = conn.prepareStatement("SELECT id from firewall_rules where purpose='Firewall' and start_port=? and end_port=? and protocol=? and ip_address_id=? and network_id=? and related=?");
                 pstmt.setInt(1, startPort);
                 pstmt.setInt(2, endPort);
                 pstmt.setString(3, protocol);
                 pstmt.setLong(4, ipId);
                 pstmt.setLong(5, networkId);
+                pstmt.setLong(6, id);
                 
                 ResultSet rs1 = pstmt.executeQuery();
                 
diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java
index cfe053f6395..821cffd9711 100755
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@ -564,13 +564,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         return null;
     }
 
-    @Override
-    public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException,
-    InsufficientCapacityException {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
     @Override
     public Long getPodIdForVlan(long vlanDbId) {
         // TODO Auto-generated method stub
@@ -618,12 +611,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
         // TODO Auto-generated method stub
         return false;
     }
-    
-    @Override
-    public List<String> getNetworkTags(HypervisorType hType, Network network) {
-        // TODO Auto-generated method stub
-        return null;
-    }
 
     @Override
     public List<Service> getElementServices(Provider provider) {
@@ -703,4 +690,25 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
 		return false;
 	}
 
+	@Override
+	public boolean restartNetwork(RestartNetworkCmd cmd, boolean cleanup)
+			throws ConcurrentOperationException, ResourceUnavailableException,
+			InsufficientCapacityException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public String getNetworkTag(HypervisorType hType, Network network) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void canProviderSupportServices(
+			Map<Provider, Set<Service>> providersMap) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java
index cec6cfa124e..e2b9d000ac1 100644
--- a/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java
@@ -37,7 +37,7 @@ public class AdvanceZone223To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+//        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
     }
 
     @Override
@@ -46,8 +46,8 @@ public class AdvanceZone223To224UpgradeTest extends TestCase {
     }
 
     public void test217to22Upgrade() throws SQLException {
-        s_logger.debug("Finding sample data from 2.2.3");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.3/dave-sample.sql", false, true);
+        s_logger.debug("Finding sample data from 2.2.8");
+//        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.8/dave-sample.sql", false, true);
 
         Connection conn;
         PreparedStatement pstmt;
@@ -56,9 +56,9 @@ public class AdvanceZone223To224UpgradeTest extends TestCase {
         DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class);
 
         String version = dao.getCurrentVersion();
-        assert version.equals("2.2.2") : "Version returned is not 2.2.2 but " + version;
+        assert version.equals("2.2.8") : "Version returned is not 2.2.8 but " + version;
 
-        checker.upgrade("2.2.2", "2.2.4");
+        checker.upgrade("2.2.8", "2.2.12");
     }
 
 }