T3 output enhacements
Change-Id: Ibb046df647b928cf0b8a91e2c565734347625624
(cherry picked from commit ae42ed186382828678df5ac31a53a07cb886109a)
diff --git a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
index c809065..bdd67d1 100644
--- a/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
+++ b/apps/t3/src/main/java/org/onosproject/t3/cli/TroubleshootTraceCommand.java
@@ -185,6 +185,7 @@
}
previous = connectPoint;
}
+ print("---------------------------------------------------------------\n");
});
}
@@ -197,7 +198,7 @@
f.table(), f.priority(), f.selector().criteria(),
printTreatment(f.treatment()));
} else {
- print(" flowId=%s, selector=%s ", f.id(), f.selector().criteria());
+ print(" flowId=%s, table=%s, selector=%s", f.id(), f.table(), f.selector().criteria());
}
});
}
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 21f56e8..8f03ddc 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
@@ -361,7 +361,7 @@
//FIXME find better solution that enable granularity greater than 0 or all rules
//(another possibility is max tableId)
if (nextTableIdEntry == null && flows.size() == 0) {
- trace.addResultMessage("No flow rules for device" + in.deviceId() + ". Aborting");
+ trace.addResultMessage("No matching flow rules for device " + in.deviceId() + ". Aborting");
return trace;
} else if (nextTableIdEntry == null) {