Fix obtaining link information in the wrong direction.
Link discovery provider is getting egress links that to determine the which links are added or removed now.
But LLDP packet is received from remote device.
It means that link detection is guaranteed by ingress direction.
So, link discovery provider should get the links from ingress direction by each device.
[Remote Device ---(Egress)--(LLDP packets flow)--(Ingress)---> My Device]
ONOS-7749
Change-Id: Ie77d0ad37f2afb1cdea0cc3f55c366836097db87
diff --git a/drivers/ciena/c5162/src/main/java/org/onosproject/drivers/ciena/c5162/netconf/Ciena5162DeviceDescription.java b/drivers/ciena/c5162/src/main/java/org/onosproject/drivers/ciena/c5162/netconf/Ciena5162DeviceDescription.java
index b18a6c4..965a611 100644
--- a/drivers/ciena/c5162/src/main/java/org/onosproject/drivers/ciena/c5162/netconf/Ciena5162DeviceDescription.java
+++ b/drivers/ciena/c5162/src/main/java/org/onosproject/drivers/ciena/c5162/netconf/Ciena5162DeviceDescription.java
@@ -245,11 +245,11 @@
if (dest != null) {
links.add(new DefaultLinkDescription(
- new ConnectPoint(deviceId,
- PortNumber.portNumber(xp.evaluate("name/text()", iface))),
new ConnectPoint(dest.id(),
PortNumber.portNumber(xp.evaluate(
"state/lldp-remote-port-operational/port-id/text()", iface))),
+ new ConnectPoint(deviceId,
+ PortNumber.portNumber(xp.evaluate("name/text()", iface))),
Link.Type.DIRECT, true));
} else {
log.warn("DEST chassisID not found: chassis {} port {}",
diff --git a/drivers/ciena/c5170/src/main/java/org/onosproject/drivers/ciena/c5170/netconf/Ciena5170DeviceDescription.java b/drivers/ciena/c5170/src/main/java/org/onosproject/drivers/ciena/c5170/netconf/Ciena5170DeviceDescription.java
index 2e3e663..d149129 100644
--- a/drivers/ciena/c5170/src/main/java/org/onosproject/drivers/ciena/c5170/netconf/Ciena5170DeviceDescription.java
+++ b/drivers/ciena/c5170/src/main/java/org/onosproject/drivers/ciena/c5170/netconf/Ciena5170DeviceDescription.java
@@ -245,11 +245,11 @@
if (dest != null) {
links.add(new DefaultLinkDescription(
- new ConnectPoint(deviceId,
- PortNumber.portNumber(xp.evaluate("name/text()", iface))),
new ConnectPoint(dest.id(),
PortNumber.portNumber(xp.evaluate(
"state/lldp-remote-port-operational/port-id/text()", iface))),
+ new ConnectPoint(deviceId,
+ PortNumber.portNumber(xp.evaluate("name/text()", iface))),
Link.Type.DIRECT, true));
} else {
log.warn("DEST chassisID not found: chassis {} port {}",
diff --git a/drivers/ciena/waveserverai/src/main/java/org/onosproject/drivers/ciena/waveserverai/netconf/CienaWaveserverAiLinkDiscovery.java b/drivers/ciena/waveserverai/src/main/java/org/onosproject/drivers/ciena/waveserverai/netconf/CienaWaveserverAiLinkDiscovery.java
index 1308760..55840bf 100644
--- a/drivers/ciena/waveserverai/src/main/java/org/onosproject/drivers/ciena/waveserverai/netconf/CienaWaveserverAiLinkDiscovery.java
+++ b/drivers/ciena/waveserverai/src/main/java/org/onosproject/drivers/ciena/waveserverai/netconf/CienaWaveserverAiLinkDiscovery.java
@@ -126,10 +126,10 @@
Device dest = lookup.get(destChassis);
if (dest != null) {
links.add(new DefaultLinkDescription(
- new ConnectPoint(deviceId,
- PortNumber.portNumber(portAsLong, port)),
new ConnectPoint(dest.id(),
- PortNumber.portNumber(destPortAsLong, destPort)),
+ PortNumber.portNumber(destPortAsLong, destPort)),
+ new ConnectPoint(deviceId,
+ PortNumber.portNumber(portAsLong, port)),
Link.Type.TUNNEL, true));
} else {
log.error("DEST OTN CHASSIS is NULL for {}", xp.evaluate("port-id/text()", nodeListItem));
diff --git a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
index 410ce4d..ebf27e1 100644
--- a/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
+++ b/providers/link/src/main/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProvider.java
@@ -207,7 +207,7 @@
}
//The provider will get only existing links related to LinkDiscovery
- Set<Link> storedLinks = linkService.getDeviceEgressLinks(deviceId)
+ Set<Link> storedLinks = linkService.getDeviceIngressLinks(deviceId)
.stream()
.filter(link -> {
String value = link.annotations().value(AnnotationKeys.PROTOCOL);
diff --git a/providers/link/src/test/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProviderTest.java b/providers/link/src/test/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProviderTest.java
index 30ddf2a..c054a11 100644
--- a/providers/link/src/test/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProviderTest.java
+++ b/providers/link/src/test/java/org/onosproject/provider/linkdiscovery/impl/LinkDiscoveryProviderTest.java
@@ -243,7 +243,7 @@
private class MockLinkService extends LinkServiceAdapter {
@Override
- public Set<Link> getDeviceEgressLinks(DeviceId deviceId) {
+ public Set<Link> getDeviceIngressLinks(DeviceId deviceId) {
Set<Link> links = new HashSet<>();
providerService.discoveredLinkDescriptions().values()
.forEach(x -> links.add(DefaultLink.builder()