Report: Final clean-up

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I396b394aed58da29e6873e36c1cdcb323b3cf474
(cherry picked from commit c4275b598e6c333ecbbd45ad3742ab6cc6ba24b8)

4 files changed, 14 insertions, 19 deletions

diff --git a/docs/report/trex_performance_tests/index.rst b/docs/report/trex_performance_tests/index.rst
index 8596f71479..48e3aeada5 100644
--- a/docs/report/trex_performance_tests/index.rst
+++ b/docs/report/trex_performance_tests/index.rst
@@ -6,6 +6,8 @@ TRex Performance
     overview
     csit_release_notes
     packet_throughput_graphs/index
-    packet_latency/index
     throughput_trending
     test_environment
+
+..
+    packet_latency/index
diff --git a/docs/report/trex_performance_tests/packet_latency/index.rst b/docs/report/trex_performance_tests/packet_latency/index.rst
index 274b785085..3bc5530938 100644
--- a/docs/report/trex_performance_tests/packet_latency/index.rst
+++ b/docs/report/trex_performance_tests/packet_latency/index.rst
@@ -40,4 +40,6 @@ Additional information about graph data:
     :maxdepth: 3
 
     2n-icx-e810cq
+
+..
     1n-aws-nitro50g
diff --git a/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst b/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst
index 8b4b124b2a..ed3aa024d2 100644
--- a/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst
+++ b/docs/report/trex_performance_tests/packet_throughput_graphs/2n-icx-e810cq.rst
@@ -128,13 +128,13 @@ CSIT source code for the test cases used for plots can be found in
 
     \clearpage
 
-64b-ip4routing-[udp|tcp]-stf-pps
---------------------------------
+64b-ip4routing-[udp|tcp]-stf-tput
+---------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-pps-ndr.html"></iframe>
+    <iframe id="05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-tput-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -143,8 +143,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-pps-ndr}
-            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-pps-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-tput-ndr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-tput-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -154,7 +154,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     <center>
-    <iframe id="06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-pps-pdr.html"></iframe>
+    <iframe id="06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/trex/2n-icx-e810cq-64b--ip4routing-stf-tput-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -163,8 +163,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/trex/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-pps-pdr}
-            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-pps-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-icx-e810cq-64b--ip4routing-stf-tput-pdr}
+            \label{fig:2n-icx-e810cq-64b--ip4routing-stf-tput-pdr}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/trex_performance_tests/throughput_trending.rst b/docs/report/trex_performance_tests/throughput_trending.rst
index 9106cb4bdf..92adb1d0e1 100644
--- a/docs/report/trex_performance_tests/throughput_trending.rst
+++ b/docs/report/trex_performance_tests/throughput_trending.rst
@@ -2,13 +2,4 @@ Throughput Trending
 -------------------
 
 CSIT provides continuous performance trending for master branch:
-
-#. `TRex Trending Graphs <https://s3-docs.fd.io/csit/master/trending/ndrpdr_trending/trex.html>`_:
-   per TRex test case throughput trend, trend compliance and summary of
-   detected anomalies. We expect TRex to hit the curently used bps or pps limit,
-   so no anomalies here (unless we change those limits in CSIT).
-
-#. `TRex Latency Graphs <https://s3-docs.fd.io/csit/master/trending/ndrpdr_latency_trending/trex.html>`_:
-   per TRex build NDRPDR latency measurements against the trendline.
-   We have seen in past that the latency numbers can depend on TRex version,
-   NIC firmware, or driver used.
+`C-Dash <http://csit.fd.io/trending/>`_