PreSetup is a valid root device type

This commit is contained in:
andreisavu 2011-11-15 11:50:41 +02:00
parent 5842b84ad0
commit 0963e9ebce
1 changed files with 5 additions and 1 deletions

View File

@ -19,6 +19,7 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import static com.google.common.base.Predicates.equalTo; 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.base.Predicates.or;
import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.find;
import static com.google.common.collect.Iterables.get; 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.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import com.google.common.collect.ImmutableSet;
import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.CloudStackClient;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.AsyncJob; 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.ComparisonChain;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.google.common.net.HostSpecifier; import com.google.common.net.HostSpecifier;
import org.testng.collections.Sets;
/** /**
* Tests behavior of {@code VirtualMachineClientLiveTest} * Tests behavior of {@code VirtualMachineClientLiveTest}
@ -142,7 +145,8 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
if (vm.getPassword() != null) { if (vm.getPassword() != null) {
conditionallyCheckSSH(); 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); checkVm(vm);
} }