Making REST API port as a command-line option for various admin commands.
Also cleaning up usage for consistency.
Change-Id: I1d8a10c063cab5992033b97d6efa60bba030ed9e
diff --git a/tools/test/scenarios/wrapup.xml b/tools/test/scenarios/wrapup.xml
index b6fe489..6786df7 100644
--- a/tools/test/scenarios/wrapup.xml
+++ b/tools/test/scenarios/wrapup.xml
@@ -15,6 +15,7 @@
-->
<scenario name="wrapup" description="ONOS test wrapup">
<group name="Wrapup">
+ <step name="Final-Diagnostics" exec="onos-diagnostics -n onos-stc-diags ${OCI}"/>
<parallel var="${OC#}">
<step name="Final-Check-Logs-${#}" exec="onos-check-logs ${OC#}"/>
<step name="Fetch-Logs-${#}" exec="onos-fetch-logs ${OC#}"