summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/automation/regression/setups/trex21/config.yaml35
-rw-r--r--src/dpdk/drivers/net/ixgbe/ixgbe_ethdev.c2
-rw-r--r--src/main_dpdk.cpp2
3 files changed, 5 insertions, 34 deletions
diff --git a/scripts/automation/regression/setups/trex21/config.yaml b/scripts/automation/regression/setups/trex21/config.yaml
index 3cf135c3..b4b9705b 100644
--- a/scripts/automation/regression/setups/trex21/config.yaml
+++ b/scripts/automation/regression/setups/trex21/config.yaml
@@ -1,40 +1,9 @@
################################################################
-#### TRex nightly test configuration file ####
+#### TRex configuration file ####
################################################################
-
-### TRex configuration:
-# hostname - can be DNS name or IP for the TRex machine for ssh to the box
-# password - root password for TRex machine
-# is_dual - should the TRex inject with -p ?
-# version_path - path to the TRex version and executable
-# cores - how many cores should be used
-# latency - rate of latency packets injected by the TRex
-# modes - list of modes (tagging) of this setup (loopback etc.)
-# * loopback - Trex works via loopback. Router and TFTP configurations may be skipped.
-# * VM - Virtual OS (accept low CPU utilization in tests, latency can get spikes)
-# * virt_nics - NICs are virtual (VMXNET3 etc.)
-
-### Router configuration:
-# hostname - the router hostname as apears in ______# cli prefix
-# ip_address - the router's ip that can be used to communicate with
-# image - the desired imaged wished to be loaded as the router's running config
-# line_password - router password when access via Telent
-# en_password - router password when changing to "enable" mode
-# interfaces - an array of client-server pairs, representing the interfaces configurations of the router
-# configurations - an array of configurations that could possibly loaded into the router during the test.
-# The "clean" configuration is a mandatory configuration the router will load with to run the basic test bench
-
-### TFTP configuration:
-# hostname - the tftp hostname
-# ip_address - the tftp's ip address
-# images_path - the tftp's relative path in which the router's images are located
-
-### Test_misc configuration:
-# expected_bw - the "golden" bandwidth (in Gbps) results planned on receiving from the test
-
trex:
hostname : csi-trex-21
cores : 1
- modes : ['loopback', 'virt_nics']
+ modes : [VM, loopback, vf_nics]
diff --git a/src/dpdk/drivers/net/ixgbe/ixgbe_ethdev.c b/src/dpdk/drivers/net/ixgbe/ixgbe_ethdev.c
index 03caf568..8798f6d6 100644
--- a/src/dpdk/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/src/dpdk/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -3251,6 +3251,8 @@ ixgbevf_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
for (i = 0; i < IXGBEVF_NB_XSTATS; i++) {
xstats[i].value = *(uint64_t *)(((char *)hw_stats) +
rte_ixgbevf_stats_strings[i].offset);
+ /* TRex patch */
+ xstats[i].id = i;
}
return IXGBEVF_NB_XSTATS;
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index 6fb375fa..7cb3bbd8 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -303,7 +303,7 @@ public:
m_cap = /*TREX_DRV_CAP_DROP_Q | TREX_DRV_CAP_MAC_ADDR_CHG */ TREX_DRV_FLOW_CTRL_CHG;
}
virtual void get_extended_stats(CPhyEthIF * _if, CPhyEthIFStats *stats) {
- get_extended_stats_fixed(_if, stats, 0, 4);
+ get_extended_stats_fixed(_if, stats, 4, 4);
}
virtual void update_configuration(port_cfg_t * cfg);
static CTRexExtendedDriverBase * create() {