Merge pull request #23 from xenanetworks/dev-2544

Dev 2544
xenanetworks · Feb 21, 2023 · 704212a · 704212a
2 parents 86b31a7 + 4f40681
commit 704212a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/plugin2544/meta.yml b/plugin2544/meta.yml
@@ -1,7 +1,7 @@
 name: "RFC-2544"
-version: "1.0.1"
+version: "1.0.2"
 core_version: ">=1.0.0" 
 author: 
   - "MC"
 entry_object: "TestSuite2544"
-data_model: "PluginModel2544"
+data_model: "PluginModel2544"
diff --git a/plugin2544/plugin/tc_base.py b/plugin2544/plugin/tc_base.py
@@ -125,8 +125,8 @@ async def _latency(
                 repetition=repetition,
                 duration=test_type_conf.common_options.actual_duration,
             )
-            self.resources.set_rate_percent(rate_percent)
             await self.add_learning_steps(current_packet_size)
+            self.resources.set_rate_percent(rate_percent)
             await self.start_test(test_type_conf, current_packet_size)
             result = await self.collect(params)
             await self.resources.set_tx_time_limit(0)
@@ -140,8 +140,8 @@ async def _frame_loss(
         repetition: int,
     ):
         for rate_percent in test_type_conf.rate_sweep_options.rate_sweep_list:
-            self.resources.set_rate_percent(rate_percent)
             await self.add_learning_steps(current_packet_size)
+            self.resources.set_rate_percent(rate_percent)
             await self.start_test(test_type_conf, current_packet_size)
             params = StatisticParams(
                 test_case_type=test_type_conf.test_type,
@@ -288,11 +288,15 @@ def _average_per_frame_size(
             statistic_lists = []
             for s in result.values():
                 statistic_lists.extend(s)
-            self._average_statistic(statistic_lists)
+            final = self._average_statistic(statistic_lists)
+            if final:
+                self.xoa_out.send_statistics(final)
         else:
             """calculate average based on same frame size and same rate"""
             for statistic_lists in result.values():
-                self._average_statistic(statistic_lists)
+                final = self._average_statistic(statistic_lists)
+                if final:
+                    self.xoa_out.send_statistics(final)
 
     def cal_average(
         self, test_type_conf: "AllTestType", frame_size: Optional[Decimal] = None