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

updated delta to be consistent with ids

This commit is contained in:
Adrian Cole 2011-04-04 03:43:53 -07:00
parent d169658c65
commit 99ac814d51
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/functions/DeltacloudImageToImage.java
View File

@ -42,7 +42,8 @@ public class DeltacloudImageToImage implements Function<org.jclouds.deltacloud.d
@Override @Override
public Image apply(org.jclouds.deltacloud.domain.Image from) { public Image apply(org.jclouds.deltacloud.domain.Image from) {
ImageBuilder builder = new ImageBuilder(); ImageBuilder builder = new ImageBuilder();
builder.ids(from.getId()); builder.id(from.getHref().toASCIIString());
builder.providerId(from.getId());
builder.uri(from.getHref()); builder.uri(from.getHref());
builder.name(from.getName()); builder.name(from.getName());
builder.description(from.getDescription()); builder.description(from.getDescription());

4
apis/deltacloud/src/main/java/org/jclouds/deltacloud/compute/strategy/DeltacloudComputeServiceAdapter.java
View File

@ -86,8 +86,8 @@ public class DeltacloudComputeServiceAdapter implements
@Override @Override
public Instance createNodeWithGroupEncodedIntoNameThenStoreCredentials(String tag, String name, Template template, public Instance createNodeWithGroupEncodedIntoNameThenStoreCredentials(String tag, String name, Template template,
Map<String, Credentials> credentialStore) { Map<String, Credentials> credentialStore) {
Instance instance = client.createInstance(template.getImage().getId(), CreateInstanceOptions.Builder.named(name) Instance instance = client.createInstance(template.getImage().getProviderId(), CreateInstanceOptions.Builder
.hardwareProfile(template.getHardware().getId()).realm(template.getLocation().getId())); .named(name).hardwareProfile(template.getHardware().getId()).realm(template.getLocation().getId()));
if (instance.getAuthentication() != null && instance.getAuthentication() instanceof PasswordAuthentication) { if (instance.getAuthentication() != null && instance.getAuthentication() instanceof PasswordAuthentication) {
Credentials creds = PasswordAuthentication.class.cast(instance.getAuthentication()).getLoginCredentials(); Credentials creds = PasswordAuthentication.class.cast(instance.getAuthentication()).getLoginCredentials();
// store the credentials so that later functions can use them // store the credentials so that later functions can use them

2
apis/deltacloud/src/test/java/org/jclouds/deltacloud/compute/DeltacloudTemplateBuilderLiveTest.java
View File

@ -72,7 +72,7 @@ public class DeltacloudTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTe
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "us"); assertEquals(defaultTemplate.getLocation().getId(), "http://localhost:3001/api/realms/us");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
} }