From f4dbf8786fe1ab2bd7ba822a9ed4318303855368 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Wed, 25 Sep 2013 16:08:41 -0700
Subject: [PATCH] CLOUDSTACK-4477: in order to select hypervisor host which can
 access storage pool, need to check storage_pool_host_ref

Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
---
 .../storage/test/DirectAgentManagerSimpleImpl.java        | 5 +++++
 .../cloudstack/storage/test/EndpointSelectorTest.java     | 8 ++++++++
 .../storage/test/FakeDriverTestConfiguration.java         | 2 --
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
index ec681192aae..fc926af558d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
@@ -26,6 +26,10 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.host.Host;
+import com.cloud.host.Status;
+import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.utils.fsm.StateMachine2;
 import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
@@ -246,6 +250,7 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
             e1.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
         return true;
+
     }
 
     @Override
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
index d645deb1b4e..7b8dd3ab642 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cloudstack.storage.test;
 
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -28,6 +29,7 @@ import java.util.UUID;
 
 import javax.inject.Inject;
 
+import com.cloud.server.LockMasterListener;
 import junit.framework.Assert;
 
 import org.junit.Before;
@@ -58,6 +60,9 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 
 import com.cloud.agent.AgentManager;
+
+import com.cloud.agent.AgentManager;
+
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
@@ -88,6 +93,7 @@ import com.cloud.user.User;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.db.Merovingian2;
 
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:/fakeDriverTestContext.xml" })
 public class EndpointSelectorTest {
@@ -121,6 +127,8 @@ public class EndpointSelectorTest {
     ImageStoreVO imageStore;
     @Inject
     AccountManager accountManager;
+
+    LockMasterListener lockMasterListener;
     VolumeInfo vol = null;
     FakePrimaryDataStoreDriver driver = new FakePrimaryDataStoreDriver();
     @Inject
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
index 5e3e8851066..9022d9703ab 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
@@ -24,7 +24,6 @@ import com.cloud.storage.snapshot.SnapshotSchedulerImpl;
 import com.cloud.user.DomainManager;
 import com.cloud.utils.component.ComponentContext;
 
-
 import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
@@ -61,7 +60,6 @@ public class FakeDriverTestConfiguration extends ChildTestConfiguration{
         return Mockito.mock(DomainManager.class);
     }
 
-
     @Override
     @Bean
     public EndPointSelector selector() {