From 56c1c013bd0d632256efa4cb6b0224bf9c608afa Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Thu, 20 Jun 2019 19:49:35 +0200
Subject: FIX: IPUtil after vpp api changes

 + do not log all ip_route_add_del api calls to PAPI history
   in case of scale tests

 + fix for SRv6 proxy tests

 + support of more complex structures in api calls/replies
   in PapiExecutor

 + update of vpp stable build to version 19.08-rc0~487-gb98dbb1

Change-Id: I9972e126b68ce1cb57f781e3d90ea9b3914de69e
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 .../srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot   | 3 ++-
 .../srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot  | 3 ++-
 .../srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index 292a4ae225..4711b24cc0 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -83,6 +83,7 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
+| ${mem_prefix}= | ${128}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -112,7 +113,7 @@
 | | And Add PCI devices to all DUTs
 | | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
+| | And Start containers for performance test | nf_chains=${1} | nf_nodes=${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
 
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index 1f9660ed86..2cffbec09e 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -83,6 +83,7 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
+| ${mem_prefix}= | ${128}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -112,7 +113,7 @@
 | | And Add PCI devices to all DUTs
 | | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
+| | And Start containers for performance test | nf_chains=${1} | nf_nodes=${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
 
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index 1b4dfd4d60..3c52a65f0a 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -83,6 +83,7 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
+| ${mem_prefix}= | ${128}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -112,7 +113,7 @@
 | | And Add PCI devices to all DUTs
 | | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
+| | And Start containers for performance test | nf_chains=${1} | nf_nodes=${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
 
-- 
cgit 1.2.3-korg