diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/HoststackUtil.py | 8 | ||||
| -rw-r--r-- | resources/libraries/python/NsimUtil.py | 16 | ||||
| -rw-r--r-- | resources/libraries/robot/hoststack/hoststack.robot | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py index d184b5af6d..c307946698 100644 --- a/resources/libraries/python/HoststackUtil.py +++ b/resources/libraries/python/HoststackUtil.py @@ -289,9 +289,9 @@ class HoststackUtil(): program_cmd = f"{env_vars}{program_name} {program[u'args']}" test_results = f"Test Results of '{program_cmd}':\n" - if nsim_attr[u"output_feature_enable"] or \ - nsim_attr[u"cross_connect_feature_enable"]: - if nsim_attr[u"output_feature_enable"]: + if nsim_attr[u"output_nsim_enable"] or \ + nsim_attr[u"xc_nsim_enable"]: + if nsim_attr[u"output_nsim_enable"]: feature_name = u"output" else: feature_name = u"cross-connect" @@ -299,7 +299,7 @@ class HoststackUtil(): f"NSIM({feature_name}): delay " \ f"{nsim_attr[u'delay_in_usec']} usecs, " \ f"avg-pkt-size {nsim_attr[u'average_packet_size']}, " \ - f"bandwidth {nsim_attr[u'bandwidth_in_bits_per_second']} " \ + f"bandwidth {nsim_attr[u'bw_in_bits_per_second']} " \ f"bits/sec, pkt-drop-rate {nsim_attr[u'packets_per_drop']} " \ f"pkts/drop\n" diff --git a/resources/libraries/python/NsimUtil.py b/resources/libraries/python/NsimUtil.py index bd319e668e..3662ba4892 100644 --- a/resources/libraries/python/NsimUtil.py +++ b/resources/libraries/python/NsimUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -36,8 +36,8 @@ class NsimUtil(): vpp papi command fails. """ host = node[u"host"] - if not vpp_nsim_attr[u"output_feature_enable"] \ - and not vpp_nsim_attr[u"cross_connect_feature_enable"]: + if not vpp_nsim_attr[u"output_nsim_enable"] \ + 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" @@ -45,7 +45,7 @@ class NsimUtil(): delay_in_usec=vpp_nsim_attr[u"delay_in_usec"], average_packet_size=vpp_nsim_attr[u"average_packet_size"], bandwidth_in_bits_per_second=vpp_nsim_attr[ - u"bandwidth_in_bits_per_second" + u"bw_in_bits_per_second" ], packets_per_drop=vpp_nsim_attr[u"packets_per_drop"], ) @@ -53,10 +53,10 @@ class NsimUtil(): with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) - if vpp_nsim_attr[u"output_feature_enable"]: + if vpp_nsim_attr[u"output_nsim_enable"]: cmd = u"nsim_output_feature_enable_disable" args = dict( - enable_disable=vpp_nsim_attr[u"output_feature_enable"], + enable_disable=vpp_nsim_attr[u"output_nsim_enable"], sw_if_index=InterfaceUtil.get_interface_index(node, interface0), ) err_msg = f"Failed to enable NSIM output feature on " \ @@ -64,10 +64,10 @@ class NsimUtil(): with PapiSocketExecutor(node) as papi_exec: papi_exec.add(cmd, **args).get_reply(err_msg) - elif vpp_nsim_attr[u"cross_connect_feature_enable"]: + elif vpp_nsim_attr[u"xc_nsim_enable"]: cmd = u"nsim_cross_connect_feature_enable_disable" args = dict( - enable_disable=vpp_nsim_attr[u"cross_connect_feature_enable"], + enable_disable=vpp_nsim_attr[u"xc_nsim_enable"], sw_if_index0=InterfaceUtil.get_interface_index(node, interface0), sw_if_index1=InterfaceUtil.get_interface_index(node, diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot index c6bc7dea06..075cc2b8bf 100644 --- a/resources/libraries/robot/hoststack/hoststack.robot +++ b/resources/libraries/robot/hoststack/hoststack.robot @@ -389,7 +389,7 @@ | | ${is_dut1}= | Run Keyword And Return Status | | ... | Dictionaries should be equal | ${node} | ${dut1} | | Run Keyword If -| | ... | ${is_dut1} and ${vpp_nsim_attr}[output_feature_enable] +| | ... | ${is_dut1} and ${vpp_nsim_attr}[output_nsim_enable] | | ... | Configure VPP NSIM | ${node} | ${vpp_nsim_attr} | ${intf} | | Run Keyword If | '${cfg_vpp_feature}' != '' | | ... | Additional VPP Config for Feature ${cfg_vpp_feature} | ${node} @@ -432,7 +432,7 @@ | | | Run keyword | ${dut}.Add api segment api size | | | ... | ${vpp_hoststack_attr}[api_seg_api_size] | | | Run Keyword If -| | | ... | '${dut}' == 'DUT1' and ${vpp_nsim_attr}[output_feature_enable] +| | | ... | '${dut}' == 'DUT1' and ${vpp_nsim_attr}[output_nsim_enable] | | | ... | ${dut}.Add Nsim poll main thread | | | Run keyword | ${dut}.Add api segment gid | testuser | | | Run keyword | ${dut}.Add tcp congestion control algorithm |