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

Merge branch 'master' of github.com:jclouds/jclouds into 1.5.x 

* 'master' of github.com:jclouds/jclouds:
  better name
This commit is contained in:
Adrian Cole 2012-06-16 19:06:49 -04:00
parent 8900413995 39e21ad652
commit 1511ddf248
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/joyent-sdc/src/main/java/org/jclouds/joyent/sdc/v6_5/compute/functions/MachineInDatacenterToNodeMetadata.java
View File

@ -47,7 +47,7 @@ import org.jclouds.joyent.sdc.v6_5.domain.Machine;
import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.DatacenterAndId; import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.DatacenterAndId;
import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.DatacenterAndName; import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.DatacenterAndName;
import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.MachineInDatacenter; import org.jclouds.joyent.sdc.v6_5.domain.datacenterscoped.MachineInDatacenter;
import org.jclouds.joyent.sdc.v6_5.reference.MetadataKeys; import org.jclouds.joyent.sdc.v6_5.reference.Metadata;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import org.jclouds.util.InetAddresses2; import org.jclouds.util.InetAddresses2;
@ -101,7 +101,7 @@ public class MachineInDatacenterToNodeMetadata implements Function<MachineInData
@Override @Override
public boolean apply(String input) { public boolean apply(String input) {
// TODO make this more efficient // TODO make this more efficient
for (MetadataKeys key : MetadataKeys.values()) for (Metadata key : Metadata.values())
if (key.key().equals(input)) if (key.key().equals(input))
return false; return false;
return true; return true;

4
labs/joyent-sdc/src/main/java/org/jclouds/joyent/sdc/v6_5/domain/Machine.java
View File

@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.jclouds.domain.JsonBall; import org.jclouds.domain.JsonBall;
import org.jclouds.joyent.sdc.v6_5.reference.MetadataKeys; import org.jclouds.joyent.sdc.v6_5.reference.Metadata;
import org.jclouds.json.Json; import org.jclouds.json.Json;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
@ -248,7 +248,7 @@ public class Machine implements Comparable<Machine> {
* If the value is a string, it will be quoted, as that's how json strings are represented. * If the value is a string, it will be quoted, as that's how json strings are represented.
* *
* @return key to a json literal of the value * @return key to a json literal of the value
* @see MetadataKeys#valueType * @see Metadata#valueType
* @see Json#fromJson * @see Json#fromJson
*/ */
public Map<String, String> getMetadataAsJsonLiterals() { public Map<String, String> getMetadataAsJsonLiterals() {

4
labs/joyent-sdc/src/main/java/org/jclouds/joyent/sdc/v6_5/reference/MetadataKeys.java → labs/joyent-sdc/src/main/java/org/jclouds/joyent/sdc/v6_5/reference/Metadata.java
View File

@ -29,7 +29,7 @@ import com.google.common.reflect.TypeToken;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
public enum MetadataKeys { public enum Metadata {
ROOT_AUTHORIZED_KEYS(TypeToken.of(String.class).getType()), ROOT_AUTHORIZED_KEYS(TypeToken.of(String.class).getType()),
/** /**
* If the dataset you create a machine from is set to generate passwords for * If the dataset you create a machine from is set to generate passwords for
@ -49,7 +49,7 @@ public enum MetadataKeys {
private final Type valueType; private final Type valueType;
MetadataKeys(Type valueType) { Metadata(Type valueType) {
this.valueType = valueType; this.valueType = valueType;
} }

4
labs/joyent-sdc/src/test/java/org/jclouds/joyent/sdc/v6_5/features/MachineClientLiveTest.java
View File

@ -33,7 +33,7 @@ import org.jclouds.joyent.sdc.v6_5.domain.Key;
import org.jclouds.joyent.sdc.v6_5.domain.Machine; import org.jclouds.joyent.sdc.v6_5.domain.Machine;
import org.jclouds.joyent.sdc.v6_5.internal.BaseSDCClientLiveTest; import org.jclouds.joyent.sdc.v6_5.internal.BaseSDCClientLiveTest;
import org.jclouds.joyent.sdc.v6_5.options.CreateMachineOptions; import org.jclouds.joyent.sdc.v6_5.options.CreateMachineOptions;
import org.jclouds.joyent.sdc.v6_5.reference.MetadataKeys; import org.jclouds.joyent.sdc.v6_5.reference.Metadata;
import org.jclouds.predicates.InetSocketAddressConnect; import org.jclouds.predicates.InetSocketAddressConnect;
import org.jclouds.predicates.RetryablePredicate; import org.jclouds.predicates.RetryablePredicate;
import org.jclouds.ssh.SshClient; import org.jclouds.ssh.SshClient;
@ -123,7 +123,7 @@ public class MachineClientLiveTest extends BaseSDCClientLiveTest {
assertEquals(newMachine.getMetadata().get("foo").toString(), "bar"); assertEquals(newMachine.getMetadata().get("foo").toString(), "bar");
assertTrue( assertTrue(
newMachine.getMetadata().get(MetadataKeys.ROOT_AUTHORIZED_KEYS.key()).indexOf(key.get("public")) != -1, newMachine.getMetadata().get(Metadata.ROOT_AUTHORIZED_KEYS.key()).indexOf(key.get("public")) != -1,
newMachine + "; key: " + key.get("public")); newMachine + "; key: " + key.get("public"));
assertTrue(machineRunning.apply(newMachine), newMachine.toString()); assertTrue(machineRunning.apply(newMachine), newMachine.toString());