Merge branch 'master' of git://github.com/jclouds/jclouds

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToHardware.java

@@ -51,6 +51,6 @@ public class IMachineToHardware implements Function<IMachine, Hardware> {
       hardwareBuilder.ids(vm.getId());
       vm.getSessionPid();
       hardwareBuilder.is64Bit(is64Bit);
-      return null;
+      return hardwareBuilder.build();
    }
 }

sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToImage.java

@@ -21,19 +21,89 @@
 
 package org.jclouds.virtualbox.functions;
 
-import com.google.common.base.Function;
+import java.util.NoSuchElementException;
+
+import javax.inject.Inject;
+
 import org.jclouds.compute.domain.Image;
 import org.jclouds.compute.domain.ImageBuilder;
+import org.jclouds.compute.domain.OperatingSystem;
+import org.jclouds.compute.domain.OsFamily;
 import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.virtualbox.VirtualBox;
+import org.virtualbox_4_1.IGuestOSType;
 import org.virtualbox_4_1.IMachine;
+import org.virtualbox_4_1.VirtualBoxManager;
+
+import com.google.common.base.Function;
 
 
 public class IMachineToImage implements Function<IMachine, Image> {
 
+	private static final String UBUNTU  = "Ubuntu Linux";
+
+	private VirtualBoxManager virtualboxManager;
+
+	@Inject
+	public IMachineToImage(VirtualBoxManager virtualboxManager) {
+		this.virtualboxManager = virtualboxManager;
+	}
+
 	@Override
-   public Image apply(@Nullable IMachine vm) {
+	public Image apply(@Nullable IMachine from) {
-      ImageBuilder imageBuilder = new ImageBuilder();
+
-      imageBuilder.ids(vm.getId());
+		Boolean is64Bit = virtualboxManager.getVBox().getGuestOSType(from.getOSTypeId()).getIs64Bit();
-      return null;
+
+		//Somehow this method gets called with the correct product item.
+		OsFamily family = osFamily().apply(from);
+		OperatingSystem os = OperatingSystem.builder()
+				.description(from.getDescription())
+				.family(family)
+				.version(osVersion().apply(from))
+				.is64Bit(is64Bit)
+				.build();
+
+		return new ImageBuilder()
+		.id("" + from.getId())
+		.description(from.getDescription())
+		.operatingSystem(os)
+		.build();
+	}
+
+	/**
+	 * Parses the item description to determine the OSFamily
+	 * @return the @see OsFamily or OsFamily.UNRECOGNIZED
+	 */
+	public static Function<IMachine, OsFamily> osFamily() {
+		return new Function<IMachine,OsFamily>() {
+			@Override
+			public OsFamily apply(IMachine iMachine) {
+				final String description = iMachine.getDescription();
+				if ( description.startsWith(UBUNTU) ) return OsFamily.UBUNTU;
+				return OsFamily.UNRECOGNIZED;
+			}
+		};
+	}
+
+	 /**
+	    * Parses the item description to determine the os version
+	    * @return the version
+	    * @throws java.util.NoSuchElementException if the version cannot be determined
+	    */
+	    public static Function<IMachine, String> osVersion() {
+	       return new Function<IMachine, String>() {
+	            @Override
+	            public String apply(IMachine iMachine) {
+	               final String description = iMachine.getDescription();
+	               OsFamily family = osFamily().apply(iMachine);
+	               if(family.equals(OsFamily.UBUNTU)) return parseVersion(description, UBUNTU);
+	               else throw new NoSuchElementException("No os parseVersion for item:" + iMachine);
+	            }
+	        };
+	    }
+	
+	    private static String parseVersion(String description, String os) {
+	        String noOsName = description.replaceFirst(os,"").trim();
+	        return noOsName.split(" ")[0];
 	     }
 }