1 files changed, 16 insertions, 31 deletions
diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py
index 82738f96..5ae2b326 100644
--- a/scripts/automation/regression/stateless_tests/stl_general_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_general_test.py
@@ -6,10 +6,6 @@ from trex_stl_lib.api import *
 import time
 from nose.tools import nottest
 
-def setUpModule():
-    if CTRexScenario.stl_trex.is_connected():
-        CStlGeneral_Test.recover_after_trex_210_issue()
-
 class CStlGeneral_Test(CTRexGeneral_Test):
     """This class defines the general stateless testcase of the TRex traffic generator"""
 
@@ -20,21 +16,6 @@ class CStlGeneral_Test(CTRexGeneral_Test):
         if CTRexScenario.stl_init_error:
             self.skip(CTRexScenario.stl_init_error)
 
-    # workaround of http://trex-tgn.cisco.com/youtrack/issue/trex-210
-    @staticmethod
-    def recover_after_trex_210_issue():
-        return
-        for i in range(20): 
-            try:
-                stl_map_ports(CTRexScenario.stl_trex)
-                break
-            except:
-                CTRexScenario.stl_trex.disconnect()
-                time.sleep(0.5)
-                CTRexScenario.stl_trex.connect()
-        # verify problem is solved
-        stl_map_ports(CTRexScenario.stl_trex)
-
     def connect(self, timeout = 100):
         # need delay and check only because TRex process might be still starting
         sys.stdout.write('Connecting')
@@ -85,18 +66,22 @@ class STLBasic_Test(CStlGeneral_Test):
     @nottest
     def test_connectivity(self):
         if not self.is_loopback:
-            if CTRexScenario.router_cfg['forceImageReload']:
-                CTRexScenario.router.load_clean_config()
-            CTRexScenario.router.configure_basic_interfaces()
-            CTRexScenario.router.config_pbr(mode = "config")
-
-        err = 'Client could not connect'
-        CTRexScenario.stl_init_error = err
+            try:
+                if CTRexScenario.router_cfg['forceImageReload']:
+                    CTRexScenario.router.load_clean_config()
+                CTRexScenario.router.configure_basic_interfaces()
+                CTRexScenario.router.config_pbr(mode = "config")
+            except Exception as e:
+                CTRexScenario.stl_init_error = 'Could not configure device, err: %s' % e
+                self.fail(CTRexScenario.stl_init_error)
+                return
         if not self.connect():
-            self.fail(err)
-        err = 'Client could not map ports'
-        CTRexScenario.stl_init_error = err
+            CTRexScenario.stl_init_error = 'Client could not connect'
+            self.fail(CTRexScenario.stl_init_error)
+            return
+        print('Connected')
         if not self.map_ports():
-            self.fail(err)
+            CTRexScenario.stl_init_error = 'Client could not map ports'
+            self.fail(CTRexScenario.stl_init_error)
+            return
         print('Got ports mapping: %s' % CTRexScenario.stl_ports_map)
-        CTRexScenario.stl_init_error = None