You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/08/11 18:20:07 UTC
[2/2] jclouds git commit: [SoftLayer] fix some failing LiveTests
[SoftLayer] fix some failing LiveTests
fix VirtualGuestBlockDeviceTemplateGroupApiLiveTest
fix SoftLayerComputeServiceLiveTest
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/10f72f07
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/10f72f07
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/10f72f07
Branch: refs/heads/master
Commit: 10f72f07314e630f5efee4b7023f956c39b1f49f
Parents: 1163b94
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Jul 29 17:42:21 2015 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Tue Aug 11 18:15:40 2015 +0200
----------------------------------------------------------------------
.../functions/OperatingSystemToImage.java | 1 -
.../functions/VirtualGuestToNodeMetadata.java | 4 +--
.../SoftLayerComputeServiceContextLiveTest.java | 26 +++-----------------
.../features/VirtualGuestApiLiveTest.java | 3 +--
4 files changed, 6 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/10f72f07/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java
index 62b8b60..c435352 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/OperatingSystemToImage.java
@@ -84,7 +84,6 @@ public class OperatingSystemToImage implements Function<OperatingSystem, Image>
return new ImageBuilder()
.ids(optOSReferenceCode.or(operatingSystem.getId()))
- //.ids(operatingSystem.getId())
.description(optOSReferenceCode.or(UNRECOGNIZED))
.operatingSystem(os)
.status(Image.Status.AVAILABLE)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/10f72f07/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
index b6c78dd..470fb76 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
@@ -96,9 +96,7 @@ public class VirtualGuestToNodeMetadata implements Function<VirtualGuest, NodeMe
// TODO simplify once we move domain classes to AutoValue
if (from.getOperatingSystem() != null && from.getOperatingSystem().getPasswords() != null && !from.getOperatingSystem().getPasswords().isEmpty()) {
Password password = Iterables.getOnlyElement(from.getOperatingSystem().getPasswords());
- if (password != null) {
- builder.credentials(LoginCredentials.builder().identity(password.getUsername()).credential(password.getPassword()).build());
- }
+ builder.credentials(LoginCredentials.builder().identity(password.getUsername()).credential(password.getPassword()).build());
}
if (from.getTagReferences() != null && !from.getTagReferences().isEmpty()) {
List<String> tags = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/10f72f07/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java
index eecc868..d9e2f51 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceContextLiveTest.java
@@ -22,25 +22,18 @@ import java.util.Set;
import javax.annotation.Resource;
import javax.inject.Named;
-import org.jclouds.ContextBuilder;
-import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.RunNodesException;
-import org.jclouds.compute.domain.ComputeMetadata;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
-import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
-import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
import org.jclouds.softlayer.compute.options.SoftLayerTemplateOptions;
import org.jclouds.ssh.SshClient;
-import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
@Test(groups = "live", testName = "SoftLayerComputeServiceContextLiveTest")
public class SoftLayerComputeServiceContextLiveTest extends BaseComputeServiceContextLiveTest {
@@ -57,14 +50,7 @@ public class SoftLayerComputeServiceContextLiveTest extends BaseComputeServiceCo
public void testLaunchClusterWithDomainName() throws RunNodesException {
int numNodes = 1;
final String name = "node";
- ComputeServiceContext context = ContextBuilder.newBuilder("softlayer").credentials(identity, credential)
- .modules(ImmutableSet.of(new SLF4JLoggingModule(),
- new SshjSshClientModule()))
- .build(ComputeServiceContext.class);
-
- TemplateBuilder templateBuilder = context.getComputeService().templateBuilder();
-
- Template template = templateBuilder.build();
+ Template template = view.getComputeService().templateBuilder().build();
// test passing custom options
SoftLayerTemplateOptions options = template.getOptions().as(SoftLayerTemplateOptions.class);
options.domainName("live.org");
@@ -72,19 +58,15 @@ public class SoftLayerComputeServiceContextLiveTest extends BaseComputeServiceCo
//tags
options.tags(ImmutableList.of("jclouds"));
- for (ComputeMetadata computeMetadata : context.getComputeService().listNodes()) {
- System.out.println(context.getComputeService().getNodeMetadata(computeMetadata.getId()).getStatus());
- }
-
- Set<? extends NodeMetadata> nodes = context.getComputeService().createNodesInGroup(name, numNodes, template);
+ Set<? extends NodeMetadata> nodes = view.getComputeService().createNodesInGroup(name, numNodes, template);
assertEquals(numNodes, nodes.size(), "wrong number of nodes");
for (NodeMetadata node : nodes) {
logger.debug("Created Node: %s", node);
- SshClient client = context.utils().sshForNode().apply(node);
+ SshClient client = view.utils().sshForNode().apply(node);
client.connect();
ExecResponse hello = client.exec("mount");
logger.debug(hello.getOutput().trim());
- context.getComputeService().destroyNode(node.getId());
+ view.getComputeService().destroyNode(node.getId());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/10f72f07/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java
index 24f76e9..3e7b161 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/VirtualGuestApiLiveTest.java
@@ -31,7 +31,6 @@ import org.jclouds.softlayer.domain.Datacenter;
import org.jclouds.softlayer.domain.OperatingSystem;
import org.jclouds.softlayer.domain.TagReference;
import org.jclouds.softlayer.domain.VirtualGuest;
-import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -63,7 +62,7 @@ public class VirtualGuestApiLiveTest extends BaseSoftLayerApiLiveTest {
super.setup();
virtualGuestApi = api.getVirtualGuestApi();
datacenter = Iterables.get(api.getDatacenterApi().listDatacenters(), 0);
- if (datacenter == null) Assert.fail();
+ assertNotNull(datacenter, "Datacenter must not be null");
}
@AfterClass(groups = {"integration", "live"})