regression: trex14 updated classification

diff --git a/scripts/automation/regression/setups/trex14/benchmark.yaml b/scripts/automation/regression/setups/trex14/benchmark.yaml
index 4870eef..28e287b 100644 (file)
--- a/scripts/automation/regression/setups/trex14/benchmark.yaml
+++ b/scripts/automation/regression/setups/trex14/benchmark.yaml
@@ -12,20 +12,18 @@ test_nbar_simple :
   exp_max_latency   : 1000
 
   nbar_classification:
-    http            : 30.44
-    rtp-audio       : 21.19
-    rtp             : 11.31
-    oracle_sqlnet   : 11.17
-    exchange        : 10.86
+    rtp             : 35.24
+    http            : 30.41
+    oracle_sqlnet   : 11.3
+    ssl             : 6.03
     citrix          : 5.65
-    rtsp            : 2.86
+    exchange        : 4.99
     dns             : 1.96
     smtp            : 0.57
     pop3            : 0.37
-    ssl             : 0.17
     sctp            : 0.13
     sip             : 0.09
-    unknown         : 3.21
+    unknown         : 3.22
 
 test_rx_check :
   multiplier        : 13

diff --git a/scripts/automation/regression/setups/trex14/config.yaml b/scripts/automation/regression/setups/trex14/config.yaml
index 2b12312..10938ff 100644 (file)
--- a/scripts/automation/regression/setups/trex14/config.yaml
+++ b/scripts/automation/regression/setups/trex14/config.yaml
@@ -41,7 +41,7 @@ router:
   model          : ASR1001x
   hostname       : csi-asr-01
   ip_address     : 10.56.216.103
-  image          : asr1001x-universalk9_npe.BLD_V155_2_S_XE315_THROTTLE_LATEST_20151121_110441-std_2.SSA.bin
+  image          : asr1001x-universalk9.03.17.00.S.156-1.S-std.SPA.bin
   line_password  : cisco
   en_password    : cisco
   mgmt_interface : GigabitEthernet0
@@ -61,6 +61,6 @@ router:
 
 tftp:
   hostname       : ats-asr-srv-1
-  ip_address     : 10.56.128.23
-  root_dir       : /auto/avc-devtest/
-  images_path    : /images/RP2/
+  ip_address     : 10.56.217.7
+  root_dir       : /scratch/tftp/
+  images_path    : /asr1001x/

diff --git a/scripts/automation/regression/stateful_tests/trex_nbar_test.py b/scripts/automation/regression/stateful_tests/trex_nbar_test.py
index 74d0227..1453c02 100755 (executable)
--- a/scripts/automation/regression/stateful_tests/trex_nbar_test.py
+++ b/scripts/automation/regression/stateful_tests/trex_nbar_test.py
@@ -26,20 +26,11 @@ class CTRexNbar_Test(CTRexGeneral_Test):
         missmatchFlag = False
         missmatchMsg = "NBAR classification contians a missmatch on the following protocols:"
         fmt = '\n\t{0:15} | Expected: {1:>3.2f}%, Got: {2:>3.2f}%'
-        noise_level = 0.045 # percents
+        noise_level = 0.045
 
         for cl_intf in self.router.get_if_manager().get_if_list(if_type = IFType.Client):
             client_intf = cl_intf.get_name()
 
-            # removing noise classifications
-            for key, value in test_classification[client_intf]['percentage'].items():
-                if value <= noise_level:
-                    print 'Removing noise classification: %s' % key
-                    del test_classification[client_intf]['percentage'][key]
-
-            if len(test_classification[client_intf]['percentage']) != (len(nbar_benchmark) + 1):    # adding 'total' key to nbar_benchmark
-                raise ClassificationMissmatchError ('The total size of classification result does not match the provided benchmark.')
-
             for protocol, bench in nbar_benchmark.iteritems():
                 if protocol != 'total':
                     try:

diff --git a/scripts/automation/regression/stateless_tests/__init__.py b/scripts/automation/regression/stateless_tests/__init__.py
new file mode 100755 (executable)
index 0000000..e69de29