You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/05/30 03:06:28 UTC
[08/17] clean up storage related coded
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java
index 63669c4..902f595 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/AopTestAdvice.java
@@ -21,14 +21,14 @@ import org.aspectj.lang.ProceedingJoinPoint;
import com.cloud.utils.db.Transaction;
public class AopTestAdvice {
- public Object AopTestMethod(ProceedingJoinPoint call) throws Throwable {
- Transaction txn = Transaction.open(call.getSignature().getName());
- Object ret = null;
- try {
- ret = call.proceed();
- } finally {
- txn.close();
- }
- return ret;
- }
+ public Object AopTestMethod(ProceedingJoinPoint call) throws Throwable {
+ Transaction txn = Transaction.open(call.getSignature().getName());
+ Object ret = null;
+ try {
+ ret = call.proceed();
+ } finally {
+ txn.close();
+ }
+ return ret;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
index acb6106..60f86d8 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/ChildTestConfiguration.java
@@ -22,11 +22,7 @@ import org.apache.cloudstack.acl.APIChecker;
import org.apache.cloudstack.engine.service.api.OrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
import org.apache.cloudstack.framework.rpc.RpcProvider;
-import org.apache.cloudstack.storage.HostEndpointRpcServer;
import org.apache.cloudstack.storage.cache.manager.StorageCacheManagerImpl;
-import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
-import org.apache.cloudstack.storage.image.db.ImageStoreDaoImpl;
-import org.apache.cloudstack.storage.image.db.ImageStoreDetailsDaoImpl;
import org.apache.cloudstack.storage.test.ChildTestConfiguration.Library;
import org.apache.cloudstack.test.utils.SpringUtils;
import org.mockito.Mockito;
@@ -79,7 +75,6 @@ import com.cloud.storage.dao.VMTemplatePoolDaoImpl;
import com.cloud.storage.dao.VMTemplateZoneDaoImpl;
import com.cloud.storage.dao.VolumeDaoImpl;
import com.cloud.storage.dao.VolumeHostDaoImpl;
-import com.cloud.storage.download.DownloadMonitor;
import com.cloud.storage.download.DownloadMonitorImpl;
import com.cloud.storage.s3.S3Manager;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
@@ -98,164 +93,138 @@ import com.cloud.vm.dao.NicDaoImpl;
import com.cloud.vm.dao.SecondaryStorageVmDaoImpl;
import com.cloud.vm.dao.UserVmDaoImpl;
import com.cloud.vm.dao.UserVmDetailsDaoImpl;
-import com.cloud.vm.dao.VMInstanceDao;
import com.cloud.vm.dao.VMInstanceDaoImpl;
import com.cloud.vm.snapshot.dao.VMSnapshotDaoImpl;
+
@Configuration
-@ComponentScan(basePackageClasses={
- NicDaoImpl.class,
- VMInstanceDaoImpl.class,
- VMTemplateHostDaoImpl.class,
- VolumeHostDaoImpl.class,
- VolumeDaoImpl.class,
- VMTemplatePoolDaoImpl.class,
- ResourceTagsDaoImpl.class,
- VMTemplateDaoImpl.class,
- MockStorageMotionStrategy.class,
- ConfigurationDaoImpl.class,
- ClusterDaoImpl.class,
- HostPodDaoImpl.class,
- VMTemplateZoneDaoImpl.class,
- VMTemplateDetailsDaoImpl.class,
- HostDetailsDaoImpl.class,
- HostTagsDaoImpl.class,
- HostTransferMapDaoImpl.class,
- DataCenterIpAddressDaoImpl.class,
- DataCenterLinkLocalIpAddressDaoImpl.class,
- DataCenterVnetDaoImpl.class,
- PodVlanDaoImpl.class,
- DcDetailsDaoImpl.class,
- DiskOfferingDaoImpl.class,
- StoragePoolHostDaoImpl.class,
- UserVmDaoImpl.class,
- UserVmDetailsDaoImpl.class,
- ServiceOfferingDaoImpl.class,
- CapacityDaoImpl.class,
- SnapshotDaoImpl.class,
- VMSnapshotDaoImpl.class,
- OCFS2ManagerImpl.class,
- ClusterDetailsDaoImpl.class,
- SecondaryStorageVmDaoImpl.class,
- ConsoleProxyDaoImpl.class,
- StoragePoolWorkDaoImpl.class,
- StorageCacheManagerImpl.class,
- UserDaoImpl.class,
- DataCenterDaoImpl.class,
- StoragePoolDetailsDaoImpl.class,
- DomainDaoImpl.class,
- DownloadMonitorImpl.class,
- AccountDaoImpl.class
-},
-includeFilters={@Filter(value=Library.class, type=FilterType.CUSTOM)},
-useDefaultFilters=false
-)
+@ComponentScan(basePackageClasses = { NicDaoImpl.class, VMInstanceDaoImpl.class, VMTemplateHostDaoImpl.class,
+ VolumeHostDaoImpl.class, VolumeDaoImpl.class, VMTemplatePoolDaoImpl.class, ResourceTagsDaoImpl.class,
+ VMTemplateDaoImpl.class, MockStorageMotionStrategy.class, ConfigurationDaoImpl.class, ClusterDaoImpl.class,
+ HostPodDaoImpl.class, VMTemplateZoneDaoImpl.class, VMTemplateDetailsDaoImpl.class, HostDetailsDaoImpl.class,
+ HostTagsDaoImpl.class, HostTransferMapDaoImpl.class, DataCenterIpAddressDaoImpl.class,
+ DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class,
+ DcDetailsDaoImpl.class, DiskOfferingDaoImpl.class, StoragePoolHostDaoImpl.class, UserVmDaoImpl.class,
+ UserVmDetailsDaoImpl.class, ServiceOfferingDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class,
+ VMSnapshotDaoImpl.class, OCFS2ManagerImpl.class, ClusterDetailsDaoImpl.class, SecondaryStorageVmDaoImpl.class,
+ ConsoleProxyDaoImpl.class, StoragePoolWorkDaoImpl.class, StorageCacheManagerImpl.class, UserDaoImpl.class,
+ DataCenterDaoImpl.class, StoragePoolDetailsDaoImpl.class, DomainDaoImpl.class, DownloadMonitorImpl.class,
+ AccountDaoImpl.class }, includeFilters = { @Filter(value = Library.class, type = FilterType.CUSTOM) },
+ useDefaultFilters = false)
public class ChildTestConfiguration extends TestConfiguration {
-
- @Bean
- public SecondaryStorageVmManager secondaryStoreageMgr() {
- return Mockito.mock(SecondaryStorageVmManager.class);
- }
- @Bean
- public HostDao hostDao() {
- return Mockito.spy(new HostDaoImpl());
- }
-
- @Bean
- public EndPointSelector selector() {
- return Mockito.mock(EndPointSelector.class);
- }
- @Bean
- public AgentManager agentMgr() {
- return new DirectAgentManagerSimpleImpl();
- }
-
@Bean
- public HostEndpointRpcServer rpcServer() {
- return new MockHostEndpointRpcServerDirectCallResource();
+ public SecondaryStorageVmManager secondaryStoreageMgr() {
+ return Mockito.mock(SecondaryStorageVmManager.class);
+ }
+
+ @Bean
+ public HostDao hostDao() {
+ return Mockito.spy(new HostDaoImpl());
}
-
+
+ @Bean
+ public EndPointSelector selector() {
+ return Mockito.mock(EndPointSelector.class);
+ }
+
+ @Bean
+ public AgentManager agentMgr() {
+ return new DirectAgentManagerSimpleImpl();
+ }
+
@Bean
public ResourceLimitService limtServe() {
return Mockito.mock(ResourceLimitService.class);
}
-
+
@Bean
public AccountManager acctMgt() {
return Mockito.mock(AccountManager.class);
}
+
@Bean
public RpcProvider rpcProvider() {
- return Mockito.mock(RpcProvider.class);
+ return Mockito.mock(RpcProvider.class);
}
+
@Bean
public ClusteredAgentRebalanceService _rebalanceService() {
return Mockito.mock(ClusteredAgentRebalanceService.class);
}
+
@Bean
public UserAuthenticator authenticator() {
return Mockito.mock(UserAuthenticator.class);
}
+
@Bean
public OrchestrationService orchSrvc() {
return Mockito.mock(OrchestrationService.class);
}
+
@Bean
public APIChecker apiChecker() {
return Mockito.mock(APIChecker.class);
}
+
@Bean
public TemplateManager templateMgr() {
- return Mockito.mock(TemplateManager.class);
+ return Mockito.mock(TemplateManager.class);
}
-
+
@Bean
public VolumeManager volumeMgr() {
- return Mockito.mock(VolumeManager.class);
+ return Mockito.mock(VolumeManager.class);
}
+
@Bean
public SwiftManager switfMgr() {
- return Mockito.mock(SwiftManager.class);
+ return Mockito.mock(SwiftManager.class);
}
+
@Bean
public ManagementServer server() {
- return Mockito.mock(ManagementServer.class);
+ return Mockito.mock(ManagementServer.class);
}
+
@Bean
public VirtualMachineManager vmMgr() {
- return Mockito.mock(VirtualMachineManager.class);
+ return Mockito.mock(VirtualMachineManager.class);
}
-
+
@Bean
public S3Manager s3Mgr() {
- return Mockito.mock(S3Manager.class);
+ return Mockito.mock(S3Manager.class);
}
+
@Bean
public SnapshotManager snapshotMgr() {
return Mockito.mock(SnapshotManager.class);
}
-
+
@Bean
public ResourceManager resourceMgr() {
- return Mockito.mock(ResourceManager.class);
+ return Mockito.mock(ResourceManager.class);
}
+
@Bean
public DomainRouterDao domainRouterDao() {
- return Mockito.mock(DomainRouterDao.class);
+ return Mockito.mock(DomainRouterDao.class);
}
+
@Bean
public StorageManager storageMgr() {
- return Mockito.mock(StorageManager.class);
+ return Mockito.mock(StorageManager.class);
}
-
+
@Bean
public AlertManager alertMgr() {
return Mockito.mock(AlertManager.class);
}
-
+
@Bean
public HypervisorGuruManager hypervisorGuruMgr() {
- return Mockito.mock(HypervisorGuruManager.class);
+ return Mockito.mock(HypervisorGuruManager.class);
}
public static class Library implements TypeFilter {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
index 726ea01..26f4c5d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/CloudStackTestNGBase.java
@@ -25,7 +25,6 @@ import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
-import com.cloud.utils.db.DB;
import com.cloud.utils.db.Transaction;
public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
@@ -54,12 +53,12 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
}
@BeforeMethod(alwaysRun = true)
- protected void injectDB(Method testMethod) throws Exception {
+ protected void injectDB(Method testMethod) throws Exception {
txn = Transaction.open(testMethod.getName());
}
@Test
- protected void injectMockitoTest() {
+ protected void injectMockitoTest() {
injectMockito();
}
@@ -71,17 +70,14 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
}
@BeforeMethod(alwaysRun = true)
-
- @Parameters({"devcloud-host-uuid", "devcloud-host-gateway", "devcloud-host-cidr",
- "devcloud-host-ip", "template-url", "devcloud-local-storage-uuid",
- "primary-storage-want-to-add", "devcloud-secondary-storage", "s3-accesskey", "s3-secretkey", "s3-endpoint",
- "s3-template-bucket", "s3-usehttps", "image-install-path", "primary-storage-uuid-want-to-add", "script-path",
- "hypervisor"})
- protected void setup(String hostuuid, String gateway, String cidr,
- String hostIp, String templateUrl, String localStorageUuid,
- String primaryStorage, String secondaryStorage, String s3_accessKey, String s3_secretKey, String s3_endpoint, String s3_template_bucket,
- String s3_usehttps, String imageInstallPath, String primaryStorageUuid, String scriptPath,
- String hypervisor) {
+ @Parameters({ "devcloud-host-uuid", "devcloud-host-gateway", "devcloud-host-cidr", "devcloud-host-ip",
+ "template-url", "devcloud-local-storage-uuid", "primary-storage-want-to-add", "devcloud-secondary-storage",
+ "s3-accesskey", "s3-secretkey", "s3-endpoint", "s3-template-bucket", "s3-usehttps", "image-install-path",
+ "primary-storage-uuid-want-to-add", "script-path", "hypervisor" })
+ protected void setup(String hostuuid, String gateway, String cidr, String hostIp, String templateUrl,
+ String localStorageUuid, String primaryStorage, String secondaryStorage, String s3_accessKey,
+ String s3_secretKey, String s3_endpoint, String s3_template_bucket, String s3_usehttps,
+ String imageInstallPath, String primaryStorageUuid, String scriptPath, String hypervisor) {
this.hostGuid = hostuuid;
this.hostGateway = gateway;
this.hostCidr = cidr;
@@ -133,14 +129,13 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
return this.primaryStorageUrl;
}
- public String getSecondaryStorage() {
- return secondaryStorage;
- }
-
- public void setSecondaryStorage(String secondaryStorage) {
- this.secondaryStorage = secondaryStorage;
- }
+ public String getSecondaryStorage() {
+ return secondaryStorage;
+ }
+ public void setSecondaryStorage(String secondaryStorage) {
+ this.secondaryStorage = secondaryStorage;
+ }
public String getS3AccessKey() {
return s3AccessKey;
@@ -186,13 +181,12 @@ public class CloudStackTestNGBase extends AbstractTestNGSpringContextTests {
this.scriptPath = scriptPath;
}
- public HypervisorType getHypervisor() {
- return hypervisor;
- }
-
- public void setHypervisor(HypervisorType hypervisor) {
- this.hypervisor = hypervisor;
- }
+ public HypervisorType getHypervisor() {
+ return hypervisor;
+ }
+ public void setHypervisor(HypervisorType hypervisor) {
+ this.hypervisor = hypervisor;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/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 c11da3d..ac50e9b 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,7 +26,6 @@ import java.util.Map;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
@@ -66,6 +65,7 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
ClusterDao clusterDao;
@Inject
ClusterDetailsDao clusterDetailsDao;
+
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
// TODO Auto-generated method stub
@@ -92,16 +92,16 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
@Override
public Answer easySend(Long hostId, Command cmd) {
- try {
- return this.send(hostId, cmd);
- } catch (AgentUnavailableException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (OperationTimedoutException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
+ try {
+ return this.send(hostId, cmd);
+ } catch (AgentUnavailableException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (OperationTimedoutException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return null;
}
protected void loadResource(Long hostId) {
@@ -116,23 +116,23 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
ServerResource resource = null;
if (host.getHypervisorType() == HypervisorType.XenServer) {
- resource = new XcpOssResource();
- try {
- resource.configure(host.getName(), params);
-
- } catch (ConfigurationException e) {
- logger.debug("Failed to load resource:" + e.toString());
- }
+ resource = new XcpOssResource();
+ try {
+ resource.configure(host.getName(), params);
+
+ } catch (ConfigurationException e) {
+ logger.debug("Failed to load resource:" + e.toString());
+ }
} else if (host.getHypervisorType() == HypervisorType.KVM) {
- resource = new LibvirtComputingResource();
- try {
- params.put("public.network.device", "cloudbr0");
- params.put("private.network.device", "cloudbr0");
- resource.configure(host.getName(), params);
- } catch (ConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ resource = new LibvirtComputingResource();
+ try {
+ params.put("public.network.device", "cloudbr0");
+ params.put("private.network.device", "cloudbr0");
+ resource.configure(host.getName(), params);
+ } catch (ConfigurationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
} else if (host.getHypervisorType() == HypervisorType.VMware) {
ClusterVO cluster = clusterDao.findById(host.getClusterId());
String url = clusterDetailsDao.findDetail(cluster.getId(), "url").getValue();
@@ -143,7 +143,8 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
String password = clusterDetailsDao.findDetail(cluster.getId(), "password").getValue();
VmwareServerDiscoverer discover = new VmwareServerDiscoverer();
- Map<? extends ServerResource, Map<String, String>> resources = discover.find(host.getDataCenterId(), host.getPodId(), host.getClusterId(), uri, userName, password, null);
+ Map<? extends ServerResource, Map<String, String>> resources = discover.find(host.getDataCenterId(),
+ host.getPodId(), host.getClusterId(), uri, userName, password, null);
for (Map.Entry<? extends ServerResource, Map<String, String>> entry : resources.entrySet()) {
resource = entry.getKey();
}
@@ -168,7 +169,8 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
}
@Override
- public synchronized Answer send(Long hostId, Command cmd) throws AgentUnavailableException, OperationTimedoutException {
+ public synchronized Answer send(Long hostId, Command cmd) throws AgentUnavailableException,
+ OperationTimedoutException {
ServerResource resource = hostResourcesMap.get(hostId);
if (resource == null) {
loadResource(hostId);
@@ -190,7 +192,8 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
}
@Override
- public Answer[] send(Long hostId, Commands cmds, int timeout) throws AgentUnavailableException, OperationTimedoutException {
+ public Answer[] send(Long hostId, Commands cmds, int timeout) throws AgentUnavailableException,
+ OperationTimedoutException {
// TODO Auto-generated method stub
return null;
}
@@ -231,7 +234,6 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
return null;
}
-
@Override
public boolean tapLoadingAgents(Long hostId, TapAgentsAction action) {
// TODO Auto-generated method stub
@@ -239,7 +241,8 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
}
@Override
- public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource, boolean forRebalance) throws ConnectionException {
+ public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource,
+ boolean forRebalance) throws ConnectionException {
// TODO Auto-generated method stub
return null;
}
@@ -286,10 +289,10 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa
return null;
}
- @Override
- public void disconnectWithInvestigation(long hostId, Event event) {
- // TODO Auto-generated method stub
+ @Override
+ public void disconnectWithInvestigation(long hostId, Event event) {
+ // TODO Auto-generated method stub
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
index ab09c50..d0cfa39 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java
@@ -50,11 +50,11 @@ import com.cloud.org.Cluster.ClusterType;
import com.cloud.org.Managed.ManagedState;
import com.cloud.resource.ResourceState;
-@ContextConfiguration(locations="classpath:/storageContext.xml")
+@ContextConfiguration(locations = "classpath:/storageContext.xml")
public class DirectAgentTest extends CloudStackTestNGBase {
@Inject
AgentManager agentMgr;
- @Inject
+ @Inject
HostDao hostDao;
@Inject
HostPodDao podDao;
@@ -65,7 +65,7 @@ public class DirectAgentTest extends CloudStackTestNGBase {
private long dcId;
private long clusterId;
private long hostId;
-
+
@Test(priority = -1)
public void setUp() {
HostVO host = hostDao.findByGuid(getHostGuid());
@@ -75,23 +75,24 @@ public class DirectAgentTest extends CloudStackTestNGBase {
clusterId = host.getClusterId();
return;
}
- //create data center
- DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24",
- null, null, NetworkType.Basic, null, null, true, true, null, null);
+ // create data center
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null,
+ "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, true, null, null);
dc = dcDao.persist(dc);
dcId = dc.getId();
- //create pod
+ // create pod
- HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), getHostGateway(), getHostCidr(), 8, "test");
+ HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), getHostGateway(), getHostCidr(), 8,
+ "test");
pod = podDao.persist(pod);
- //create xen cluster
+ // create xen cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(HypervisorType.XenServer.toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- //create xen host
+ // create xen host
host = new HostVO(getHostGuid());
host.setName("devcloud xen host");
@@ -109,7 +110,7 @@ public class DirectAgentTest extends CloudStackTestNGBase {
host = hostDao.persist(host);
hostId = host.getId();
}
-
+
@Test
public void testInitResource() {
ReadyCommand cmd = new ReadyCommand(dcId);
@@ -123,23 +124,24 @@ public class DirectAgentTest extends CloudStackTestNGBase {
e.printStackTrace();
}
}
-
+
@Test
public void testDownloadTemplate() {
ImageStoreTO image = Mockito.mock(ImageStoreTO.class);
PrimaryDataStoreTO primaryStore = Mockito.mock(PrimaryDataStoreTO.class);
Mockito.when(primaryStore.getUuid()).thenReturn(getLocalStorageUuid());
- //Mockito.when(image.get).thenReturn(primaryStore);
-
+ // Mockito.when(image.get).thenReturn(primaryStore);
+
ImageStoreTO imageStore = Mockito.mock(ImageStoreTO.class);
Mockito.when(imageStore.getProtocol()).thenReturn("http");
-
+
TemplateObjectTO template = Mockito.mock(TemplateObjectTO.class);
Mockito.when(template.getPath()).thenReturn(getTemplateUrl());
Mockito.when(template.getImageDataStore()).thenReturn(imageStore);
-
- //Mockito.when(image.getTemplate()).thenReturn(template);
- //CopyTemplateToPrimaryStorageCmd cmd = new CopyTemplateToPrimaryStorageCmd(image);
+
+ // Mockito.when(image.getTemplate()).thenReturn(template);
+ // CopyTemplateToPrimaryStorageCmd cmd = new
+ // CopyTemplateToPrimaryStorageCmd(image);
Command cmd = null;
try {
agentMgr.send(hostId, cmd);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHostEndpointRpcServerDirectCallResource.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHostEndpointRpcServerDirectCallResource.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHostEndpointRpcServerDirectCallResource.java
deleted file mode 100644
index 2e57ea9..0000000
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHostEndpointRpcServerDirectCallResource.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.storage.test;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Inject;
-
-import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
-import org.apache.cloudstack.storage.HostEndpointRpcServer;
-import org.apache.cloudstack.storage.RemoteHostEndPoint;
-import org.apache.log4j.Logger;
-
-import com.cloud.agent.AgentManager;
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.OperationTimedoutException;
-import com.cloud.utils.component.ComponentContext;
-
-
-public class MockHostEndpointRpcServerDirectCallResource implements HostEndpointRpcServer {
- private static final Logger s_logger = Logger.getLogger(MockHostEndpointRpcServerDirectCallResource.class);
- private ScheduledExecutorService executor;
- @Inject
- AgentManager agentMgr;
- public MockHostEndpointRpcServerDirectCallResource() {
- executor = Executors.newScheduledThreadPool(10);
- }
-
- public void sendCommandAsync(RemoteHostEndPoint host, final Command command, final AsyncCompletionCallback<Answer> callback) {
- // new MockRpcCallBack(host.getHostId(), command, callback);
- MockRpcCallBack run = ComponentContext.inject(MockRpcCallBack.class);
- run.setCallback(callback);
- run.setCmd(command);
- run.setHostId(host.getId());
- executor.schedule(run, 10, TimeUnit.SECONDS);
- }
-
- @Override
- public Answer sendCommand(RemoteHostEndPoint host, Command command) {
- Answer answer;
- try {
- answer = agentMgr.send(host.getId(), command);
- return answer;
- } catch (AgentUnavailableException e) {
- return null;
- } catch (OperationTimedoutException e) {
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java
deleted file mode 100644
index e659639..0000000
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.storage.test;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
-import org.apache.cloudstack.storage.HostEndpointRpcServer;
-import org.apache.cloudstack.storage.RemoteHostEndPoint;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-
-public class MockHypervisorHostEndPointRpcServer implements HostEndpointRpcServer {
- private ScheduledExecutorService executor;
- public MockHypervisorHostEndPointRpcServer() {
- executor = Executors.newScheduledThreadPool(10);
- }
-
- protected class MockRpcCallBack implements Runnable {
- private final Command cmd;
- private final AsyncCompletionCallback<Answer> callback;
- public MockRpcCallBack(Command cmd, final AsyncCompletionCallback<Answer> callback) {
- this.cmd = cmd;
- this.callback = callback;
- }
- @Override
- public void run() {
- try {
- Answer answer = new Answer(cmd, false, "unknown command");
- /*if (cmd instanceof CopyTemplateToPrimaryStorageCmd) {
- answer = new CopyTemplateToPrimaryStorageAnswer(cmd, UUID.randomUUID().toString());
- } else if (cmd instanceof CreateVolumeFromBaseImageCommand) {
- answer = new CreateVolumeAnswer(cmd, UUID.randomUUID().toString());
- }*/
-
- callback.complete(answer);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- }
-
- public void sendCommandAsync(RemoteHostEndPoint host, final Command command, final AsyncCompletionCallback<Answer> callback) {
- executor.schedule(new MockRpcCallBack(command, callback), 10, TimeUnit.SECONDS);
- }
-
- @Override
- public Answer sendCommand(RemoteHostEndPoint host, Command command) {
- // TODO Auto-generated method stub
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java
index 28a586f..26c1a63 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockLocalHostEndPoint.java
@@ -27,12 +27,13 @@ import com.cloud.agent.api.Command;
import com.cloud.agent.api.DeleteSnapshotBackupCommand;
public class MockLocalHostEndPoint extends LocalHostEndpoint {
- @Override
- public Answer sendMessage(Command cmd) {
- if ((cmd instanceof CopyCommand) || (cmd instanceof DownloadCommand) || (cmd instanceof DeleteSnapshotBackupCommand)) {
- return resource.executeRequest(cmd);
- }
- // TODO Auto-generated method stub
- return new Answer(cmd, false, "unsupported command:" + cmd.toString());
- }
+ @Override
+ public Answer sendMessage(Command cmd) {
+ if ((cmd instanceof CopyCommand) || (cmd instanceof DownloadCommand)
+ || (cmd instanceof DeleteSnapshotBackupCommand)) {
+ return resource.executeRequest(cmd);
+ }
+ // TODO Auto-generated method stub
+ return new Answer(cmd, false, "unsupported command:" + cmd.toString());
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java
index e0ffb48..60308da 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockRpcCallBack.java
@@ -32,20 +32,20 @@ public class MockRpcCallBack implements Runnable {
AgentManager agentMgr;
private Command cmd;
private long hostId;
- private AsyncCompletionCallback<Answer> callback;
-
+ private AsyncCompletionCallback<Answer> callback;
+
public void setCmd(Command cmd) {
this.cmd = cmd;
}
-
+
public void setHostId(long hostId) {
this.hostId = hostId;
}
-
+
public void setCallback(AsyncCompletionCallback<Answer> callback) {
this.callback = callback;
}
-
+
@Override
@DB
public void run() {
@@ -56,5 +56,5 @@ public class MockRpcCallBack implements Runnable {
s_logger.debug("send command failed:", e);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java
index edec977..52ccf41 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java
@@ -32,7 +32,6 @@ import com.cloud.host.Host;
public class MockStorageMotionStrategy implements DataMotionStrategy {
-
@Override
public boolean canHandle(DataObject srcData, DataObject destData) {
// TODO Auto-generated method stub
@@ -45,8 +44,7 @@ public class MockStorageMotionStrategy implements DataMotionStrategy {
}
@Override
- public Void copyAsync(DataObject srcData, DataObject destData,
- AsyncCompletionCallback<CopyCommandResult> callback) {
+ public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback<CopyCommandResult> callback) {
CopyCommandResult result = new CopyCommandResult("something", null);
callback.complete(result);
return null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java
index d88e6da..0bb724d 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/S3TemplateTest.java
@@ -42,6 +42,7 @@ import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDetailVO;
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
import org.apache.cloudstack.storage.image.datastore.ImageStoreHelper;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.Test;
@@ -59,42 +60,41 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.download.DownloadMonitorImpl;
import com.cloud.utils.component.ComponentContext;
-@ContextConfiguration(locations={"classpath:/storageContext.xml"})
-
+@ContextConfiguration(locations = { "classpath:/storageContext.xml" })
public class S3TemplateTest extends CloudStackTestNGBase {
- @Inject
- DataCenterDao dcDao;
- ImageStoreVO imageStore;
- ImageStoreDetailVO imageStoreDetail;
- @Inject
- ImageStoreDao imageStoreDao;
- @Inject
- TemplateService templateSvr;
- @Inject
- VMTemplateDao templateDao;
- @Inject
- TemplateDataFactory templateFactory;
- @Inject
- DataStoreManager dataStoreMgr;
- @Inject
- EndPointSelector epSelector;
- @Inject
- DownloadMonitorImpl downloadMonitor;
- @Inject
- ImageStoreHelper imageStoreHelper;
- @Inject
- StorageCacheManager cacheMgr;
- long dcId;
- long templateId;
+ @Inject
+ DataCenterDao dcDao;
+ ImageStoreVO imageStore;
+ ImageStoreDetailVO imageStoreDetail;
+ @Inject
+ ImageStoreDao imageStoreDao;
+ @Inject
+ TemplateService templateSvr;
+ @Inject
+ VMTemplateDao templateDao;
+ @Inject
+ TemplateDataFactory templateFactory;
+ @Inject
+ DataStoreManager dataStoreMgr;
+ @Inject
+ EndPointSelector epSelector;
+ @Inject
+ DownloadMonitorImpl downloadMonitor;
+ @Inject
+ ImageStoreHelper imageStoreHelper;
+ @Inject
+ StorageCacheManager cacheMgr;
+ long dcId;
+ long templateId;
- @Test(priority = -1)
- public void setUp() {
- ComponentContext.initComponentsLifeCycle();
- //create data center
- DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24",
- null, null, NetworkType.Basic, null, null, true, true, null, null);
- dc = dcDao.persist(dc);
- dcId = dc.getId();
+ @Test(priority = -1)
+ public void setUp() {
+ ComponentContext.initComponentsLifeCycle();
+ // create data center
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null,
+ "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, true, null, null);
+ dc = dcDao.persist(dc);
+ dcId = dc.getId();
// add s3 image store
Map<String, Object> sParams = new HashMap<String, Object>();
@@ -121,55 +121,54 @@ public class S3TemplateTest extends CloudStackTestNGBase {
cParams.put("zoneId", dcId);
this.imageStoreHelper.createImageStore(cParams);
+ VMTemplateVO image = new VMTemplateVO();
+ image.setTemplateType(TemplateType.SYSTEM);
+ image.setUrl(this.getTemplateUrl());
+ image.setUniqueName(UUID.randomUUID().toString());
+ image.setName(UUID.randomUUID().toString());
+ image.setPublicTemplate(false);
+ image.setFeatured(false);
+ image.setRequiresHvm(false);
+ image.setBits(64);
+ image.setFormat(Storage.ImageFormat.VHD);
+ image.setEnablePassword(false);
+ image.setEnableSshKey(false);
+ image.setGuestOSId(133);
+ image.setBootable(true);
+ image.setPrepopulate(true);
+ image.setCrossZones(true);
+ image.setExtractable(true);
+ image.setAccountId(2);
+ image = templateDao.persist(image);
+ templateId = image.getId();
- VMTemplateVO image = new VMTemplateVO();
- image.setTemplateType(TemplateType.SYSTEM);
- image.setUrl(this.getTemplateUrl());
- image.setUniqueName(UUID.randomUUID().toString());
- image.setName(UUID.randomUUID().toString());
- image.setPublicTemplate(false);
- image.setFeatured(false);
- image.setRequiresHvm(false);
- image.setBits(64);
- image.setFormat(Storage.ImageFormat.VHD);
- image.setEnablePassword(false);
- image.setEnableSshKey(false);
- image.setGuestOSId(133);
- image.setBootable(true);
- image.setPrepopulate(true);
- image.setCrossZones(true);
- image.setExtractable(true);
- image.setAccountId(2);
- image = templateDao.persist(image);
- templateId = image.getId();
-
- // inject mockito
- LocalHostEndpoint ep = new LocalHostEndpoint();
- ep.setResource(new MockLocalNfsSecondaryStorageResource());
- Mockito.when(epSelector.select(Mockito.any(DataObject.class))).thenReturn(ep);
- Mockito.when(epSelector.select(Mockito.any(DataStore.class))).thenReturn(ep);
- Mockito.when(epSelector.select(Mockito.any(DataObject.class), Mockito.any(DataObject.class))).thenReturn(ep);
- }
+ // inject mockito
+ LocalHostEndpoint ep = new LocalHostEndpoint();
+ ep.setResource(new MockLocalNfsSecondaryStorageResource());
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class))).thenReturn(ep);
+ Mockito.when(epSelector.select(Matchers.any(DataStore.class))).thenReturn(ep);
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class), Matchers.any(DataObject.class))).thenReturn(ep);
+ }
- @Test(priority = 1)
- public void registerTemplate() {
- TemplateInfo template = templateFactory.getTemplate(templateId, DataStoreRole.Image);
- DataStore store = dataStoreMgr.getImageStore(dcId);
- AsyncCallFuture<TemplateApiResult> future = new AsyncCallFuture<TemplateApiResult>();
- templateSvr.createTemplateAsync(template, store, future);
- try {
- TemplateApiResult result = future.get();
- assertTrue(result.isSuccess(), "failed to register template: " + result.getResult());
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- assertTrue(false, e.getMessage());
- } catch (ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- assertTrue(false, e.getMessage());
- }
- }
+ @Test(priority = 1)
+ public void registerTemplate() {
+ TemplateInfo template = templateFactory.getTemplate(templateId, DataStoreRole.Image);
+ DataStore store = dataStoreMgr.getImageStore(dcId);
+ AsyncCallFuture<TemplateApiResult> future = new AsyncCallFuture<TemplateApiResult>();
+ templateSvr.createTemplateAsync(template, store, future);
+ try {
+ TemplateApiResult result = future.get();
+ assertTrue(result.isSuccess(), "failed to register template: " + result.getResult());
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ assertTrue(false, e.getMessage());
+ } catch (ExecutionException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ assertTrue(false, e.getMessage());
+ }
+ }
@Test(priority = 2)
public void copyTemplateToCache() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
index 503b8d3..8210dfe 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
@@ -44,7 +44,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
-import org.apache.cloudstack.engine.subsystem.api.storage.type.RootDisk;
import org.apache.cloudstack.framework.async.AsyncCallFuture;
import org.apache.cloudstack.storage.LocalHostEndpoint;
import org.apache.cloudstack.storage.MockLocalNfsSecondaryStorageResource;
@@ -56,6 +55,7 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.testng.AssertJUnit;
@@ -97,7 +97,7 @@ import com.cloud.storage.dao.VMTemplateDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.utils.component.ComponentContext;
-@ContextConfiguration(locations={"classpath:/storageContext.xml"})
+@ContextConfiguration(locations = { "classpath:/storageContext.xml" })
public class SnapshotTest extends CloudStackTestNGBase {
@Inject
ImageStoreDao imageStoreDao;
@@ -142,7 +142,8 @@ public class SnapshotTest extends CloudStackTestNGBase {
ResourceManager resourceMgr;
@Inject
VolumeDataFactory volFactory;
- @Inject SnapshotDataFactory snapshotFactory;
+ @Inject
+ SnapshotDataFactory snapshotFactory;
@Inject
List<SnapshotStrategy> snapshotStrategies;
@Inject
@@ -158,6 +159,7 @@ public class SnapshotTest extends CloudStackTestNGBase {
VMTemplateVO image;
String imageStoreName = "testImageStore";
RemoteHostEndPoint remoteEp;
+
@Test(priority = -1)
public void setUp() {
ComponentContext.initComponentsLifeCycle();
@@ -169,24 +171,25 @@ public class SnapshotTest extends CloudStackTestNGBase {
podId = host.getPodId();
imageStore = this.imageStoreDao.findByName(imageStoreName);
} else {
- //create data center
- DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24",
- null, null, NetworkType.Basic, null, null, true, true, null, null);
+ // create data center
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null,
+ "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, true, null, null);
dc = dcDao.persist(dc);
dcId = dc.getId();
- //create pod
+ // create pod
- HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), this.getHostGateway(), this.getHostCidr(), 8, "test");
+ HostPodVO pod = new HostPodVO(UUID.randomUUID().toString(), dc.getId(), this.getHostGateway(),
+ this.getHostCidr(), 8, "test");
pod = podDao.persist(pod);
podId = pod.getId();
- //create xen cluster
+ // create xen cluster
ClusterVO cluster = new ClusterVO(dc.getId(), pod.getId(), "devcloud cluster");
cluster.setHypervisorType(this.getHypervisor().toString());
cluster.setClusterType(ClusterType.CloudManaged);
cluster.setManagedState(ManagedState.Managed);
cluster = clusterDao.persist(cluster);
clusterId = cluster.getId();
- //create xen host
+ // create xen host
host = new HostVO(this.getHostGuid());
host.setName("devcloud xen host");
@@ -235,16 +238,17 @@ public class SnapshotTest extends CloudStackTestNGBase {
image = imageDataDao.persist(image);
- /*TemplateDataStoreVO templateStore = new TemplateDataStoreVO();
-
- templateStore.setDataStoreId(imageStore.getId());
- templateStore.setDownloadPercent(100);
- templateStore.setDownloadState(Status.DOWNLOADED);
- templateStore.setDownloadUrl(imageStore.getUrl());
- templateStore.setInstallPath(this.getImageInstallPath());
- templateStore.setTemplateId(image.getId());
- templateStoreDao.persist(templateStore);*/
-
+ /*
+ * TemplateDataStoreVO templateStore = new TemplateDataStoreVO();
+ *
+ * templateStore.setDataStoreId(imageStore.getId());
+ * templateStore.setDownloadPercent(100);
+ * templateStore.setDownloadState(Status.DOWNLOADED);
+ * templateStore.setDownloadUrl(imageStore.getUrl());
+ * templateStore.setInstallPath(this.getImageInstallPath());
+ * templateStore.setTemplateId(image.getId());
+ * templateStoreDao.persist(templateStore);
+ */
DataStore store = this.dataStoreMgr.getDataStore(imageStore.getId(), DataStoreRole.Image);
TemplateInfo template = templateFactory.getTemplate(image.getId(), DataStoreRole.Image);
@@ -257,20 +261,24 @@ public class SnapshotTest extends CloudStackTestNGBase {
templateOnStore.processEvent(Event.CreateOnlyRequested);
templateOnStore.processEvent(Event.OperationSuccessed, answer);
-
}
@Override
protected void injectMockito() {
List<HostVO> hosts = new ArrayList<HostVO>();
hosts.add(this.host);
- Mockito.when(resourceMgr.listAllUpAndEnabledHosts((Type) Mockito.any(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(hosts);
-
- remoteEp = RemoteHostEndPoint.getHypervisorHostEndPoint(this.host.getId(), this.host.getPrivateIpAddress(), this.host.getPublicIpAddress());
- Mockito.when(epSelector.select(Mockito.any(DataObject.class), Mockito.any(DataObject.class))).thenReturn(remoteEp);
- Mockito.when(epSelector.select(Mockito.any(DataObject.class))).thenReturn(remoteEp);
- Mockito.when(epSelector.select(Mockito.any(DataStore.class))).thenReturn(remoteEp);
- Mockito.when(hyGuruMgr.getGuruProcessedCommandTargetHost(Mockito.anyLong(), Mockito.any(Command.class))).thenReturn(this.host.getId());
+ Mockito.when(
+ resourceMgr.listAllUpAndEnabledHosts((Type) Matchers.any(), Matchers.anyLong(), Matchers.anyLong(),
+ Matchers.anyLong())).thenReturn(hosts);
+
+ remoteEp = RemoteHostEndPoint.getHypervisorHostEndPoint(this.host.getId(), this.host.getPrivateIpAddress(),
+ this.host.getPublicIpAddress());
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class), Matchers.any(DataObject.class))).thenReturn(
+ remoteEp);
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class))).thenReturn(remoteEp);
+ Mockito.when(epSelector.select(Matchers.any(DataStore.class))).thenReturn(remoteEp);
+ Mockito.when(hyGuruMgr.getGuruProcessedCommandTargetHost(Matchers.anyLong(), Matchers.any(Command.class)))
+ .thenReturn(this.host.getId());
}
@@ -282,26 +290,27 @@ public class SnapshotTest extends CloudStackTestNGBase {
return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId());
}
- /*DataStoreProvider provider = dataStoreProviderMgr.getDataStoreProvider("cloudstack primary data store provider");
- Map<String, Object> params = new HashMap<String, Object>();
- URI uri = new URI(this.getPrimaryStorageUrl());
- params.put("url", this.getPrimaryStorageUrl());
- params.put("server", uri.getHost());
- params.put("path", uri.getPath());
- params.put("protocol", Storage.StoragePoolType.NetworkFilesystem);
- params.put("zoneId", dcId);
- params.put("clusterId", clusterId);
- params.put("name", this.primaryName);
- params.put("port", 1);
- params.put("podId", this.podId);
- params.put("roles", DataStoreRole.Primary.toString());
- params.put("uuid", uuid);
- params.put("providerName", String.valueOf(provider.getName()));
-
- DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
- DataStore store = lifeCycle.initialize(params);
- ClusterScope scope = new ClusterScope(clusterId, podId, dcId);
- lifeCycle.attachCluster(store, scope);*/
+ /*
+ * DataStoreProvider provider =
+ * dataStoreProviderMgr.getDataStoreProvider
+ * ("cloudstack primary data store provider"); Map<String, Object>
+ * params = new HashMap<String, Object>(); URI uri = new
+ * URI(this.getPrimaryStorageUrl()); params.put("url",
+ * this.getPrimaryStorageUrl()); params.put("server",
+ * uri.getHost()); params.put("path", uri.getPath());
+ * params.put("protocol",
+ * Storage.StoragePoolType.NetworkFilesystem); params.put("zoneId",
+ * dcId); params.put("clusterId", clusterId); params.put("name",
+ * this.primaryName); params.put("port", 1); params.put("podId",
+ * this.podId); params.put("roles",
+ * DataStoreRole.Primary.toString()); params.put("uuid", uuid);
+ * params.put("providerName", String.valueOf(provider.getName()));
+ *
+ * DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
+ * DataStore store = lifeCycle.initialize(params); ClusterScope
+ * scope = new ClusterScope(clusterId, podId, dcId);
+ * lifeCycle.attachCluster(store, scope);
+ */
StoragePoolVO pool = new StoragePoolVO();
pool.setClusterId(clusterId);
@@ -327,8 +336,9 @@ public class SnapshotTest extends CloudStackTestNGBase {
private SnapshotVO createSnapshotInDb(VolumeInfo volume) {
Snapshot.Type snapshotType = Snapshot.Type.MANUAL;
- SnapshotVO snapshotVO = new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID().toString(),
- (short) snapshotType.ordinal(), snapshotType.name(), volume.getSize(), HypervisorType.XenServer);
+ SnapshotVO snapshotVO = new SnapshotVO(volume.getDataCenterId(), 2, 1, volume.getId(), 1L, UUID.randomUUID()
+ .toString(), (short) snapshotType.ordinal(), snapshotType.name(), volume.getSize(),
+ HypervisorType.XenServer);
return this.snapshotDao.persist(snapshotVO);
}
@@ -341,14 +351,14 @@ public class SnapshotTest extends CloudStackTestNGBase {
return volume;
}
-
public VolumeInfo createCopyBaseImage() {
DataStore primaryStore = createPrimaryDataStore();
primaryStoreId = primaryStore.getId();
primaryStore = this.dataStoreMgr.getPrimaryDataStore(primaryStoreId);
VolumeVO volume = createVolume(image.getId(), primaryStore.getId());
VolumeInfo volInfo = this.volFactory.getVolume(volume.getId());
- AsyncCallFuture<VolumeApiResult> future = this.volumeService.createVolumeFromTemplateAsync(volInfo, this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image));
+ AsyncCallFuture<VolumeApiResult> future = this.volumeService.createVolumeFromTemplateAsync(volInfo,
+ this.primaryStoreId, this.templateFactory.getTemplate(this.image.getId(), DataStoreRole.Image));
VolumeApiResult result;
try {
@@ -372,27 +382,27 @@ public class SnapshotTest extends CloudStackTestNGBase {
SnapshotInfo newSnapshot = null;
for (SnapshotStrategy strategy : this.snapshotStrategies) {
if (strategy.canHandle(snapshot)) {
- newSnapshot = strategy.takeSnapshot(snapshot);
+ newSnapshot = strategy.takeSnapshot(snapshot);
}
}
AssertJUnit.assertNotNull(newSnapshot);
LocalHostEndpoint ep = new MockLocalHostEndPoint();
ep.setResource(new MockLocalNfsSecondaryStorageResource());
- Mockito.when(epSelector.select(Mockito.any(DataStore.class))).thenReturn(ep);
+ Mockito.when(epSelector.select(Matchers.any(DataStore.class))).thenReturn(ep);
- //delete snapshot
+ // delete snapshot
for (SnapshotStrategy strategy : this.snapshotStrategies) {
if (strategy.canHandle(snapshot)) {
- strategy.deleteSnapshot(newSnapshot.getId());
+ strategy.deleteSnapshot(newSnapshot.getId());
}
}
- Mockito.when(epSelector.select(Mockito.any(DataStore.class))).thenReturn(remoteEp);
+ Mockito.when(epSelector.select(Matchers.any(DataStore.class))).thenReturn(remoteEp);
}
private VMTemplateVO createTemplateInDb() {
- VMTemplateVO image = new VMTemplateVO();
+ VMTemplateVO image = new VMTemplateVO();
image.setTemplateType(TemplateType.USER);
image.setUniqueName(UUID.randomUUID().toString());
@@ -435,21 +445,21 @@ public class SnapshotTest extends CloudStackTestNGBase {
@Test
public void deleteSnapshot() {
- VolumeInfo vol = createCopyBaseImage();
+ VolumeInfo vol = createCopyBaseImage();
SnapshotVO snapshotVO = createSnapshotInDb(vol);
SnapshotInfo snapshot = this.snapshotFactory.getSnapshot(snapshotVO.getId(), vol.getDataStore());
SnapshotInfo newSnapshot = null;
for (SnapshotStrategy strategy : this.snapshotStrategies) {
if (strategy.canHandle(snapshot)) {
- newSnapshot = strategy.takeSnapshot(snapshot);
+ newSnapshot = strategy.takeSnapshot(snapshot);
}
}
AssertJUnit.assertNotNull(newSnapshot);
- //create another snapshot
+ // create another snapshot
for (SnapshotStrategy strategy : this.snapshotStrategies) {
if (strategy.canHandle(snapshot)) {
- strategy.deleteSnapshot(newSnapshot.getId());
+ strategy.deleteSnapshot(newSnapshot.getId());
}
}
@@ -471,12 +481,11 @@ public class SnapshotTest extends CloudStackTestNGBase {
AssertJUnit.assertTrue(result);
LocalHostEndpoint ep = new LocalHostEndpoint();
ep.setResource(new MockLocalNfsSecondaryStorageResource());
- Mockito.when(epSelector.select(Mockito.any(DataObject.class), Mockito.any(DataObject.class))).thenReturn(ep);
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class), Matchers.any(DataObject.class))).thenReturn(ep);
VMTemplateVO templateVO = createTemplateInDb();
TemplateInfo tmpl = this.templateFactory.getTemplate(templateVO.getId(), DataStoreRole.Image);
DataStore imageStore = this.dataStoreMgr.getImageStore(this.dcId);
this.imageService.createTemplateFromSnapshotAsync(snapshot, tmpl, imageStore);
}
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java
index 2ac6dac..53a6464 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageFactoryBean.java
@@ -16,16 +16,15 @@
// under the License.
package org.apache.cloudstack.storage.test;
-
import org.mockito.Mockito;
import org.springframework.beans.factory.FactoryBean;
/**
- * A {@link FactoryBean} for creating mocked beans based on Mockito so that they
+ * A {@link FactoryBean} for creating mocked beans based on Mockito so that they
* can be {@link @Autowired} into Spring test configurations.
- *
+ *
* @author Mattias Severson, Jayway
- *
+ *
* @see FactoryBean
* @see org.mockito.Mockito
*/
@@ -35,7 +34,9 @@ public class StorageFactoryBean<T> implements FactoryBean<T> {
/**
* Creates a Mockito mock instance of the provided class.
- * @param classToBeMocked The class to be mocked.
+ *
+ * @param classToBeMocked
+ * The class to be mocked.
*/
public StorageFactoryBean(Class<T> classToBeMocked) {
this.classToBeMocked = classToBeMocked;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java
index 0ee7fe0..5db3a0f 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/StorageTest.java
@@ -23,14 +23,13 @@ import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations="classpath:resource/storageContext.xml")
+@ContextConfiguration(locations = "classpath:resource/storageContext.xml")
public class StorageTest {
- @Test
- public void test() {
- fail("Not yet implemented");
- }
+ @Test
+ public void test() {
+ fail("Not yet implemented");
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java
index c84fee5..da4c17b 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TemplateTest.java
@@ -37,6 +37,7 @@ import org.apache.cloudstack.storage.LocalHostEndpoint;
import org.apache.cloudstack.storage.MockLocalNfsSecondaryStorageResource;
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.testng.annotations.Test;
@@ -46,97 +47,90 @@ import com.cloud.dc.DataCenter.NetworkType;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.Storage;
-import com.cloud.storage.TemplateProfile;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.Storage.TemplateType;
import com.cloud.storage.dao.VMTemplateDao;
-import com.cloud.storage.download.DownloadMonitor;
import com.cloud.storage.download.DownloadMonitorImpl;
-import com.cloud.template.HypervisorTemplateAdapter;
-import com.cloud.template.TemplateAdapter;
import com.cloud.utils.component.ComponentContext;
-@ContextConfiguration(locations={"classpath:/storageContext.xml"})
-
+@ContextConfiguration(locations = { "classpath:/storageContext.xml" })
public class TemplateTest extends CloudStackTestNGBase {
- @Inject
- DataCenterDao dcDao;
- ImageStoreVO imageStore;
- @Inject
- ImageStoreDao imageStoreDao;
- @Inject
- TemplateService templateSvr;
- @Inject
- VMTemplateDao templateDao;
- @Inject
- TemplateDataFactory templateFactory;
- @Inject
- DataStoreManager dataStoreMgr;
- @Inject
- EndPointSelector epSelector;
- @Inject
- DownloadMonitorImpl downloadMonitor;
-
-
- long dcId;
- long templateId;
-
- @Test(priority = -1)
- public void setUp() {
- ComponentContext.initComponentsLifeCycle();
-
- //create data center
- DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24",
- null, null, NetworkType.Basic, null, null, true, true, null, null);
- dc = dcDao.persist(dc);
- dcId = dc.getId();
-
- imageStore = new ImageStoreVO();
- imageStore.setName("test");
- imageStore.setDataCenterId(dcId);
- imageStore.setProviderName(DataStoreProvider.NFS_IMAGE);
- imageStore.setRole(DataStoreRole.Image);
- imageStore.setUrl(this.getSecondaryStorage());
- imageStore.setUuid(UUID.randomUUID().toString());
- imageStore.setProtocol("nfs");
- imageStore = imageStoreDao.persist(imageStore);
-
- VMTemplateVO image = new VMTemplateVO();
- image.setTemplateType(TemplateType.USER);
- image.setUrl(this.getTemplateUrl());
- image.setUniqueName(UUID.randomUUID().toString());
- image.setName(UUID.randomUUID().toString());
- image.setPublicTemplate(true);
- image.setFeatured(true);
- image.setRequiresHvm(true);
- image.setBits(64);
- image.setFormat(Storage.ImageFormat.VHD);
- image.setEnablePassword(true);
- image.setEnableSshKey(true);
- image.setGuestOSId(1);
- image.setBootable(true);
- image.setPrepopulate(true);
- image.setCrossZones(true);
- image.setExtractable(true);
-
-
- //image.setImageDataStoreId(storeId);
- image = templateDao.persist(image);
- templateId = image.getId();
+ @Inject
+ DataCenterDao dcDao;
+ ImageStoreVO imageStore;
+ @Inject
+ ImageStoreDao imageStoreDao;
+ @Inject
+ TemplateService templateSvr;
+ @Inject
+ VMTemplateDao templateDao;
+ @Inject
+ TemplateDataFactory templateFactory;
+ @Inject
+ DataStoreManager dataStoreMgr;
+ @Inject
+ EndPointSelector epSelector;
+ @Inject
+ DownloadMonitorImpl downloadMonitor;
+
+ long dcId;
+ long templateId;
+
+ @Test(priority = -1)
+ public void setUp() {
+ ComponentContext.initComponentsLifeCycle();
+
+ // create data center
+ DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null,
+ "10.0.0.1/24", null, null, NetworkType.Basic, null, null, true, true, null, null);
+ dc = dcDao.persist(dc);
+ dcId = dc.getId();
+
+ imageStore = new ImageStoreVO();
+ imageStore.setName("test");
+ imageStore.setDataCenterId(dcId);
+ imageStore.setProviderName(DataStoreProvider.NFS_IMAGE);
+ imageStore.setRole(DataStoreRole.Image);
+ imageStore.setUrl(this.getSecondaryStorage());
+ imageStore.setUuid(UUID.randomUUID().toString());
+ imageStore.setProtocol("nfs");
+ imageStore = imageStoreDao.persist(imageStore);
+
+ VMTemplateVO image = new VMTemplateVO();
+ image.setTemplateType(TemplateType.USER);
+ image.setUrl(this.getTemplateUrl());
+ image.setUniqueName(UUID.randomUUID().toString());
+ image.setName(UUID.randomUUID().toString());
+ image.setPublicTemplate(true);
+ image.setFeatured(true);
+ image.setRequiresHvm(true);
+ image.setBits(64);
+ image.setFormat(Storage.ImageFormat.VHD);
+ image.setEnablePassword(true);
+ image.setEnableSshKey(true);
+ image.setGuestOSId(1);
+ image.setBootable(true);
+ image.setPrepopulate(true);
+ image.setCrossZones(true);
+ image.setExtractable(true);
+
+ // image.setImageDataStoreId(storeId);
+ image = templateDao.persist(image);
+ templateId = image.getId();
// inject mockito
LocalHostEndpoint ep = new LocalHostEndpoint();
ep.setResource(new MockLocalNfsSecondaryStorageResource());
- Mockito.when(epSelector.select(Mockito.any(DataObject.class))).thenReturn(ep);
- Mockito.when(epSelector.select(Mockito.any(DataStore.class))).thenReturn(ep);
- }
+ Mockito.when(epSelector.select(Matchers.any(DataObject.class))).thenReturn(ep);
+ Mockito.when(epSelector.select(Matchers.any(DataStore.class))).thenReturn(ep);
+ }
- @Test
- public void registerTemplate() {
- TemplateInfo template = templateFactory.getTemplate(templateId, DataStoreRole.Image);
- DataStore store = dataStoreMgr.getImageStore(dcId);
- AsyncCallFuture<TemplateApiResult> future = new AsyncCallFuture<TemplateApiResult>();
- templateSvr.createTemplateAsync(template, store, future);
+ @Test
+ public void registerTemplate() {
+ TemplateInfo template = templateFactory.getTemplate(templateId, DataStoreRole.Image);
+ DataStore store = dataStoreMgr.getImageStore(dcId);
+ AsyncCallFuture<TemplateApiResult> future = new AsyncCallFuture<TemplateApiResult>();
+ templateSvr.createTemplateAsync(template, store, future);
try {
TemplateApiResult result = future.get();
assertTrue(result.isSuccess(), "failed to register template: " + result.getResult());
@@ -147,11 +141,11 @@ public class TemplateTest extends CloudStackTestNGBase {
} catch (ExecutionException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- assertTrue(false, e.getMessage());
+ assertTrue(false, e.getMessage());
}
- }
+ }
- // @Test
+ // @Test
public void deleteTemplate() {
TemplateInfo template = templateFactory.getTemplate(templateId, DataStoreRole.Image);
DataStore store = dataStoreMgr.getImageStore(dcId);
@@ -167,7 +161,7 @@ public class TemplateTest extends CloudStackTestNGBase {
} catch (ExecutionException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- assertTrue(false, e.getMessage());
+ assertTrue(false, e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java
index 8b10f7e..11d4931 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestHttp.java
@@ -22,28 +22,21 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.channels.FileChannel;
-
import junit.framework.Assert;
import org.apache.commons.httpclient.HttpException;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.impl.client.DefaultHttpClient;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
import org.testng.annotations.Parameters;
-@ContextConfiguration(locations="classpath:/storageContext.xml")
+@ContextConfiguration(locations = "classpath:/storageContext.xml")
public class TestHttp extends AbstractTestNGSpringContextTests {
@Test
@Parameters("template-url")
@@ -59,13 +52,13 @@ public class TestHttp extends AbstractTestNGSpringContextTests {
System.out.println(response.getFirstHeader("Content-Length").getValue());
File localFile = new File("/tmp/test");
if (!localFile.exists()) {
- localFile.createNewFile();
+ localFile.createNewFile();
}
-
+
HttpGet getMethod = new HttpGet(templateUrl);
response = client.execute(getMethod);
HttpEntity entity = response.getEntity();
-
+
output = new BufferedOutputStream(new FileOutputStream(localFile));
entity.writeTo(output);
} catch (HttpException e) {
@@ -83,7 +76,7 @@ public class TestHttp extends AbstractTestNGSpringContextTests {
e.printStackTrace();
}
}
-
+
File f = new File("/tmp/test");
Assert.assertEquals(f.length(), length);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java
index b3ecd3c..e85c3d8 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNG.java
@@ -20,12 +20,11 @@ import junit.framework.Assert;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
-import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
import com.cloud.utils.db.DB;
-@ContextConfiguration(locations="classpath:/storageContext.xml")
+
+@ContextConfiguration(locations = "classpath:/storageContext.xml")
public class TestNG extends AbstractTestNGSpringContextTests {
@Test
@DB
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0a522892/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java
index 130ecd2..515c5c8 100644
--- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java
+++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/TestNGAop.java
@@ -31,8 +31,7 @@ import com.cloud.utils.db.Transaction;
public class TestNGAop implements IMethodInterceptor {
@Override
- public List<IMethodInstance> intercept(List<IMethodInstance> methods,
- ITestContext context) {
+ public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) {
for (IMethodInstance methodIns : methods) {
ITestNGMethod method = methodIns.getMethod();
ConstructorOrMethod meth = method.getConstructorOrMethod();
@@ -44,8 +43,7 @@ public class TestNGAop implements IMethodInterceptor {
}
}
}
-
-
+
// TODO Auto-generated method stub
return methods;
}