runners: Only disallow control_host for UDP_RR tests for IPv6

Turns out it works just fine to set a separate control_host for UDP_RR tests with IPv4, so only apply the clearing out of the control_host to IPv6 tests. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
tohojo · Sep 9, 2023 · 7b93191 · 7b93191
1 parent 069a1e5
commit 7b93191
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/flent/runners.py b/flent/runners.py
@@ -1143,15 +1143,18 @@ def check(self):
 
         elif self.test == 'UDP_RR':
             self.units = 'ms'
-            if args['control_host'] != args['host'] or \
-               args['control_local_bind'] != args['local_bind']:
+            if args['ip_version'] == 6:
+                if args['control_host'] != args['host'] or \
+                   args['control_local_bind'] != args['local_bind']:
 
-                logger.warning("UDP_RR test doesn't support setting separate control host parameters, ignoring")
-                args['control_host'] = args['host']
-                args['control_local_bind'] = args['local_bind']
+                    logger.warning("UDP_RR test doesn't support setting separate control host parameters for IPv6, ignoring")
+                    args['control_host'] = args['host']
+                    args['control_local_bind'] = args['local_bind']
 
-            args['host'] = ""
-            args['local_bind'] = ""
+                args['host'] = ""
+                args['local_bind'] = ""
+            else:
+                args['host'] = f"-H {args['host']}"
         else:
             raise RunnerCheckError(f"Unknown netperf test type: {self.test}")