Fixed that invalid links are created if lldp packets are received and there are no matched ports in onos.
Invalid links are created even if there are no matched ports in onos.
The root cause is that if lldp packets are received before ports are discovered, LinkDiscovery make a links using lldp packets's port name or port description.
In this case, a port number is generated using port name or port description. But this number is not matched by the switch's port discovery driver.
So, this changes fix that do not create links if there are no ports in onos at LinkDiscovery.
ONOS-7852
Change-Id: Ib8477006d31fe39a770f2585475a9fedb759da76
diff --git a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
index 2448828..e743af5 100644
--- a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
+++ b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
@@ -28,7 +28,6 @@
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultAnnotations;
-import org.onosproject.net.DefaultPort;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link.Type;
@@ -348,13 +347,7 @@
if (remotePort.isPresent()) {
return remotePort;
} else {
- int portNumber = Integer.parseInt(remotePortName.replaceAll("\\D+", ""));
- DefaultAnnotations.Builder annotations = DefaultAnnotations.builder()
- .set(AnnotationKeys.PORT_NAME, remotePortName);
-
- return Optional.of(new DefaultPort(remoteDevice, PortNumber.portNumber(portNumber),
- true,
- annotations.build()));
+ return Optional.empty();
}
}