| commit | 90ca2971811269c5e02f1f38b2ac624cce373aeb | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@opennetworking.org> | Fri Jan 25 09:50:16 2019 -0800 |
| committer | Ray Milkey <ray@opennetworking.org> | Fri Jan 25 09:50:16 2019 -0800 |
| tree | 7d68ccf004eee68566fe7193e74a155a06cbc6c4 | |
| parent | 960a21135c9d588287cb3b286c654f5a78d47f53 [diff] |
Sonar suggestions Change-Id: I440105c03b9fddc9df277a452beb300355de01c1
diff --git a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java index d88e132..7950bee 100644 --- a/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java +++ b/apps/openstackvtap/app/src/main/java/org/onosproject/openstackvtap/util/OpenstackVtapUtil.java
@@ -132,7 +132,7 @@ */ public static int hostCompareIp(Host host1, Host host2, IpPrefix ipPrefix) { if ((host1 == null || host1.ipAddresses().stream().noneMatch(ipPrefix::contains)) && - (host2 != null || host2.ipAddresses().stream().anyMatch(ipPrefix::contains))) { + (host2 == null || host2.ipAddresses().stream().anyMatch(ipPrefix::contains))) { return -1; } else if ((host1 != null && host1.ipAddresses().stream().anyMatch(ipPrefix::contains)) && (host2 == null || host2.ipAddresses().stream().noneMatch(ipPrefix::contains))) {
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java index 520a33a..b667dab 100644 --- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java +++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/cli/virtualport/VirtualPortQueryCommand.java
@@ -71,7 +71,7 @@ } else if (vPortId == null && networkId == null && deviceId == null && tenantId != null) { Collection<VirtualPort> ports = service.getPorts(DeviceId.deviceId(tenantId)); printPorts(ports); - } else if (vPortId == null && networkId == null && deviceId == null && tenantId == null) { + } else if (vPortId == null && networkId == null && deviceId == null) { Collection<VirtualPort> ports = service.getPorts(); printPorts(ports); } else {