aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-01-17 18:16:10 +0000
committerPeter Mikus <pmikus@cisco.com>2019-01-17 20:03:50 +0000
commit183ea3eb1b74ba46fd7964a1663cd4158fc156b0 (patch)
tree3754cc7afa57718b988286601d5420abaecc49a4
parent3c0287ab9e061d64b214ec743e44b77e675cdd53 (diff)
FIX SRv6 container tests after refactor
Change-Id: I6b7961c9103587b752c6ffc2a56eb98ed1529edb Signed-off-by: Peter Mikus <pmikus@cisco.com> (cherry picked from commit 0e1682e5580ea16597558f2c8ae5892072e1bd22) (cherry picked from commit 87830a03b39d4ce3306b05693f0e15979d955425)
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot17
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot17
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot17
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot17
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot17
-rw-r--r--tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot17
6 files changed, 36 insertions, 66 deletions
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
index 7bb1e27d23..f2eeecbfa9 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
@@ -23,13 +23,14 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Dynamic SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down mrr test with SRv6 with encapsulation
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local template
| ...
@@ -88,16 +89,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local template
@@ -120,6 +114,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index 968d11ecb0..bfbf299dda 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -23,14 +23,15 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Dynamic SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down performance test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down performance test with SRv6 with encapsulation
| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local Template
| ...
@@ -94,16 +95,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local Template
@@ -130,6 +124,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
index 85ec7b9b6a..0a09eb4bd5 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
@@ -23,13 +23,14 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Masquerading SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down mrr test with SRv6 with encapsulation
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local template
| ...
@@ -88,16 +89,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local template
@@ -120,6 +114,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index aae3149b41..9b86c4c8ee 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -23,14 +23,15 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Masquerading SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down performance test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down performance test with SRv6 with encapsulation
| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local Template
| ...
@@ -94,16 +95,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local Template
@@ -130,6 +124,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
index cf4d1fd1fc..6e93160aab 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
@@ -23,13 +23,14 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Static SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down mrr test with SRv6 with encapsulation
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local template
| ...
@@ -88,16 +89,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local template
@@ -120,6 +114,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
| | Then Traffic should pass with maximum rate
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index 9510bbf499..fedc6fc201 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -23,14 +23,15 @@
| ... | Intel-X520-DA2
| ... | AND | Set up performance test suite with MEMIF
| ... | AND | Set up performance test suite with Static SRv6 proxy
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down performance test with SRv6 with encapsulation
+| Test Teardown | Run Keywords
+| ... | Tear down performance test with SRv6 with encapsulation
| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local Template
| ...
@@ -94,16 +95,9 @@
| ${srv6_overhead_3sids}= | ${96}
# Traffic profile:
| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# LXC container
-| ${container_count}= | ${1}
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local Template
@@ -130,6 +124,7 @@
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_limit} | ${framesize} | overhead=${srv6_overhead_3sids}
| | And Apply startup configuration on all VPP DUTs
+| | And Set up performance test with containers | chains=${1} | nodeness=${1}
| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}