fix multicast being counted as ierror

3 files changed, 1 insertions, 26 deletions

diff --git a/scripts/automation/regression/stateless_tests/stl_examples_test.py b/scripts/automation/regression/stateless_tests/stl_examples_test.py
index d8b85dfc..71fc3287 100755
--- a/scripts/automation/regression/stateless_tests/stl_examples_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_examples_test.py
@@ -10,14 +10,12 @@ class STLExamples_Test(CStlGeneral_Test):
     def explicitSetUp(self):
         # examples connect by their own
         if self.is_connected():
-            self.recover_after_trex_210_issue()
             CTRexScenario.stl_trex.disconnect()
 
     def explicitTearDown(self):
         # connect back at end of tests
         if not self.is_connected():
             self.stl_trex.connect()
-        self.recover_after_trex_210_issue()
 
     def test_stl_examples(self):
         examples_dir = '../trex_control_plane/stl/examples'
diff --git a/scripts/automation/regression/stateless_tests/stl_general_test.py b/scripts/automation/regression/stateless_tests/stl_general_test.py
index 3a22e596..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')
diff --git a/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py b/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py
index 905882fe..14ef36f7 100755
--- a/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py
+++ b/scripts/automation/regression/stateless_tests/trex_client_pkg_test.py
@@ -3,9 +3,6 @@ from .stl_general_test import CStlGeneral_Test, CTRexScenario
 from misc_methods import run_command
 from nose.plugins.attrib import attr
 
-def setUpModule():
-    CStlGeneral_Test.unzip_client_package()
-
 @attr('client_package')
 class CTRexClientPKG_Test(CStlGeneral_Test):
     """This class tests TRex client package"""
@@ -14,14 +11,13 @@ class CTRexClientPKG_Test(CStlGeneral_Test):
         CStlGeneral_Test.setUp(self)
         # examples connect by their own
         if CTRexScenario.stl_trex.is_connected():
-            self.recover_after_trex_210_issue()
             CTRexScenario.stl_trex.disconnect()
+        CStlGeneral_Test.unzip_client_package()
 
     def tearDown(self):
         # connect back at end of tests
         if not CTRexScenario.stl_trex.is_connected():
             CTRexScenario.stl_trex.connect()
-        self.recover_after_trex_210_issue()
         CStlGeneral_Test.tearDown(self)
 
     def run_client_package_stl_example(self, python_version):