You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/09/18 10:24:04 UTC
jclouds git commit: GCE hardware profiles might not have volumes
Repository: jclouds
Updated Branches:
refs/heads/master f8eff7e00 -> 042222b64
GCE hardware profiles might not have volumes
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/042222b6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/042222b6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/042222b6
Branch: refs/heads/master
Commit: 042222b647146a7dd606ab533504a72e5c2d4bc4
Parents: f8eff7e
Author: Ignasi Barrera <na...@apache.org>
Authored: Thu Sep 17 00:29:06 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Fri Sep 18 10:05:34 2015 +0200
----------------------------------------------------------------------
.../jclouds/compute/internal/BaseComputeServiceLiveTest.java | 6 +++++-
.../compute/GoogleComputeEngineServiceLiveTest.java | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/042222b6/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
index f1af0b1..4a9df54 100644
--- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
+++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java
@@ -844,11 +844,15 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte
for (Hardware hardware : client.listHardwareProfiles()) {
assert hardware.getProviderId() != null : hardware;
assert getCores(hardware) > 0 : hardware;
- assert hardware.getVolumes().size() > 0 : hardware;
assert hardware.getRam() > 0 : hardware;
assertEquals(hardware.getType(), ComputeType.HARDWARE);
+ checkVolumes(hardware);
}
}
+
+ protected void checkVolumes(Hardware hardware) {
+ assert hardware.getVolumes().size() > 0 : hardware;
+ }
@Test(enabled = true)
public void testCompareSizes() throws Exception {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/042222b6/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
index afaa5bb..804e6e8 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
@@ -146,4 +146,9 @@ public class GoogleComputeEngineServiceLiveTest extends BaseComputeServiceLiveTe
return path.substring(path.lastIndexOf('/') + 1);
}
+ @Override
+ protected void checkVolumes(Hardware hardware) {
+ // Hardware profiles might not have volumes.
+ }
+
}