hs-test: fix LDPreloadIperfVppTest

[vpp.git] / test / vpp_papi_provider.py

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index a4a3799..2d49bf2 100644 (file)
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -6,6 +6,7 @@
 #
 
 import os
+import socket
 import time
 import queue
 from six import moves, iteritems
@@ -50,13 +51,6 @@ defaultmapping = {
     "bier_table_add_del": {
         "is_add": 1,
     },
-    "bridge_domain_add_del": {
-        "flood": 1,
-        "uu_flood": 1,
-        "forward": 1,
-        "learn": 1,
-        "is_add": 1,
-    },
     "bvi_delete": {},
     "geneve_add_del_tunnel": {
         "mcast_sw_if_index": 4294967295,
@@ -243,11 +237,8 @@ class VppPapiProvider(object):
         self._expect_api_retval = self._zero
         self._expect_stack = []
 
-        # install_dir is a class attribute. We need to set it before
-        # calling the constructor.
-        VPPApiClient.apidir = config.vpp_install_dir
-
         self.vpp = VPPApiClient(
+            apidir=config.extern_apidir + [config.vpp_install_dir],
             logger=test_class.logger,
             read_timeout=read_timeout,
             use_socket=True,
@@ -980,7 +971,7 @@ class VppPapiProvider(object):
         local_port_stop=65535,
         remote_port_start=0,
         remote_port_stop=65535,
-        protocol=0,
+        protocol=socket.IPPROTO_RAW,
         policy=0,
         priority=100,
         is_outbound=1,
@@ -1010,7 +1001,7 @@ class VppPapiProvider(object):
         :param is_add: (Default value = 1)
         """
         return self.api(
-            self.papi.ipsec_spd_entry_add_del,
+            self.papi.ipsec_spd_entry_add_del_v2,
             {
                 "is_add": is_add,
                 "entry": {