Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes in live tests

This commit is contained in:
vicglarson 2011-04-21 20:12:31 +04:00 committed by Dmitri Babaev
parent d065f61b92
commit 78db8f1bfc
7 changed files with 118 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/NovaImageToImageTest.java
View File

@ -18,12 +18,7 @@
*/ */
package org.jclouds.openstack.nova.compute.functions; package org.jclouds.openstack.nova.compute.functions;
import static org.testng.Assert.assertEquals; import com.google.inject.Guice;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import org.jclouds.compute.config.BaseComputeServiceContextModule; import org.jclouds.compute.config.BaseComputeServiceContextModule;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageBuilder; import org.jclouds.compute.domain.ImageBuilder;
@ -36,7 +31,11 @@ import org.jclouds.json.config.GsonModule;
import org.jclouds.openstack.nova.functions.ParseImageFromJsonResponseTest; import org.jclouds.openstack.nova.functions.ParseImageFromJsonResponseTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.inject.Guice; import java.net.URI;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import static org.testng.Assert.assertEquals;
/** /**
* @author Adrian Cole * @author Adrian Cole
@ -53,7 +52,7 @@ public class NovaImageToImageTest {
.build()).description("CentOS 5.2").defaultCredentials(new Credentials("root", null)) .build()).description("CentOS 5.2").defaultCredentials(new Credentials("root", null))
.ids("1").version("1286712000000").uri(new URI("https://servers.api.rackspacecloud.com/v1.1/1234/images/1")).build(); .ids("1").version("1286712000000").uri(new URI("https://servers.api.rackspacecloud.com/v1.1/1234/images/1")).build();
Image parsedImage = convertImage(); Image parsedImage = convertImage();
assertEquals(parsedImage, image); assertEquals(parsedImage, image);
} }

105
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/ServerToNodeMetadataTest.java
View File

@ -18,25 +18,11 @@
*/ */
package org.jclouds.openstack.nova.compute.functions; package org.jclouds.openstack.nova.compute.functions;
import static org.testng.Assert.assertEquals; import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableList;
import java.net.URI; import com.google.common.collect.ImmutableMap;
import java.net.URISyntaxException; import com.google.common.collect.ImmutableSet;
import java.net.UnknownHostException; import org.jclouds.compute.domain.*;
import java.util.Map;
import java.util.Set;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.HardwareBuilder;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeMetadataBuilder;
import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Processor;
import org.jclouds.compute.domain.Volume;
import org.jclouds.compute.domain.VolumeBuilder;
import org.jclouds.domain.Credentials; import org.jclouds.domain.Credentials;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.domain.LocationBuilder; import org.jclouds.domain.LocationBuilder;
@ -47,10 +33,13 @@ import org.jclouds.openstack.nova.domain.ServerStatus;
import org.jclouds.openstack.nova.functions.ParseServerFromJsonResponseTest; import org.jclouds.openstack.nova.functions.ParseServerFromJsonResponseTest;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Suppliers; import java.net.URI;
import com.google.common.collect.ImmutableList; import java.net.URISyntaxException;
import com.google.common.collect.ImmutableMap; import java.net.UnknownHostException;
import com.google.common.collect.ImmutableSet; import java.util.Map;
import java.util.Set;
import static org.testng.Assert.assertEquals;
/** /**
* @author Adrian Cole * @author Adrian Cole
@ -93,26 +82,26 @@ public class ServerToNodeMetadataTest {
NodeMetadata metadata = parser.apply(server); NodeMetadata metadata = parser.apply(server);
NodeMetadata constructedMetadata = newNodeMetadataBuilder().build(); NodeMetadata constructedMetadata = newNodeMetadataBuilder().build();
assertEquals(metadata, constructedMetadata); assertEquals(metadata, constructedMetadata);
} }
private NodeMetadataBuilder newNodeMetadataBuilder() throws URISyntaxException { private NodeMetadataBuilder newNodeMetadataBuilder() throws URISyntaxException {
return new NodeMetadataBuilder() return new NodeMetadataBuilder()
.state(NodeState.PENDING) .state(NodeState.PENDING)
.publicAddresses(ImmutableSet.of("67.23.10.132", "::babe:67.23.10.132", "67.23.10.131", "::babe:4317:0A83")) .publicAddresses(ImmutableSet.of("67.23.10.132", "::babe:67.23.10.132", "67.23.10.131", "::babe:4317:0A83"))
.privateAddresses(ImmutableSet.of("10.176.42.16", "::babe:10.176.42.16")) .privateAddresses(ImmutableSet.of("10.176.42.16", "::babe:10.176.42.16"))
.id("1234") .id("1234")
.providerId("1234") .providerId("1234")
.name("sample-server") .name("sample-server")
.location(new LocationBuilder() .location(new LocationBuilder()
.scope(LocationScope.HOST) .scope(LocationScope.HOST)
.id("e4d909c290d0fb1ca068ffaddf22cbd0") .id("e4d909c290d0fb1ca068ffaddf22cbd0")
.description("e4d909c290d0fb1ca068ffaddf22cbd0") .description("e4d909c290d0fb1ca068ffaddf22cbd0")
.parent(provider).build()) .parent(provider).build())
.userMetadata(ImmutableMap.of("Server Label", "Web Head 1", "Image Version", "2.1")) .userMetadata(ImmutableMap.of("Server Label", "Web Head 1", "Image Version", "2.1"))
.uri(new URI("http://servers.api.openstack.org/1234/servers/1234")); .uri(new URI("http://servers.api.openstack.org/1234/servers/1234"));
} }
@Test @Test
@ -137,7 +126,7 @@ public class ServerToNodeMetadataTest {
.version("5.2") .version("5.2")
.is64Bit(true).build()) .is64Bit(true).build())
.build(); .build();
assertEquals(metadata, constructedMetadata); assertEquals(metadata, constructedMetadata);
} }
@ -154,27 +143,27 @@ public class ServerToNodeMetadataTest {
.ofInstance(provider), Suppliers.<Set<? extends Hardware>>ofInstance(hardwares)); .ofInstance(provider), Suppliers.<Set<? extends Hardware>>ofInstance(hardwares));
NodeMetadata metadata = parser.apply(server); NodeMetadata metadata = parser.apply(server);
NodeMetadata constructedMetadata = newNodeMetadataBuilder() NodeMetadata constructedMetadata = newNodeMetadataBuilder()
.imageId("1") .imageId("1")
.operatingSystem(new OperatingSystem.Builder() .operatingSystem(new OperatingSystem.Builder()
.family(OsFamily.CENTOS) .family(OsFamily.CENTOS)
.description("CentOS 5.2") .description("CentOS 5.2")
.version("5.2") .version("5.2")
.is64Bit(true).build()) .is64Bit(true).build())
.hardware(new HardwareBuilder() .hardware(new HardwareBuilder()
.ids("1") .ids("1")
.name("256 MB Server") .name("256 MB Server")
.processors(ImmutableList.of(new Processor(1.0, 1.0))) .processors(ImmutableList.of(new Processor(1.0, 1.0)))
.ram(256) .ram(256)
.volumes(ImmutableList.of(new VolumeBuilder() .volumes(ImmutableList.of(new VolumeBuilder()
.type(Volume.Type.LOCAL) .type(Volume.Type.LOCAL)
.size(10.0f) .size(10.0f)
.durable(true) .durable(true)
.bootDevice(true).build())) .bootDevice(true).build()))
.uri(new URI("http://servers.api.openstack.org/1234/flavors/1")) .uri(new URI("http://servers.api.openstack.org/1234/flavors/1"))
.build()) .build())
.build(); .build();
assertEquals(metadata, constructedMetadata); assertEquals(metadata, constructedMetadata);
} }

19
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/domain/ServerStatusTest.java
View File

@ -19,18 +19,17 @@
package org.jclouds.openstack.nova.domain; package org.jclouds.openstack.nova.domain;
import static junit.framework.Assert.assertTrue; import com.google.common.collect.Lists;
import static org.testng.Assert.assertEquals; import com.google.common.collect.Sets;
import static org.testng.Assert.assertFalse; import org.testng.annotations.Test;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.testng.annotations.Test; import static junit.framework.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
import com.google.common.collect.Lists; import static org.testng.Assert.assertFalse;
import com.google.common.collect.Sets;
/** /**
* Tests behavior of {@code CreateImageBinder} * Tests behavior of {@code CreateImageBinder}
@ -53,11 +52,11 @@ public class ServerStatusTest {
List<String> allStatuses = Lists.newArrayList(knownStatuses); List<String> allStatuses = Lists.newArrayList(knownStatuses);
allStatuses.add("UNRECOGNIZED"); allStatuses.add("UNRECOGNIZED");
Set<ServerStatus> enumValues = Sets.newHashSet(ServerStatus.values()); Set<ServerStatus> enumValues = Sets.newHashSet(ServerStatus.values());
assertEquals(enumValues.size(), allStatuses.size()); assertEquals(enumValues.size(), allStatuses.size());
for (String status : allStatuses) { for (String status : allStatuses) {
assertTrue(enumValues.contains(ServerStatus.valueOf(status))); assertTrue(enumValues.contains(ServerStatus.valueOf(status)));
} }

40
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseServerFromJsonResponseTest.java
View File

@ -18,17 +18,13 @@
*/ */
package org.jclouds.openstack.nova.functions; package org.jclouds.openstack.nova.functions;
import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.io.InputStream; import com.google.common.collect.Iterables;
import java.net.UnknownHostException; import com.google.inject.Guice;
import java.text.ParseException; import com.google.inject.Injector;
import java.text.SimpleDateFormat; import com.google.inject.Key;
import java.util.HashSet; import com.google.inject.TypeLiteral;
import java.util.List;
import java.util.Locale;
import java.util.SimpleTimeZone;
import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponse;
import org.jclouds.http.functions.UnwrapOnlyJsonValue; import org.jclouds.http.functions.UnwrapOnlyJsonValue;
import org.jclouds.io.Payloads; import org.jclouds.io.Payloads;
@ -39,13 +35,16 @@ import org.jclouds.openstack.nova.domain.Server;
import org.jclouds.openstack.nova.domain.ServerStatus; import org.jclouds.openstack.nova.domain.ServerStatus;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList; import java.io.InputStream;
import com.google.common.collect.ImmutableMap; import java.net.UnknownHostException;
import com.google.common.collect.Iterables; import java.text.ParseException;
import com.google.inject.Guice; import java.text.SimpleDateFormat;
import com.google.inject.Injector; import java.util.HashSet;
import com.google.inject.Key; import java.util.List;
import com.google.inject.TypeLiteral; import java.util.Locale;
import java.util.SimpleTimeZone;
import static org.testng.Assert.assertEquals;
/** /**
* Tests behavior of {@code ParseServerFromJsonResponse} * Tests behavior of {@code ParseServerFromJsonResponse}
@ -99,8 +98,9 @@ public class ParseServerFromJsonResponseTest {
InputStream is = ParseServerFromJsonResponseTest.class.getResourceAsStream("/test_get_server_detail.json"); InputStream is = ParseServerFromJsonResponseTest.class.getResourceAsStream("/test_get_server_detail.json");
UnwrapOnlyJsonValue<Server> parser = i.getInstance(Key.get(new TypeLiteral<UnwrapOnlyJsonValue<Server>>() {})); UnwrapOnlyJsonValue<Server> parser = i.getInstance(Key.get(new TypeLiteral<UnwrapOnlyJsonValue<Server>>() {
}));
return (Server) parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(is))); return (Server) parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(is)));
} }

23
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/DeleteServersInVariousStatesLiveTest.java
View File

@ -21,7 +21,6 @@ package org.jclouds.openstack.nova.live;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.jclouds.http.HttpResponseException;
import org.jclouds.net.IPSocket; import org.jclouds.net.IPSocket;
import org.jclouds.openstack.nova.NovaClient; import org.jclouds.openstack.nova.NovaClient;
import org.jclouds.openstack.nova.domain.Server; import org.jclouds.openstack.nova.domain.Server;
@ -32,8 +31,6 @@ import org.testng.annotations.Test;
import java.util.Map; import java.util.Map;
import static org.jclouds.openstack.nova.options.CreateServerOptions.Builder.withFile;
/** /**
* @author Victor Galkin * @author Victor Galkin
*/ */
@ -53,26 +50,6 @@ public class DeleteServersInVariousStatesLiveTest {
Map<String, String> metadata = ImmutableMap.of("jclouds", "rackspace"); Map<String, String> metadata = ImmutableMap.of("jclouds", "rackspace");
Server server = null; Server server = null;
@Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = ".*Internal Server Error.*")
public void testCreateServerWithUnknownImage() throws Exception {
try {
server = client.createServer("serverName", String.valueOf(88888888), "1", withFile("/etc/jclouds.txt",
"rackspace".getBytes()).withMetadata(metadata));
} catch (HttpResponseException e) {
throw e;
}
}
@Test(expectedExceptions = HttpResponseException.class, expectedExceptionsMessageRegExp = ".*Internal Server Error.*")
public void testCreateServerWithUnknownFlavor() throws Exception {
try {
server = client.createServer("serverName", String.valueOf(13), "88888888", withFile("/etc/jclouds.txt",
"rackspace".getBytes()).withMetadata(metadata));
} catch (HttpResponseException e) {
throw e;
}
}
@AfterMethod @AfterMethod
public void after() { public void after() {
if (server != null) client.deleteServer(server.getId()); if (server != null) client.deleteServer(server.getId());

8
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/NovaClientLiveTest.java
View File

@ -64,6 +64,7 @@ import static org.testng.Assert.*;
@Test(groups = "live", sequential = true) @Test(groups = "live", sequential = true)
public class NovaClientLiveTest { public class NovaClientLiveTest {
private int testImageId = 95;
protected NovaClient client; protected NovaClient client;
protected SshClient.Factory sshFactory; protected SshClient.Factory sshFactory;
private Predicate<IPSocket> socketTester; private Predicate<IPSocket> socketTester;
@ -75,6 +76,7 @@ public class NovaClientLiveTest {
Map<String, String> metadata = ImmutableMap.of("jclouds", "rackspace"); Map<String, String> metadata = ImmutableMap.of("jclouds", "rackspace");
private int createdImageId; private int createdImageId;
@BeforeTest @BeforeTest
public void setupClient() throws IOException { public void setupClient() throws IOException {
Properties properties = setupOverrides(setupProperties(this.getClass())); Properties properties = setupOverrides(setupProperties(this.getClass()));
@ -228,7 +230,7 @@ public class NovaClientLiveTest {
@Test(enabled = true) @Test(enabled = true)
public void testCreateServer() throws Exception { public void testCreateServer() throws Exception {
String imageRef = client.getImage(95).getURI().toASCIIString(); String imageRef = client.getImage(testImageId).getURI().toASCIIString();
String flavorRef = client.getFlavor(1).getURI().toASCIIString(); String flavorRef = client.getFlavor(1).getURI().toASCIIString();
String serverName = serverPrefix + "createserver" + new SecureRandom().nextInt(); String serverName = serverPrefix + "createserver" + new SecureRandom().nextInt();
Server server = client.createServer(serverName, imageRef, flavorRef, withFile("/etc/jclouds.txt", Server server = client.createServer(serverName, imageRef, flavorRef, withFile("/etc/jclouds.txt",
@ -290,7 +292,7 @@ public class NovaClientLiveTest {
assertEquals(server.getMetadata(), metadata); assertEquals(server.getMetadata(), metadata);
assertEquals(server.getImageRef(), "endpoint" + "/v1.1/images/95"); assertTrue(server.getImageRef().endsWith(String.valueOf(testImageId)));
// listAddresses tests.. // listAddresses tests..
assertEquals(client.getAddresses(serverId), server.getAddresses()); assertEquals(client.getAddresses(serverId), server.getAddresses());
assertEquals(server.getAddresses().getPublicAddresses().size(), 1); assertEquals(server.getAddresses().getPublicAddresses().size(), 1);
@ -298,7 +300,7 @@ public class NovaClientLiveTest {
assertEquals(server.getAddresses().getPrivateAddresses().size(), 1); assertEquals(server.getAddresses().getPrivateAddresses().size(), 1);
assertEquals(client.listPrivateAddresses(serverId), server.getAddresses().getPrivateAddresses()); assertEquals(client.listPrivateAddresses(serverId), server.getAddresses().getPrivateAddresses());
assertPassword(server, adminPass); assertPassword(server, adminPass);
assertEquals(server.getFlavorRef(), "endpoint" + "/v1.1/flavors/1"); assertTrue(server.getFlavorRef().endsWith("1"));
assert server.getProgress() >= 0 : "newDetails.getProgress()" + server.getProgress(); assert server.getProgress() >= 0 : "newDetails.getProgress()" + server.getProgress();
} }

62
sandbox-apis/nova/src/test/java/org/jclouds/openstack/nova/live/NovaComputeServiceLiveTest.java
View File

@ -92,7 +92,7 @@ public class NovaComputeServiceLiveTest {
protected ComputeServiceContext context; protected ComputeServiceContext context;
protected ComputeService computeService; protected ComputeService computeService;
protected Template template;
protected Map<String, String> keyPair; protected Map<String, String> keyPair;
protected String provider; protected String provider;
@ -218,10 +218,13 @@ public class NovaComputeServiceLiveTest {
@Test(enabled = true, expectedExceptions = AuthorizationException.class) @Test(enabled = true, expectedExceptions = AuthorizationException.class)
public void testCorrectAuthException() throws Exception { public void testCorrectAuthException() throws Exception {
Properties properties = new Properties();
properties.putAll(overrides);
properties.remove(provider + ".identity");
ComputeServiceContext context = null; ComputeServiceContext context = null;
try { try {
context = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider, "MOMMA", "MIA", ImmutableSet context = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider, "MOMMA", "MIA", ImmutableSet
.<Module>of(new SLF4JLoggingModule()), overrides); .<Module>of(new SLF4JLoggingModule()), properties);
context.getComputeService().listNodes(); context.getComputeService().listNodes();
} finally { } finally {
if (context != null) if (context != null)
@ -328,16 +331,16 @@ public class NovaComputeServiceLiveTest {
} }
} }
@Test(enabled = true, dependsOnMethods = {"testImagesCache"}) @Test(enabled = true)
public void testTemplateMatch() throws Exception { public void testTemplateMatch() throws Exception {
template = buildTemplate(computeService.templateBuilder()); Template template = buildTemplate(getDefaultTemplateBuilder());
Template toMatch = computeService.templateBuilder().imageId(template.getImage().getId()).build(); Template toMatch = computeService.templateBuilder().imageId(template.getImage().getId()).build();
assertEquals(toMatch.getImage(), template.getImage()); assertEquals(toMatch.getImage(), template.getImage());
} }
protected void checkHttpGet(NodeMetadata node) { // protected void checkHttpGet(NodeMetadata node) {
ComputeTestUtils.checkHttpGet(context.utils().http(), node, 8080); // ComputeTestUtils.checkHttpGet(context.utils().http(), node, 8080);
} // }
@Test(enabled = true, dependsOnMethods = "testCompareSizes") @Test(enabled = true, dependsOnMethods = "testCompareSizes")
public void testCreateTwoNodesWithRunScript() throws Exception { public void testCreateTwoNodesWithRunScript() throws Exception {
@ -346,9 +349,9 @@ public class NovaComputeServiceLiveTest {
} catch (NoSuchElementException e) { } catch (NoSuchElementException e) {
} }
refreshTemplate();
try { try {
nodes = newTreeSet(computeService.createNodesInGroup(group, 2, template)); nodes = newTreeSet(computeService.createNodesInGroup(group, 2, getDefaultTemplateBuilder().build()));
} catch (RunNodesException e) { } catch (RunNodesException e) {
nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet())); nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
throw e; throw e;
@ -360,30 +363,23 @@ public class NovaComputeServiceLiveTest {
// credentials aren't always the same // credentials aren't always the same
// assertEquals(node1.getCredentials(), node2.getCredentials()); // assertEquals(node1.getCredentials(), node2.getCredentials());
assertLocationSameOrChild(node1.getLocation(), template.getLocation()); assertLocationSameOrChild(node1.getLocation(), getDefaultTemplateBuilder().build().getLocation());
assertLocationSameOrChild(node2.getLocation(), template.getLocation()); assertLocationSameOrChild(node2.getLocation(), getDefaultTemplateBuilder().build().getLocation());
checkImageIdMatchesTemplate(node1); checkImageIdMatchesTemplate(node1);
checkImageIdMatchesTemplate(node2); checkImageIdMatchesTemplate(node2);
checkOsMatchesTemplate(node1); checkOsMatchesTemplate(node1);
checkOsMatchesTemplate(node2); checkOsMatchesTemplate(node2);
} }
private void refreshTemplate() {
template = buildTemplate(computeService.templateBuilder());
template.getOptions().installPrivateKey(keyPair.get("private")).authorizePublicKey(keyPair.get("public"))
.runScript(buildScript(template.getImage().getOperatingSystem()));
}
protected void checkImageIdMatchesTemplate(NodeMetadata node) { protected void checkImageIdMatchesTemplate(NodeMetadata node) {
if (node.getImageId() != null) if (node.getImageId() != null)
assertEquals(node.getImageId(), template.getImage().getId()); assertEquals(node.getImageId(), getDefaultTemplateBuilder().build().getImage().getId());
} }
protected void checkOsMatchesTemplate(NodeMetadata node) { protected void checkOsMatchesTemplate(NodeMetadata node) {
if (node.getOperatingSystem() != null) if (node.getOperatingSystem() != null)
assert node.getOperatingSystem().getFamily().equals(template.getImage().getOperatingSystem().getFamily()) : String assert node.getOperatingSystem().getFamily().equals(getDefaultTemplateBuilder().build().getImage().getOperatingSystem().getFamily()) : String
.format("expecting family %s but got %s", template.getImage().getOperatingSystem().getFamily(), node .format("expecting family %s but got %s", getDefaultTemplateBuilder().build().getImage().getOperatingSystem().getFamily(), node
.getOperatingSystem()); .getOperatingSystem());
} }
@ -395,16 +391,17 @@ public class NovaComputeServiceLiveTest {
} }
} }
@Test(enabled = true, dependsOnMethods = "testCreateTwoNodesWithRunScript") @Test(enabled = true)
public void testCreateAnotherNodeWithANewContextToEnsureSharedMemIsntRequired() throws Exception { public void testCreateAnotherNodeWithANewContextToEnsureSharedMemIsntRequired() throws Exception {
testCreateTwoNodesWithRunScript();
initializeContextAndClient(overrides); initializeContextAndClient(overrides);
refreshTemplate();
TreeSet<NodeMetadata> nodes = newTreeSet(computeService.createNodesInGroup(group, 1, template)); TreeSet<NodeMetadata> nodes = newTreeSet(computeService.createNodesInGroup(group, 1, getDefaultTemplateBuilder().build()));
checkNodes(nodes, group); checkNodes(nodes, group);
NodeMetadata node = nodes.first(); NodeMetadata node = nodes.first();
this.nodes.add(node); this.nodes.add(node);
assertEquals(nodes.size(), 1); assertEquals(nodes.size(), 1);
assertLocationSameOrChild(node.getLocation(), template.getLocation()); assertLocationSameOrChild(node.getLocation(), getDefaultTemplateBuilder().build().getLocation());
checkOsMatchesTemplate(node); checkOsMatchesTemplate(node);
} }
@ -444,7 +441,7 @@ public class NovaComputeServiceLiveTest {
NodeMetadata metadata = computeService.getNodeMetadata(node.getId()); NodeMetadata metadata = computeService.getNodeMetadata(node.getId());
assertEquals(metadata.getProviderId(), node.getProviderId()); assertEquals(metadata.getProviderId(), node.getProviderId());
assertEquals(metadata.getGroup(), node.getGroup()); assertEquals(metadata.getGroup(), node.getGroup());
assertLocationSameOrChild(metadata.getLocation(), template.getLocation()); assertLocationSameOrChild(metadata.getLocation(), getDefaultTemplateBuilder().build().getLocation());
checkImageIdMatchesTemplate(metadata); checkImageIdMatchesTemplate(metadata);
checkOsMatchesTemplate(metadata); checkOsMatchesTemplate(metadata);
assert (metadata.getState() == NodeState.RUNNING) : metadata; assert (metadata.getState() == NodeState.RUNNING) : metadata;
@ -544,24 +541,25 @@ public class NovaComputeServiceLiveTest {
} }
template = getDefaultTemplateBuilder().options(blockOnComplete(false).inboundPorts(22, 8080)) Template template = getDefaultTemplateBuilder().options(blockOnComplete(false).inboundPorts(22, 8080))
.build(); .build();
// note this is a dependency on the template resolution // note this is a dependency on the template resolution
template.getOptions().runScript( // template.getOptions().runScript(
RunScriptData.createScriptInstallAndStartJBoss(keyPair.get("public"), template.getImage() // RunScriptData.createScriptInstallAndStartJBoss(keyPair.get("public"), template.getImage()
.getOperatingSystem())); // .getOperatingSystem()));
try { try {
NodeMetadata node = getOnlyElement(computeService.createNodesInGroup(group, 1, template)); NodeMetadata node = getOnlyElement(computeService.createNodesInGroup(group, 1, template));
checkHttpGet(node); //checkHttpGet(node);
} finally { } finally {
computeService.destroyNodesMatching(inGroup(group)); computeService.destroyNodesMatching(inGroup(group));
} }
} }
@Test(enabled = true/* , dependsOnMethods = "testCompareSizes" */) @Test(enabled = true)
public void testTemplateOptions() throws Exception { public void testTemplateOptions() throws Exception {
TemplateOptions options = new TemplateOptions().withMetadata(); TemplateOptions options = new TemplateOptions().withMetadata();
Template t = computeService.templateBuilder().smallest().options(options).build(); Template t = computeService.templateBuilder().smallest().options(options).build();