mirror of https://github.com/apache/jclouds.git
Fixed test (assertion) failure for network domain.
This commit is contained in:
parent
2675b2befb
commit
fd9b49873b
|
@ -18,19 +18,18 @@
|
|||
*/
|
||||
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.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.SortedSet;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
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 static com.google.common.base.Preconditions.checkNotNull;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -245,7 +244,7 @@ public class Network implements Comparable<Network> {
|
|||
@SerializedName("issystem")
|
||||
private boolean isSystem;
|
||||
private String netmask;
|
||||
@SerializedName("networkdomain")
|
||||
@SerializedName("domain")
|
||||
private String networkDomain;
|
||||
@SerializedName("networkofferingavailability")
|
||||
private String networkOfferingAvailability;
|
||||
|
|
|
@ -22,6 +22,7 @@ import static com.google.common.collect.Iterables.find;
|
|||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.Set;
|
||||
|
||||
|
@ -132,7 +133,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
|
|||
assert network.getNetmask() != null : network;
|
||||
assert network.getGateway() != 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.getEndIP() != null : network;
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue