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

When network's vlan tag is not null, broadcast uri is vlan://<vlanTag>

This commit is contained in:
Adrian Cole 2011-02-13 06:46:59 +01:00
parent 5df7f7d148
commit b0b79e3d5a
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
View File

@ -46,7 +46,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
assertTrue(networkCount >= 0); assertTrue(networkCount >= 0);
for (Network network : response) { for (Network network : response) {
Network newDetails = Iterables.getOnlyElement(client.getNetworkClient().listNetworks( Network newDetails = Iterables.getOnlyElement(client.getNetworkClient().listNetworks(
ListNetworksOptions.Builder.id(network.getId()))); ListNetworksOptions.Builder.id(network.getId())));
assertEquals(network, newDetails); assertEquals(network, newDetails);
assertEquals(network, client.getNetworkClient().getNetwork(network.getId())); assertEquals(network, client.getNetworkClient().getNetwork(network.getId()));
assert network.getId() != null : network; assert network.getId() != null : network;
@ -55,8 +55,6 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network; assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network;
assert network.getAccount() != null : network; assert network.getAccount() != null : network;
assert network.getBroadcastDomainType() != null : network; assert network.getBroadcastDomainType() != null : network;
// TODO understand when this is null and for what reason
// assert network.getBroadcastURI() != null : network;
assert network.getDisplayText() != null : network; assert network.getDisplayText() != null : network;
assert network.getNetworkDomain() != null : network; assert network.getNetworkDomain() != null : network;
assert network.getNetworkOfferingAvailability() != null : network; assert network.getNetworkOfferingAvailability() != null : network;
@ -71,23 +69,23 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
assert network.getDomain() != null : network; assert network.getDomain() != null : network;
assert network.getDomainId() != null : network; assert network.getDomainId() != null : network;
switch (network.getGuestIPType()) { switch (network.getGuestIPType()) {
case VIRTUAL: case VIRTUAL:
assert network.getNetmask() == null : network; assert network.getNetmask() == null : network;
assert network.getGateway() == null : network; assert network.getGateway() == null : network;
assert network.getVLAN() == null : network; assert network.getVLAN() == null : network;
assert network.getStartIP() == null : network; assert network.getStartIP() == null : network;
assert network.getEndIP() == null : network; assert network.getEndIP() == null : network;
break; break;
case DIRECT: case DIRECT:
assert network.getNetmask() != null : network; assert network.getNetmask() != null : network;
assert network.getGateway() != null : network; assert network.getGateway() != null : network;
assert network.getVLAN() != null : network; assert network.getVLAN() != null : network;
assert network.getStartIP() != null : network; assertEquals(network.getBroadcastURI(), "vlan://" + network.getVLAN());
assert network.getEndIP() != null : network; assert network.getStartIP() != null : network;
break; assert network.getEndIP() != null : network;
break;
} }
} }
} }
} }