From 0963e9ebce75634fe42a3a22c5fd75beffa2c925 Mon Sep 17 00:00:00 2001 From: andreisavu Date: Tue, 15 Nov 2011 11:50:41 +0200 Subject: [PATCH] PreSetup is a valid root device type --- .../cloudstack/features/VirtualMachineClientLiveTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java index b2fe3fcc64..86a1ca4578 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java @@ -19,6 +19,7 @@ package org.jclouds.cloudstack.features; import static com.google.common.base.Predicates.equalTo; +import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.or; import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.get; @@ -29,6 +30,7 @@ import static org.testng.Assert.assertTrue; import java.util.Set; import java.util.concurrent.ExecutionException; +import com.google.common.collect.ImmutableSet; import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncJob; @@ -50,6 +52,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.ComparisonChain; import com.google.common.collect.Ordering; import com.google.common.net.HostSpecifier; +import org.testng.collections.Sets; /** * Tests behavior of {@code VirtualMachineClientLiveTest} @@ -142,7 +145,8 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest { if (vm.getPassword() != null) { conditionallyCheckSSH(); } - assert or(equalTo("NetworkFilesystem"), equalTo("IscsiLUN"), equalTo("VMFS")).apply(vm.getRootDeviceType()) : vm; + assert in(ImmutableSet.of("NetworkFilesystem", "IscsiLUN", "VMFS", "PreSetup")) + .apply(vm.getRootDeviceType()) : vm; checkVm(vm); }