You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/10/13 14:56:21 UTC
[1/3] jclouds git commit: Better order for the ComputeService live
tests
Repository: jclouds
Updated Branches:
refs/heads/master 50e6d4443 -> 3b726b568
Better order for the ComputeService live tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6cd22b0a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6cd22b0a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6cd22b0a
Branch: refs/heads/master
Commit: 6cd22b0ae25377ef1f75dc495d4c70095407b915
Parents: 50e6d44
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Oct 13 10:47:36 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Oct 13 15:06:49 2016 +0200
----------------------------------------------------------------------
.../internal/BaseComputeServiceLiveTest.java | 48 ++++++++++++--------
1 file changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6cd22b0a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
index 462300d..0b53e63 100644
--- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
@@ -54,7 +54,6 @@ import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.io.IOException;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -347,7 +346,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
ComputeTestUtils.checkHttpGet(view.utils().http(), node, 8080);
}
- @Test(enabled = true, dependsOnMethods = "testConcurrentUseOfComputeServiceToCreateNodes")
+ @Test(enabled = true, dependsOnMethods = "testCreateTwoNodesWithOneSpecifiedName")
public void testCreateTwoNodesWithRunScript() throws Exception {
try {
client.destroyNodesMatching(inGroup(group));
@@ -377,21 +376,20 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
checkOsMatchesTemplate(node2);
}
- @Test(enabled = true, dependsOnMethods = "testCreateTwoNodesWithRunScript")
+ @Test(enabled = true, dependsOnMethods = "testDestroyNodes", alwaysRun = true)
public void testCreateTwoNodesWithOneSpecifiedName() throws Exception {
template = buildTemplate(templateBuilder());
template.getOptions().nodeNames(ImmutableSet.of("first-node"));
- Set<? extends NodeMetadata> nodes;
try {
- nodes = newTreeSet(client.createNodesInGroup(group, 2, template));
+ this.nodes = newTreeSet(client.createNodesInGroup(group, 2, template));
} catch (RunNodesException e) {
- nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
+ this.nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
throw e;
}
- assertEquals(nodes.size(), 2, "expected two nodes but was " + nodes);
- NodeMetadata node1 = Iterables.getFirst(nodes, null);
- NodeMetadata node2 = Iterables.getLast(nodes, null);
+ assertEquals(this.nodes.size(), 2, "expected two nodes but was " + nodes);
+ NodeMetadata node1 = Iterables.getFirst(this.nodes, null);
+ NodeMetadata node2 = Iterables.getLast(this.nodes, null);
// credentials aren't always the same
// assertEquals(node1.getCredentials(), node2.getCredentials());
@@ -399,13 +397,11 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
"one node should be named 'first-node'");
assertFalse(node1.getName().equals("first-node") && node2.getName().equals("first-node"),
"one node should be named something other than 'first-node");
-
- this.nodes = newTreeSet(concat(this.nodes, nodes));
}
protected Template refreshTemplate() {
return template = addRunScriptToTemplate(buildTemplate(templateBuilder()));
- }
+ }
protected Template addRunScriptToTemplate(Template template) {
template.getOptions().runScript(Statements.newStatementList(AdminAccess.standard(), InstallJDK.fromOpenJDK()));
@@ -432,8 +428,18 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
}
}
- @Test(enabled = true, dependsOnMethods = "testCreateTwoNodesWithOneSpecifiedName")
+ @Test(enabled = true, dependsOnMethods = "testCreateTwoNodesWithRunScript", alwaysRun = true)
public void testCreateAnotherNodeWithANewContextToEnsureSharedMemIsntRequired() throws Exception {
+ if (this.nodes == null || this.nodes.isEmpty()) {
+ template = buildTemplate(templateBuilder());
+ try {
+ nodes = newTreeSet(client.createNodesInGroup(group, 1, template));
+ } catch (RunNodesException e) {
+ nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
+ throw e;
+ }
+ }
+
initializeContext();
Location existingLocation = Iterables.get(this.nodes, 0).getLocation();
@@ -541,8 +547,16 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
return templateBuilder.build();
}
- @Test(enabled = true, dependsOnMethods = "testCreateAnotherNodeWithANewContextToEnsureSharedMemIsntRequired")
+ @Test(enabled = true)
public void testGet() throws Exception {
+ template = buildTemplate(templateBuilder());
+ try {
+ nodes = newTreeSet(client.createNodesInGroup(group, 1, template));
+ } catch (RunNodesException e) {
+ nodes = newTreeSet(concat(e.getSuccessfulNodes(), e.getNodeErrors().keySet()));
+ throw e;
+ }
+
Map<String, ? extends NodeMetadata> metadataMap = newLinkedHashMap(uniqueIndex(
filter(client.listNodesDetailsMatching(all()), and(inGroup(group), not(TERMINATED))),
new Function<NodeMetadata, String>() {
@@ -568,12 +582,6 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
assertEquals(metadata.getPublicAddresses().size(), node.getPublicAddresses().size(), format(
"[%s] didn't match: [%s]", metadata.getPublicAddresses(), node.getPublicAddresses().size()));
}
- assertNodeZero(metadataMap.values());
- }
-
- protected void assertNodeZero(Collection<? extends NodeMetadata> metadataSet) {
- assert metadataSet.size() == 0 : format("nodes left in set: [%s] which didn't match set: [%s]", metadataSet,
- nodes);
}
@Test(enabled = true, dependsOnMethods = "testGet")
[2/3] jclouds git commit: Proper template config in the image
extension live tests
Posted by na...@apache.org.
Proper template config in the image extension live tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cce44958
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cce44958
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cce44958
Branch: refs/heads/master
Commit: cce449587289d7333afe4f8e095bb64367255adb
Parents: 6cd22b0
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Oct 13 12:29:14 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Oct 13 15:06:50 2016 +0200
----------------------------------------------------------------------
.../compute/extensions/EC2ImageExtensionLiveTest.java | 6 +++---
.../extensions/internal/BaseImageExtensionLiveTest.java | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cce44958/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
index be8abb6..f80bcdf 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/extensions/EC2ImageExtensionLiveTest.java
@@ -26,7 +26,7 @@ import java.util.Set;
import org.jclouds.collect.Memoized;
import org.jclouds.compute.domain.Image;
-import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.domain.TemplateBuilderSpec;
import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest;
@@ -95,8 +95,8 @@ public class EC2ImageExtensionLiveTest extends BaseImageExtensionLiveTest {
}
@Override
- public Template getNodeTemplate() {
- return view.getComputeService().templateBuilder().from(ebsTemplate).build();
+ public TemplateBuilder getNodeTemplate() {
+ return getNodeTemplate().from(ebsTemplate);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cce44958/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
index 878768e..0e2e77a 100644
--- a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
@@ -35,6 +35,7 @@ import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.ImageTemplate;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
+import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.extensions.ImageExtension;
import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest;
import org.jclouds.compute.reference.ComputeServiceConstants;
@@ -66,8 +67,8 @@ public abstract class BaseImageExtensionLiveTest extends BaseComputeServiceConte
*
* @return
*/
- public Template getNodeTemplate() {
- return view.getComputeService().templateBuilder().build();
+ public TemplateBuilder getNodeTemplate() {
+ return view.getComputeService().templateBuilder();
}
/**
@@ -96,7 +97,7 @@ public abstract class BaseImageExtensionLiveTest extends BaseComputeServiceConte
Optional<ImageExtension> imageExtension = computeService.getImageExtension();
assertTrue(imageExtension.isPresent(), "image extension was not present");
- Template template = getNodeTemplate();
+ Template template = getNodeTemplate().build();
NodeMetadata node = Iterables.getOnlyElement(computeService.createNodesInGroup(imageGroup, 1, template));
checkReachable(node);
@@ -128,10 +129,9 @@ public abstract class BaseImageExtensionLiveTest extends BaseComputeServiceConte
Optional<? extends Image> optImage = getImage();
assertTrue(optImage.isPresent());
- NodeMetadata node = Iterables.getOnlyElement(computeService.createNodesInGroup(imageGroup, 1, view
- .getComputeService()
+ NodeMetadata node = Iterables.getOnlyElement(computeService.createNodesInGroup(imageGroup, 1, getNodeTemplate()
// fromImage does not use the arg image's id (but we do need to set location)
- .templateBuilder().imageId(optImage.get().getId()).fromImage(optImage.get()).build()));
+ .imageId(optImage.get().getId()).fromImage(optImage.get()).build()));
checkReachable(node);
view.getComputeService().destroyNode(node.getId());
[3/3] jclouds git commit: Fix DigitalOcean2 live tests
Posted by na...@apache.org.
Fix DigitalOcean2 live tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3b726b56
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3b726b56
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3b726b56
Branch: refs/heads/master
Commit: 3b726b5686656882c4f876ec48f69aa4fa9c4ae2
Parents: cce4495
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Oct 13 15:06:17 2016 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Oct 13 15:06:50 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/jclouds/digitalocean2/domain/Action.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3b726b56/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Action.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Action.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Action.java
index b800105..f484781 100644
--- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Action.java
+++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/domain/Action.java
@@ -54,14 +54,14 @@ public abstract class Action {
public abstract String type();
public abstract Date startedAt();
@Nullable public abstract Date completedAt();
- public abstract Integer resourceId();
+ public abstract long resourceId();
public abstract String resourceType();
@Nullable public abstract Region region();
@Nullable public abstract String regionSlug();
@SerializedNames({ "id", "status", "type", "started_at", "completed_at", "resource_id", "resource_type",
"region", "region_slug" })
- public static Action create(int id, Status status, String type, Date startedAt, Date completedAt, int resourceId,
+ public static Action create(int id, Status status, String type, Date startedAt, Date completedAt, long resourceId,
String resourceType, Region region, String regionSlug) {
return new AutoValue_Action(id, status, type, startedAt, completedAt, resourceId, resourceType, region,
regionSlug);