issue 384: IsoToMachine + Test started

This commit is contained in:
andreaturli 2011-09-29 23:12:02 +01:00
parent 1649c15ac7
commit 1d68a63614
3 changed files with 4 additions and 1 deletions

View File

@ -69,6 +69,7 @@ public class VirtualBoxPropertiesBuilder extends PropertiesBuilder {
"jclouds-virtualbox-test")); "jclouds-virtualbox-test"));
// TODO: Add more properties and use the wired properties from test code. // TODO: Add more properties and use the wired properties from test code.
properties.put(VirtualBoxConstants.VIRTUALBOX_DISTRO_ISO_NAME, "ubuntu-11.04-server-i386.iso");
return properties; return properties;
} }
} }

View File

@ -73,7 +73,7 @@ public class VirtualBoxComputeServiceAdapter implements ComputeServiceAdapter<IM
@Override @Override
public Iterable<IMachine> listHardwareProfiles() { public Iterable<IMachine> listHardwareProfiles() {
return Collections.emptyList(); return manager.getVBox().getMachines();
} }
@Override @Override

View File

@ -50,4 +50,6 @@ public interface VirtualBoxConstants {
public static final String VIRTUALBOX_MACHINE_LOCATION = "jclouds.virtualbox.location"; public static final String VIRTUALBOX_MACHINE_LOCATION = "jclouds.virtualbox.location";
public static final String VIRTUALBOX_HOST_ID = "jclouds.virtualbox.hostid"; public static final String VIRTUALBOX_HOST_ID = "jclouds.virtualbox.hostid";
public static final String VIRTUALBOX_DISTRO_ISO_NAME = "jclouds.virtualbox.distroIsoName";
} }