T3: Bugfix on same leaf Multicast
Change-Id: Id89a3a85b057635fa689573d7c64aa91a23ac383
(cherry picked from commit f5ed7a667f985b919eaf1b2fbb551ab4324694cc)
diff --git a/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java b/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
index 5b245b2..e46e260 100644
--- a/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
+++ b/apps/t3/src/main/java/org/onosproject/t3/impl/TroubleshootManager.java
@@ -424,7 +424,7 @@
return trace;
}
- //If the trace has ouputs we analyze them all
+ //If the trace has outputs we analyze them all
for (GroupsInDevice outputPath : trace.getGroupOuputs(in.deviceId())) {
ConnectPoint cp = outputPath.getOutput();
@@ -678,6 +678,12 @@
if (!completePath.contains(trace.getInitialConnectPoint())) {
traverseList.add(trace.getInitialConnectPoint());
}
+
+ if (output != null && trace.getInitialConnectPoint().deviceId().equals(output.deviceId())) {
+ trace.addCompletePath(ImmutableList.of(trace.getInitialConnectPoint(), output));
+ return true;
+ }
+
traverseList.addAll(completePath);
if (output != null && !completePath.contains(output)) {
traverseList.add(output);