mirror of
https://github.com/apache/jclouds.git
synced 2025-02-17 23:46:13 +00:00
keys for live tests are loaded from the classpath
This commit is contained in:
parent
01706954dd
commit
7717a97466
@ -18,18 +18,18 @@
|
|||||||
*/
|
*/
|
||||||
package org.jclouds.openstack.nova.live;
|
package org.jclouds.openstack.nova.live;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
|
||||||
import com.google.common.io.Files;
|
|
||||||
import org.jclouds.Constants;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import org.jclouds.Constants;
|
||||||
|
|
||||||
|
import com.google.common.base.Charsets;
|
||||||
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import com.google.common.io.Resources;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Victor Galkin
|
* @author Victor Galkin
|
||||||
*/
|
*/
|
||||||
@ -44,8 +44,8 @@ public class PropertyHelper {
|
|||||||
|
|
||||||
public static Map<String, String> setupKeyPair(Properties properties) throws FileNotFoundException, IOException {
|
public static Map<String, String> setupKeyPair(Properties properties) throws FileNotFoundException, IOException {
|
||||||
return ImmutableMap.<String, String>of(
|
return ImmutableMap.<String, String>of(
|
||||||
"private", Files.toString(new File(properties.getProperty("test.ssh.keyfile.private")), Charsets.UTF_8),
|
"private", Resources.toString(Resources.getResource(properties.getProperty("test.ssh.keyfile.private")), Charsets.UTF_8),
|
||||||
"public", Files.toString(new File(properties.getProperty("test.ssh.keyfile.public")), Charsets.UTF_8));
|
"public", Resources.toString(Resources.getResource(properties.getProperty("test.ssh.keyfile.public")), Charsets.UTF_8));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Properties setupProperties(Class<?> clazz) throws IOException {
|
public static Properties setupProperties(Class<?> clazz) throws IOException {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user