diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/python/VppConfigGenerator.py | 9 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 22 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index e5a54422c7..8611219eed 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -352,6 +352,15 @@ class VppConfigGenerator(object): path = ['dpdk', 'socket-mem'] self.add_config_item(self._nodeconfig, value, path) + def add_dpdk_num_mbufs(self, value): + """Add DPDK number of I/O buffers. + + :param value: Number of I/O buffers. + :type value: int + """ + path = ['dpdk', 'num-mbufs'] + self.add_config_item(self._nodeconfig, value, path) + def add_dpdk_uio_driver(self, value=None): """Add DPDK uio-driver configuration. diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 045a5d36ef..d2e18ea42c 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -101,8 +101,7 @@ | | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP | | ... | interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG links and -| | ... | /30 prefix on DUT1 link. Set routing on DUT node with prefix /24 and -| | ... | next hop of neighbour DUT interface IPv4 address. +| | ... | /30 prefix on DUT1 link. | | ... | | Set Interface State | ${dut1} | ${dut1_if1} | up | | Set Interface State | ${dut1} | ${dut1_if2} | up @@ -513,6 +512,23 @@ | | Policer Classify Set Match IP | 10.10.10.2 | ${False} | | Policer Set Configuration +| Initialize IPv6 forwarding in 2-node circular topology +| | [Documentation] +| | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular +| | ... | topology. Get the interface MAC addresses and setup neighbour on all +| | ... | VPP interfaces. Setup IPv6 addresses with /128 prefixes on all +| | ... | interfaces. +| | ... +| | ${prefix}= | Set Variable | 64 +| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} +| | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | 2001:1::1 | ${prefix} +| | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | 2001:2::1 | ${prefix} +| | Suppress ICMPv6 router advertisement message | ${nodes} +| | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} +| | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:2::2 | ${tg1_if2_mac} +| | All Vpp Interfaces Ready Wait | ${nodes} + | Initialize IPv6 forwarding in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular @@ -537,6 +553,7 @@ | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac} | | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2} | | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1} +| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize IPv6 forwarding with scaling in 3-node circular topology | | [Documentation] @@ -579,6 +596,7 @@ | | ... | interface=${dut2_if1} | count=${count} | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2 | | ... | interface=${dut2_if2} | count=${count} +| | All Vpp Interfaces Ready Wait | ${nodes} | Initialize IPv6 iAcl whitelist in 3-node circular topology | | [Documentation] diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index d0bd929386..842cb7faa0 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 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: @@ -152,6 +152,7 @@ | | ... | | ${cpu_count_int} | Convert to Integer | ${phy_cores} | | ${thr_count_int} | Convert to Integer | ${phy_cores} +| | ${num_mbufs_int} | Convert to Integer | 16384 | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} @@ -170,9 +171,11 @@ | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} +| | | ${num_mbufs_int}= | Evaluate | int(${num_mbufs_int}*${rxq_count_int}) | | | Run keyword | ${dut}.Add CPU Main Core | ${cpu_main} | | | Run keyword | ${dut}.Add CPU Corelist Workers | ${cpu_wt} | | | Run keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} +| | | Run keyword | ${dut}.Add DPDK Num Mbufs | ${num_mbufs_int} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C |