[SDFAB-635] Save Onos Diagnostics if a testcase fails

  - Add to Segment Routing utility module's cleanup
    function, so most tests don't need to explicitly
    call function

Change-Id: I47c8b7ae39350631037f61e5194afc1e5a40896f
diff --git a/TestON/tests/USECASE/SegmentRouting/UP4/UP4.params b/TestON/tests/USECASE/SegmentRouting/UP4/UP4.params
index 0779df9..0e5bdb9 100644
--- a/TestON/tests/USECASE/SegmentRouting/UP4/UP4.params
+++ b/TestON/tests/USECASE/SegmentRouting/UP4/UP4.params
@@ -14,6 +14,7 @@
         <appName>onos-classic</appName>
         <namespace>tost</namespace>
     </kubernetes>
+    <use_stern>True</use_stern>
 
     <UP4>
         <pdn_host>MgmtServer</pdn_host>
diff --git a/TestON/tests/USECASE/SegmentRouting/UP4/UP4.py b/TestON/tests/USECASE/SegmentRouting/UP4/UP4.py
index da0c0a7..f60d353 100644
--- a/TestON/tests/USECASE/SegmentRouting/UP4/UP4.py
+++ b/TestON/tests/USECASE/SegmentRouting/UP4/UP4.py
@@ -66,7 +66,6 @@
         main.step("Stop scapy and p4rt client")
         up4.teardown()
 
-        run.saveOnosDiagsIfFailure(main)
         run.cleanup(main)
 
     def CASE2(self, main):
@@ -266,7 +265,6 @@
         up4.teardown()
         bess_host.stopScapy()
 
-        run.saveOnosDiagsIfFailure(main)
         run.cleanup(main)
 
     def CASE3(self, main):
@@ -395,7 +393,6 @@
                 onos_0_flow_count, onos_1_flow_count, onos_2_flow_count)
         )
 
-        run.saveOnosDiagsIfFailure(main)
         run.cleanup(main)
 
     def CASE4(self, main):
@@ -558,7 +555,6 @@
 
         run.checkFlows(main, minFlowCount=initial_flow_count)
 
-        run.saveOnosDiagsIfFailure(main)
         run.cleanup(main)
 
     def CASE5(self, main):