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

Read "smp:cores" instead of "smp"

This commit is contained in:
Mattias Holmqvist 2011-09-08 16:16:33 +02:00
parent 78511b74f3
commit fd1a5dd04c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apis/elasticstack/src/main/java/org/jclouds/elasticstack/functions/MapToServerInfo.java
View File

@ -36,13 +36,14 @@ import org.jclouds.elasticstack.domain.VNC;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import org.jclouds.rest.annotations.ApiVersion;
/** /**
*
* @author Adrian Cole * @author Adrian Cole
*/ */
@Singleton @Singleton
public class MapToServerInfo implements Function<Map<String, String>, ServerInfo> { public class MapToServerInfo implements Function<Map<String, String>, ServerInfo> {
private String apiVersion;
private final Function<Map<String, String>, Map<String, ? extends Device>> mapToDevices; private final Function<Map<String, String>, Map<String, ? extends Device>> mapToDevices;
private final Function<Map<String, String>, ServerMetrics> mapToMetrics; private final Function<Map<String, String>, ServerMetrics> mapToMetrics;
private final Function<Map<String, String>, List<NIC>> mapToNICs; private final Function<Map<String, String>, List<NIC>> mapToNICs;
@ -50,6 +51,7 @@ public class MapToServerInfo implements Function<Map<String, String>, ServerInfo
@Inject @Inject
public MapToServerInfo(Function<Map<String, String>, Map<String, ? extends Device>> mapToDevices, public MapToServerInfo(Function<Map<String, String>, Map<String, ? extends Device>> mapToDevices,
Function<Map<String, String>, ServerMetrics> mapToMetrics, Function<Map<String, String>, List<NIC>> mapToNICs) { Function<Map<String, String>, ServerMetrics> mapToMetrics, Function<Map<String, String>, List<NIC>> mapToNICs) {
this.apiVersion = apiVersion;
this.mapToDevices = mapToDevices; this.mapToDevices = mapToDevices;
this.mapToMetrics = mapToMetrics; this.mapToMetrics = mapToMetrics;
this.mapToNICs = mapToNICs; this.mapToNICs = mapToNICs;
@ -67,8 +69,12 @@ public class MapToServerInfo implements Function<Map<String, String>, ServerInfo
if (from.containsKey("status")) if (from.containsKey("status"))
builder.status(ServerStatus.fromValue(from.get("status"))); builder.status(ServerStatus.fromValue(from.get("status")));
if (from.containsKey("smp") && !"auto".equals(from.get("smp")))
if (from.containsKey("smp:cores")) {
builder.smp(new Integer(from.get("smp:cores")));
} else if (from.containsKey("smp") && !"auto".equals(from.get("smp"))) {
builder.smp(new Integer(from.get("smp"))); builder.smp(new Integer(from.get("smp")));
}
builder.cpu(Integer.parseInt(from.get("cpu"))); builder.cpu(Integer.parseInt(from.get("cpu")));
builder.mem(Integer.parseInt(from.get("mem"))); builder.mem(Integer.parseInt(from.get("mem")));