commit 0f5ccccaa60c3152133e417b8dfe26861a5fb1b4
author Daniele Moro <daniele@opennetworking.org> Tue Mar 03 11:14:05 2020 -0800
committer Daniele Moro <daniele@opennetworking.org> Wed Apr 08 09:00:37 2020 +0200
tree ae42f22a598c4e652bbbe873c60eeabd265c2092
parent 86c2c7ed3480ca98591dd9b6846cf6f1fe8e34b1

Update to support new version of SADIS

Change-Id: I76dd0b79543343664c6f36b2b8fc13d5fc3414a7

app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java

diff --git a/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java b/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
index 7b60f9e..32cab29 100644
--- a/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
+++ b/app/src/main/java/org/opencord/bng/impl/PppoeHandlerRelay.java
@@ -559,11 +559,11 @@
                             (portName.contains("-") && !portName.endsWith("-1"))) {
                         return false;
                     }
-                    var info = sadisService.getSubscriberInfoService()
+                    var subInfo = sadisService.getSubscriberInfoService()
                             .get(portName);
-                    return info != null &&
-                            Objects.equals(cTag, info.cTag()) &&
-                            Objects.equals(sTag, info.sTag());
+                    return subInfo != null && subInfo.uniTagList().stream()
+                            .anyMatch(info -> Objects.equals(cTag, info.getPonCTag()) &&
+                                    Objects.equals(sTag, info.getPonSTag()));
                 })
                 .map(port -> new ConnectPoint(port.element().id(), port.number()))
                 .collect(Collectors.toSet());