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 10:29:24 UTC
jclouds git commit: Proper template config in the image extension
live tests
Repository: jclouds
Updated Branches:
refs/heads/fix/AzureTemplateBuilderLiveTest 47375dd2f -> fed593b4f
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/fed593b4
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/fed593b4
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/fed593b4
Branch: refs/heads/fix/AzureTemplateBuilderLiveTest
Commit: fed593b4f9a233f1d1f989a71171ae79afca81f4
Parents: 47375dd
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 12:29:14 2016 +0200
----------------------------------------------------------------------
.../extensions/internal/BaseImageExtensionLiveTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/fed593b4/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());