Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3753910C42 for ; Thu, 26 Sep 2013 18:03:51 +0000 (UTC) Received: (qmail 67576 invoked by uid 500); 26 Sep 2013 18:03:27 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 67148 invoked by uid 500); 26 Sep 2013 18:03:15 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 66703 invoked by uid 99); 26 Sep 2013 18:03:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Sep 2013 18:03:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0CCC990AE6B; Thu, 26 Sep 2013 18:03:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 Sep 2013 18:03:12 -0000 Message-Id: <63dd1c87741f45a1be5bb7f0d6656b03@git.apache.org> In-Reply-To: <2b385efe31f74d5abb2aebacdc661476@git.apache.org> References: <2b385efe31f74d5abb2aebacdc661476@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/34] git commit: updated refs/heads/ui-restyle to 23093ed 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f4dbf878 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f4dbf878 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f4dbf878 Branch: refs/heads/ui-restyle Commit: f4dbf8786fe1ab2bd7ba822a9ed4318303855368 Parents: a82b179 Author: Edison Su Authored: Wed Sep 25 16:08:41 2013 -0700 Committer: Edison Su Committed: Wed Sep 25 16:08:41 2013 -0700 ---------------------------------------------------------------------- .../storage/test/DirectAgentManagerSimpleImpl.java | 5 +++++ .../apache/cloudstack/storage/test/EndpointSelectorTest.java | 8 ++++++++ .../cloudstack/storage/test/FakeDriverTestConfiguration.java | 2 -- 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4dbf878/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java ---------------------------------------------------------------------- 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 ec68119..fc926af 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4dbf878/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java ---------------------------------------------------------------------- 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 d645deb..7b8dd3a 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f4dbf878/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java ---------------------------------------------------------------------- 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 5e3e885..9022d97 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() {