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

Fixed issue with list os-families on joyent specifically smart-os ones 

The code was checking if the third option of the urn sdc:sdc:percona which was incorrect for some os types.  This has been fixed
This commit is contained in:
Ryan Stradling 2013-02-01 15:51:41 -05:00
parent 678454c8ad
commit def3eab274
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/functions/DatasetToOperatingSystem.java
View File

@ -55,16 +55,23 @@ public class DatasetToOperatingSystem implements Function<Dataset, OperatingSyst
builder.name(from.getName());
builder.description(from.getUrn());
builder.is64Bit(true);// TODO: verify
String os = from.getOs();
OsFamily family = UNRECOGNIZED;
String version = "";
List<String> pieces = ImmutableList.copyOf(Splitter.on(':').split(from.getUrn()));
if (pieces.get(2).indexOf('-') != -1) {
List<String> osFamVersion = ImmutableList.copyOf(Splitter.on('-').split(pieces.get(2)));
family = fromValue(osFamVersion.get(0));
if (family != UNRECOGNIZED)
version = osFamVersion.get(1);
} else {
family = fromValue(pieces.get(2));
if (os.compareTo("smartos") == 0) {
family = fromValue(os);
version = from.getVersion();
}
else {
List<String> pieces = ImmutableList.copyOf(Splitter.on(':').split(from.getUrn()));
if (pieces.get(2).indexOf('-') != -1) {
List<String> osFamVersion = ImmutableList.copyOf(Splitter.on('-').split(pieces.get(2)));
family = fromValue(osFamVersion.get(0));
if (family != UNRECOGNIZED)
version = osFamVersion.get(1);
} else {
family = fromValue(pieces.get(2));
}
}
builder.family(family);
if (family != UNRECOGNIZED)