X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ipsec.py;h=e354cfc8ac6f57d9d67a7c5aa819c6b7e2990c8f;hb=4941afb4f96a20df7dc8b6688f7921a3d713b77d;hp=f50d491c3964c283ed0b628a5f09f0a372c9f4b7;hpb=4117b24acb4241d7f2ef38248bc254f6a4a7b422;p=vpp.git diff --git a/test/vpp_ipsec.py b/test/vpp_ipsec.py index f50d491c396..e354cfc8ac6 100644 --- a/test/vpp_ipsec.py +++ b/test/vpp_ipsec.py @@ -218,6 +218,7 @@ class VppIpsecSA(VppObject): udp_src=None, udp_dst=None, hop_limit=None, + anti_replay_window_size=0, ): e = VppEnum.vl_api_ipsec_sad_flags_t self.test = test @@ -229,6 +230,7 @@ class VppIpsecSA(VppObject): self.crypto_key = crypto_key self.proto = proto self.salt = salt + self.anti_replay_window_size = anti_replay_window_size self.table_id = 0 self.tun_src = tun_src @@ -284,13 +286,14 @@ class VppIpsecSA(VppObject): "tunnel": self.tunnel_encode(), "flags": self.flags, "salt": self.salt, + "anti_replay_window_size": self.anti_replay_window_size, } # don't explicitly send the defaults, let papi fill them in if self.udp_src: entry["udp_src_port"] = self.udp_src if self.udp_dst: entry["udp_dst_port"] = self.udp_dst - r = self.test.vapi.ipsec_sad_entry_add(entry=entry) + r = self.test.vapi.ipsec_sad_entry_add_v2(entry=entry) self.stat_index = r.stat_index self.test.registry.register(self, self.test.logger) return self @@ -324,7 +327,7 @@ class VppIpsecSA(VppObject): def query_vpp_config(self): e = VppEnum.vl_api_ipsec_sad_flags_t - bs = self.test.vapi.ipsec_sa_v3_dump() + bs = self.test.vapi.ipsec_sa_v5_dump() for b in bs: if b.entry.sad_id == self.id: # if udp encap is configured then the ports should match @@ -358,8 +361,8 @@ class VppIpsecSA(VppObject): # +1 to skip main thread return c[worker + 1][self.stat_index] - def get_lost(self, worker=None): - c = self.test.statistics.get_counter("/net/ipsec/sa/lost") + def get_err(self, name, worker=None): + c = self.test.statistics.get_counter("/net/ipsec/sa/err/" + name) if worker is None: total = 0 for t in c: