diff options
| -rw-r--r-- | resources/api/vpp/supported_crcs.yaml | 4 | ||||
| -rw-r--r-- | resources/libraries/python/NsimUtil.py | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/resources/api/vpp/supported_crcs.yaml b/resources/api/vpp/supported_crcs.yaml index 70f04f93f7..d15e9f44c3 100644 --- a/resources/api/vpp/supported_crcs.yaml +++ b/resources/api/vpp/supported_crcs.yaml @@ -210,8 +210,8 @@ nat_worker_details: '0x84bf06fc' # dev teardown nat_worker_dump: '0x51077d14' # dev teardown # TODO: Which test to run to verify nat* messages? - nsim_configure: '0x16ed400f' # perf - nsim_configure_reply: '0xe8d4e804' # perf + nsim_configure2: '0x64de8ed3' # perf + nsim_configure2_reply: '0xe8d4e804' # perf nsim_output_feature_enable_disable: '0x3865946c' # perf nsim_output_feature_enable_disable_reply: '0xe8d4e804' # perf # 4x^ tc01-9000B-1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps diff --git a/resources/libraries/python/NsimUtil.py b/resources/libraries/python/NsimUtil.py index 3662ba4892..85e41a4553 100644 --- a/resources/libraries/python/NsimUtil.py +++ b/resources/libraries/python/NsimUtil.py @@ -40,7 +40,7 @@ class NsimUtil(): and not vpp_nsim_attr[u"xc_nsim_enable"]: raise RuntimeError(f"No NSIM features enabled on host {host}:\n" f"vpp_nsim_attr = {vpp_nsim_attr}") - cmd = u"nsim_configure" + cmd = u"nsim_configure2" args = dict( delay_in_usec=vpp_nsim_attr[u"delay_in_usec"], average_packet_size=vpp_nsim_attr[u"average_packet_size"], @@ -48,10 +48,18 @@ class NsimUtil(): u"bw_in_bits_per_second" ], packets_per_drop=vpp_nsim_attr[u"packets_per_drop"], + packets_per_reorder=vpp_nsim_attr.get(u"packets_per_reorder", 0) ) err_msg = f"Failed to configure NSIM on host {host}" - with PapiSocketExecutor(node) as papi_exec: - papi_exec.add(cmd, **args).get_reply(err_msg) + try: + with PapiSocketExecutor(node) as papi_exec: + papi_exec.add(cmd, **args).get_reply(err_msg) + except AssertionError: + # Perhaps VPP is an older version + old_cmd = u"nsim_configure" + args.pop(u"packets_per_reorder") + with PapiSocketExecutor(node) as papi_exec: + papi_exec.add(old_cmd, **args).get_reply(err_msg) if vpp_nsim_attr[u"output_nsim_enable"]: cmd = u"nsim_output_feature_enable_disable" |