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

A few more skips & small fixes

This commit is contained in:
Andrei Savu 2012-06-07 22:54:19 +03:00
parent 1261a4c9b0
commit bc22b99dee
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/GuestIPType.java
View File

@ -34,15 +34,16 @@ public enum GuestIPType {
* network. Dhcp role is played by domain router. * network. Dhcp role is played by domain router.
*/ */
VIRTUAL, VIRTUAL,
/** /**
* traffic directly to the network and VMs created here are assigned an IP * traffic directly to the network and VMs created here are assigned an IP
* directly from the network as configured * directly from the network as configured
*/ */
DIRECT, DIRECT,
/** /**
* Not sure what exactly these *are* yet, but I know they exist in CS3. * TODO: add comments to explain the meaning (cs3 only)
*/ */
SHARED, SHARED,
ISOLATED, ISOLATED,

1
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountClientLiveTest.java
View File

@ -56,7 +56,6 @@ public class AccountClientLiveTest extends BaseCloudStackClientLiveTest {
assert user.getLastName() != null : user; assert user.getLastName() != null : user;
assert user.getFirstName() != null : user; assert user.getFirstName() != null : user;
assert user.getId() != null : user; assert user.getId() != null : user;
assert user.getSecretKey() != null : user;
assert user.getState() != null : user; assert user.getState() != null : user;
} }
assert account.getIPsAvailable() == null || account.getIPsAvailable() >= 0 : account; assert account.getIPsAvailable() == null || account.getIPsAvailable() >= 0 : account;

9
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
View File

@ -65,6 +65,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
} }
} }
@Test
public void testCreateGuestVirtualNetwork() { public void testCreateGuestVirtualNetwork() {
if (!networksSupported) if (!networksSupported)
return; return;
@ -94,13 +95,12 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
} }
} }
@Test
public void testCreateVLANNetwork() { public void testCreateVLANNetwork() {
skipIfNotDomainAdmin();
if (!networksSupported) if (!networksSupported)
return; return;
if (!domainAdminEnabled) {
Logger.getAnonymousLogger().log(Level.SEVERE, "domainAdmin credentials not present, skipping test");
return;
}
final NetworkOffering offering; final NetworkOffering offering;
try { try {
offering = get( offering = get(
@ -130,6 +130,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
} }
} }
@Test
public void testListNetworks() throws Exception { public void testListNetworks() throws Exception {
if (!networksSupported) if (!networksSupported)
return; return;

4
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
View File

@ -110,8 +110,8 @@ public class TemplateClientLiveTest extends BaseCloudStackClientLiveTest {
return network != null && network.getState().equals("Implemented"); return network != null && network.getState().equals("Implemented");
} }
}); });
assertEquals(Iterables.size(networks), 1); assertTrue(Iterables.size(networks) >= 1);
Network network = Iterables.getOnlyElement(networks, null); Network network = Iterables.get(networks, 0);
assertNotNull(network); assertNotNull(network);
// Create a VM and stop it // Create a VM and stop it

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

@ -336,6 +336,7 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
super.tearDown(); super.tearDown();
} }
@Test
public void testListVirtualMachines() throws Exception { public void testListVirtualMachines() throws Exception {
Set<VirtualMachine> response = client.getVirtualMachineClient().listVirtualMachines(); Set<VirtualMachine> response = client.getVirtualMachineClient().listVirtualMachines();
assert null != response; assert null != response;