commit 21874c703f3edc7ca0b8e5a621507b2eeea03cc2
author Zuul <zuul@review.opendev.org> Wed Jul 05 10:30:20 2023 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 05 10:30:20 2023 +0000
tree c7295cd5d72e6977616c96624162cfa42a907518
parent 75ce4eb4ad1cfe6c220d77a1d8d1ca106554c318
parent fddcd186a496b4510ca29952e1529430a2072033

Merge "Add "-d 1" option to the ncat client."

neutron_tempest_plugin/scenario/base.py

diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index 078a515..9d53f79 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -76,9 +76,11 @@
 
 def get_ncat_client_cmd(ip_address, port, protocol, ssh_client=None):
     cmd = 'echo "knock knock" | nc '
+    ncat_version = get_ncat_version(ssh_client=ssh_client)
+    if ncat_version > packaging_version.Version('7.60'):
+        cmd += '-d 1 '
     if protocol.lower() == neutron_lib_constants.PROTO_NAME_UDP:
         cmd += '-u '
-        ncat_version = get_ncat_version(ssh_client=ssh_client)
         if ncat_version > packaging_version.Version('7.60'):
             cmd += '-z '
     cmd += '-w 1 %(host)s %(port)s' % {'host': ip_address, 'port': port}