commit ac0879a7e74584ea11950b0e7c0eae2a4f153783
author jiangrui <jiangrui1@huawei.com> Tue Sep 08 16:58:49 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Sep 08 18:01:19 2015 +0000
tree 2f787b564e0053b8ee5b94af21cdcaca7bc8e689
parent 84a25fc15858ab47828696f83bc1a83a9ef66f25

ONOS-2843 Fix bug post NBI subnet get an error.

Change-Id: I93b52a0c69a57b458b610afbb78cfdec0b50e3a5

apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/DefaultSubnet.java

diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/DefaultSubnet.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/DefaultSubnet.java
index 6311a80..88fabff 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/DefaultSubnet.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/DefaultSubnet.java
@@ -18,6 +18,7 @@
 import static com.google.common.base.MoreObjects.toStringHelper;

 

 import java.util.Objects;

+import java.util.Set;

 

 import org.onlab.packet.IpAddress;

 import org.onlab.packet.IpAddress.Version;

@@ -38,8 +39,8 @@
     private final boolean shared;

     private final Mode ipV6AddressMode;

     private final Mode ipV6RaMode;

-    private final Iterable<HostRoute> hostRoutes;

-    private final Iterable<AllocationPool> allocationPools;

+    private final Set<HostRoute> hostRoutes;

+    private final Set<AllocationPool> allocationPools;

 

     /**

      * Creates a subnet object.

@@ -64,9 +65,9 @@
                          TenantNetworkId networkId, TenantId tenantId,

                          Version ipVersion, IpPrefix cidr, IpAddress gatewayIp,

                          boolean dhcpEnabled, boolean shared,

-                         Iterable<HostRoute> hostRoutes, Mode ipV6AddressMode,

+                         Set<HostRoute> hostRoutes, Mode ipV6AddressMode,

                          Mode ipV6RaMode,

-                         Iterable<AllocationPool> allocationPoolsIt) {

+                         Set<AllocationPool> allocationPoolsIt) {

         this.id = id;

         this.subnetName = subnetName;

         this.networkId = networkId;