X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ipsec.py;h=0241fdf02b6c62b2190d559ec77a6304cbb3a14c;hb=eba31ecebed1a7d168da17194cab7a8955761f2b;hp=1218c4bb8bbdeb932f987ccb1c92757533b4eab4;hpb=17dcec0b940374127f6e1e004fb3ec261a0a3709;p=vpp.git diff --git a/test/vpp_ipsec.py b/test/vpp_ipsec.py index 1218c4bb8bb..0241fdf02b6 100644 --- a/test/vpp_ipsec.py +++ b/test/vpp_ipsec.py @@ -111,7 +111,7 @@ class VppIpsecSpdEntry(VppObject): self.remote_port_stop = remote_port_stop def add_vpp_config(self): - self.test.vapi.ipsec_spd_entry_add_del( + rv = self.test.vapi.ipsec_spd_entry_add_del( self.spd.id, self.sa_id, self.local_start, @@ -127,6 +127,7 @@ class VppIpsecSpdEntry(VppObject): local_port_stop=self.local_port_stop, remote_port_start=self.remote_port_start, remote_port_stop=self.remote_port_stop) + self.stat_index = rv.stat_index self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): @@ -171,6 +172,10 @@ class VppIpsecSpdEntry(VppObject): return True return False + def get_stats(self): + c = self.test.statistics.get_counter("/net/ipsec/policy") + return c[0][self.stat_index] + class VppIpsecSA(VppObject): """ @@ -208,7 +213,7 @@ class VppIpsecSA(VppObject): self.tun_dst = ip_address(text_type(tun_dst)) def add_vpp_config(self): - self.test.vapi.ipsec_sad_entry_add_del( + r = self.test.vapi.ipsec_sad_entry_add_del( self.id, self.spi, self.integ_alg, @@ -219,6 +224,7 @@ class VppIpsecSA(VppObject): (self.tun_src if self.tun_src else []), (self.tun_dst if self.tun_dst else []), flags=self.flags) + self.stat_index = r.stat_index self.test.registry.register(self, self.test.logger) def remove_vpp_config(self): @@ -244,6 +250,10 @@ class VppIpsecSA(VppObject): def query_vpp_config(self): bs = self.test.vapi.ipsec_sa_dump() for b in bs: - if b.sa_id == self.id: + if b.entry.sad_id == self.id: return True return False + + def get_stats(self): + c = self.test.statistics.get_counter("/net/ipsec/sa") + return c[0][self.stat_index]