change order of cores in produced config file

fix bug of writing reduced number of cores in VM
try using "main" thread for rx

Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py b/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
index be94779c..66cb666c 100755
--- a/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
+++ b/scripts/automation/regression/functional_tests/trex_cfg_creator_test.py
@@ -25,7 +25,7 @@ def compare_lines(golden, output):
         raise CompareLinesNumDiff('Number of lines on golden is: %s, in output: %s\nGolden:\n%s\nGenerated:\n%s\n' % (len(golden_lines), len(output_lines), golden, output))
     for line_num, (golden_line, output_line) in enumerate(zip(golden_lines, output_lines)):
         if golden_line != output_line:
-            raise CompareLinesDiff('Produced YAML differs from golden at line %s.Golden: %s <-> Output: %s' % (line_num + 1, golden_line, output_line))
+            raise CompareLinesDiff('Produced YAML differs from golden at line %s.\nGolden: %s <-> Output: %s' % (line_num + 1, golden_line, output_line))
 
 def create_config(cpu_topology, interfaces, *args, **kwargs):
     config = ConfigCreator(cpu_topology, interfaces, *args, **kwargs)
@@ -112,7 +112,7 @@ class TRexCfgCreator_Test:
       latency_thread_id: 1
       dual_if:
         - socket: 0
-          threads: [2]
+          threads: [2,3,4]
 '''
         output = create_config(cpu_topology, interfaces)
         verify_master_core0(output)
@@ -308,16 +308,16 @@ class TRexCfgCreator_Test:
 
   platform:
       master_thread_id: 0
-      latency_thread_id: 16
+      latency_thread_id: 12
       dual_if:
         - socket: 0
-          threads: [1,17,2,18,3,19,4]
+          threads: [1,2,3,16,17,18,19]
 
         - socket: 1
-          threads: [8,24,9,25,10,26,11]
+          threads: [8,9,10,11,24,25,26]
 
         - socket: 0
-          threads: [20,5,21,6,22,7,23]
+          threads: [4,5,6,7,20,21,22]
 '''
         output = create_config(cpu_topology, interfaces)
         verify_master_core0(output)
@@ -446,10 +446,10 @@ class TRexCfgCreator_Test:
       latency_thread_id: 31
       dual_if:
         - socket: 0
-          threads: [1,17,2,18,3,19,4,20,5,21,6,22,7,23,16]
+          threads: [1,2,3,4,5,6,7,16,17,18,19,20,21,22,23]
 
         - socket: 1
-          threads: [8,24,9,25,10,26,11,27,12,28,13,29,14,30,15]
+          threads: [8,9,10,11,12,13,14,15,24,25,26,27,28,29,30]
 '''
         output = create_config(cpu_topology, interfaces)
         verify_master_core0(output)
@@ -575,13 +575,13 @@ class TRexCfgCreator_Test:
 
   platform:
       master_thread_id: 0
-      latency_thread_id: 16
+      latency_thread_id: 8
       dual_if:
         - socket: 0
-          threads: [1,17,2,18,3,19,4]
+          threads: [1,2,3,16,17,18,19]
 
         - socket: 0
-          threads: [20,5,21,6,22,7,23]
+          threads: [4,5,6,7,20,21,22]
 '''
         output = create_config(cpu_topology, interfaces)
         verify_master_core0(output)