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

Fixed test (assertion) failure for network domain.

This commit is contained in:
vijaykiran 2011-10-29 15:56:23 +02:00
parent 2675b2befb
commit fd9b49873b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sandbox-apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
View File

@ -18,19 +18,18 @@
*/ */
package org.jclouds.cloudstack.domain; package org.jclouds.cloudstack.domain;
import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.gson.annotations.SerializedName;
import javax.annotation.Nullable;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
import javax.annotation.Nullable; import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.gson.annotations.SerializedName;
/** /**
* *
@ -245,7 +244,7 @@ public class Network implements Comparable<Network> {
@SerializedName("issystem") @SerializedName("issystem")
private boolean isSystem; private boolean isSystem;
private String netmask; private String netmask;
@SerializedName("networkdomain") @SerializedName("domain")
private String networkDomain; private String networkDomain;
@SerializedName("networkofferingavailability") @SerializedName("networkofferingavailability")
private String networkOfferingAvailability; private String networkOfferingAvailability;

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

@ -22,6 +22,7 @@ import static com.google.common.collect.Iterables.find;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import java.net.URI;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
@ -132,7 +133,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
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;
assertEquals(network.getBroadcastURI(), "vlan://" + network.getVLAN()); assertEquals(network.getBroadcastURI(), URI.create("vlan://" + network.getVLAN()));
assert network.getStartIP() != null : network; assert network.getStartIP() != null : network;
assert network.getEndIP() != null : network; assert network.getEndIP() != null : network;
break; break;