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

Merge pull request #150 from andreisavu/presetup-valid-root-device-type 

PreSetup is a valid root device type
This commit is contained in:
Adrian Cole 2011-11-15 04:18:09 -08:00
parent 056085428f 0963e9ebce
commit 3f28aa0b2a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
View File

@ -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);
}