[CORD-2774] Support Dual-homing
Change-Id: I54d26e6dd0a76ba726afdf3b7160c46dcf6b79c5
(cherry picked from commit 57262b2076d5662f9d3390655cee105dac581b13)
diff --git a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
index 971163b..75356dc 100644
--- a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
+++ b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootSimpleTraceCommand.java
@@ -25,6 +25,8 @@
import org.onosproject.t3.api.StaticPacketTrace;
import org.onosproject.t3.api.TroubleshootService;
+import java.util.Set;
+
import static org.onlab.packet.EthType.EtherType;
/**
@@ -62,15 +64,17 @@
//Printing the traced hosts
print("Tracing between: %s and %s", srcHost, dstHost);
- //Build the trace
- StaticPacketTrace trace = service.trace(HostId.hostId(srcHost), HostId.hostId(dstHost), type);
- if (trace.getInitialPacket() != null) {
- print("Tracing Packet: %s", trace.getInitialPacket());
- print("%s", T3CliUtils.printTrace(trace, verbosity1, verbosity2));
- } else {
- print("Cannot obtain trace between %s and %s", srcHost, dstHost);
- print("Reason: %s", trace.resultMessage());
- }
+ //Build the traces
+ Set<StaticPacketTrace> traces = service.trace(HostId.hostId(srcHost), HostId.hostId(dstHost), type);
+ traces.forEach(trace -> {
+ if (trace.getInitialPacket() != null) {
+ print("Tracing Packet: %s", trace.getInitialPacket());
+ print("%s", T3CliUtils.printTrace(trace, verbosity1, verbosity2));
+ } else {
+ print("Cannot obtain trace between %s and %s", srcHost, dstHost);
+ print("Reason: %s", trace.resultMessage());
+ }
+ });
}