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

CloudStack image location is Zone, and the part of the zone is the provider location

This commit is contained in:
Andrei Savu 2012-03-20 11:53:53 +02:00
parent e4197bec8f
commit c377c6da01
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compute/src/main/java/org/jclouds/compute/domain/internal/LocationPredicate.java
View File

@ -61,10 +61,12 @@ public class LocationPredicate implements Predicate<ComputeMetadata> {
input.getLocation().getParent() != null || input.getLocation().getScope() == LocationScope.PROVIDER, input.getLocation().getParent() != null || input.getLocation().getScope() == LocationScope.PROVIDER,
"only locations of scope PROVIDER can have a null parent; input: %s", "only locations of scope PROVIDER can have a null parent; input: %s",
input.getLocation()); input.getLocation());
return location.equals(input.getLocation()) || location.getParent() != null return location.equals(input.getLocation()) ||
&& location.getParent().equals(input.getLocation()) || location.getParent().getParent() != null (input.getLocation().getParent() != null && location.equals(input.getLocation().getParent())) ||
&& location.getParent().getParent().equals(input.getLocation()); (location.getParent() != null && location.getParent().equals(input.getLocation())) ||
(location.getParent() != null && location.getParent().getParent() != null &&
location.getParent().getParent().equals(input.getLocation()));
} }
@Override @Override

2
compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
View File

@ -614,7 +614,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
location = defaultLocation.get(); location = defaultLocation.get();
Predicate<Image> imagePredicate = buildImagePredicate(); Predicate<Image> imagePredicate = buildImagePredicate();
Iterable<? extends Image> supportedImages = filter(images, buildImagePredicate()); Iterable<? extends Image> supportedImages = filter(images, imagePredicate);
if (size(supportedImages) == 0) { if (size(supportedImages) == 0) {
if (imagePredicate == idPredicate) { if (imagePredicate == idPredicate) {
throw new NoSuchElementException(format("%s not found", idPredicate)); throw new NoSuchElementException(format("%s not found", idPredicate));