Fixed issue with pushing topo JSON after devices are in the system.

Fixes ONOS-2463. Change-Id: I9ce7a11e50d8fd6c344be2f90dc046dcba65fe46

Fixed issue with pushing topo JSON after devices are in the system.
Fixes ONOS-2463. Change-Id: I9ce7a11e50d8fd6c344be2f90dc046dcba65fe46
Jonathan Hart
Commit 914c35212fd8af0b923ff560f9aa00deaf37ce3a 914c3521 1 parent f72a631d
Showing 1 changed file with 20 additions and 14 deletions
web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
--- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
View file @914c352
+++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
View file @914c352
@@ -447,20 +447,26 @@ class ConfigProvider implements DeviceProvider, LinkProvider, HostProvider {
     // Adds any missing device ports.
     private void addMissingPorts(Device device) {
-        List<Port> ports = deviceService.getPorts(device.id());
+        try {
-        Set<ConnectPoint> existing = ports.stream()
+            List<Port> ports = deviceService.getPorts(device.id());
-                .map(p -> new ConnectPoint(device.id(), p.number()))
+            Set<ConnectPoint> existing = ports.stream()
-                .collect(Collectors.toSet());
+                    .map(p -> new ConnectPoint(device.id(), p.number()))
-        Set<ConnectPoint> missing = connectPoints.stream()
+                    .collect(Collectors.toSet());
-                .filter(cp -> cp.deviceId().equals(device.id()))
+            Set<ConnectPoint> missing = connectPoints.stream()
-                .filter(cp -> !existing.contains(cp))
+                    .filter(cp -> cp.deviceId().equals(device.id()))
-                .collect(Collectors.toSet());
+                    .filter(cp -> !existing.contains(cp))
-
+                    .collect(Collectors.toSet());
-        List<PortDescription> newPorts = Stream.concat(
+
-                ports.stream().map(this::description),
+            if (!missing.isEmpty()) {
-                missing.stream().map(this::description)
+                List<PortDescription> newPorts = Stream.concat(
-        ).collect(Collectors.toList());
+                        ports.stream().map(this::description),
-        deviceProviderService.updatePorts(device.id(), newPorts);
+                        missing.stream().map(this::description)
+                ).collect(Collectors.toList());
+                deviceProviderService.updatePorts(device.id(), newPorts);
+            }
+        } catch (IllegalArgumentException e) {
+            log.warn("Error pushing ports: {}", e.getMessage());
+        }
     }
     // Creates a port description from the specified port.