ONOS-2843 Fix bug post NBI subnet get an error.
Change-Id: I93b52a0c69a57b458b610afbb78cfdec0b50e3a5
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetCreateCommand.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetCreateCommand.java
index a673d17..5623640 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetCreateCommand.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetCreateCommand.java
@@ -88,11 +88,11 @@
@Option(name = "-h", aliases = "--hostRoutes", description = "Subnet jsonnode hostRoutes",
required = false, multiValued = false)
- Iterable<HostRoute> hostRoutes = null;
+ Set<HostRoute> hostRoutes = Sets.newHashSet();
@Option(name = "-a", aliases = "--allocationPools",
description = "Subnet jsonnode allocationPools", required = false, multiValued = false)
- Iterable<AllocationPool> allocationPools = Sets.newHashSet();
+ Set<AllocationPool> allocationPools = Sets.newHashSet();
@Override
protected void execute() {
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetUpdateCommand.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetUpdateCommand.java
index 2e8fc20..f8ee6b9 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetUpdateCommand.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/subnet/SubnetUpdateCommand.java
@@ -88,11 +88,11 @@
@Option(name = "-h", aliases = "--hostRoutes", description = "Subnet jsonnode hostRoutes",
required = false, multiValued = false)
- Iterable<HostRoute> hostRoutes = null;
+ Set<HostRoute> hostRoutes = Sets.newHashSet();
@Option(name = "-a", aliases = "--allocationPools",
description = "Subnet jsonnode allocationPools", required = false, multiValued = false)
- Iterable<AllocationPool> allocationPools = Sets.newHashSet();;
+ Set<AllocationPool> allocationPools = Sets.newHashSet();;
@Override
protected void execute() {
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortCreateCommand.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortCreateCommand.java
index 956f8ce..4c555e3 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortCreateCommand.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortCreateCommand.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.vtnrsc.cli.virtualport;
-import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -106,11 +105,11 @@
@Option(name = "-l", aliases = "--allowedAddress", description = "virtual allowedAddressPair.",
required = false, multiValued = false)
- Collection<AllowedAddressPair> allowedAddressPairs = Sets.newHashSet();
+ Set<AllowedAddressPair> allowedAddressPairs = Sets.newHashSet();
@Option(name = "-e", aliases = "--securityGroups", description = "virtualPort securityGroups.",
required = false, multiValued = false)
- Collection<SecurityGroup> securityGroups = Sets.newHashSet();
+ Set<SecurityGroup> securityGroups = Sets.newHashSet();
@Override
protected void execute() {
diff --git a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortUpdateCommand.java b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortUpdateCommand.java
index fd218e0..6df4b23 100644
--- a/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortUpdateCommand.java
+++ b/apps/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortUpdateCommand.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.vtnrsc.cli.virtualport;
-import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -107,11 +106,11 @@
@Option(name = "-l", aliases = "--allowedAddress", description = "virtual allowedAddressPair.",
required = false, multiValued = false)
- Collection<AllowedAddressPair> allowedAddressPairs = Sets.newHashSet();
+ Set<AllowedAddressPair> allowedAddressPairs = Sets.newHashSet();
@Option(name = "-e", aliases = "--securityGroups", description = "virtualPort securityGroups.",
required = false, multiValued = false)
- Collection<SecurityGroup> securityGroups = Sets.newHashSet();
+ Set<SecurityGroup> securityGroups = Sets.newHashSet();
@Override
protected void execute() {