dhcp ip: DSCP settings for transmitted DHCP packets

[vpp.git] / test / test_ipsec_esp.py

diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 0abd96d..f5bbc54 100644 (file)
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -14,6 +14,8 @@ from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_ip import DpoProto
 from vpp_papi import VppEnum
 
+NUM_PKTS = 67
+
 
 class ConfigIpsecESP(TemplateIpsec):
     encryption_type = ESP
@@ -74,8 +76,7 @@ class ConfigIpsecESP(TemplateIpsec):
             r = VppIpRoute(self,  p.remote_tun_if_host, p.addr_len,
                            [VppRoutePath(self.tun_if.remote_addr[p.addr_type],
                                          0xffffffff,
-                                         proto=d)],
-                           is_ip6=p.is_ipv6)
+                                         proto=d)])
             r.add_vpp_config()
             self.net_objs.append(r)
 
@@ -461,6 +462,8 @@ class TestIpsecEspAll(ConfigIpsecESP,
                         p.salt = algo['salt']
                         p.flags = p.flags | flag
 
+                    self.reporter.send_keep_alive(self)
+
                     #
                     # configure the SPDs. SAs, etc
                     #
@@ -471,16 +474,26 @@ class TestIpsecEspAll(ConfigIpsecESP,
                     #  An exhautsive 4o6, 6o4 is not necessary
                     #  for each algo
                     #
-                    self.verify_tra_basic6(count=17)
-                    self.verify_tra_basic4(count=17)
-                    self.verify_tun_66(self.params[socket.AF_INET6], 17)
-                    self.verify_tun_44(self.params[socket.AF_INET], 17)
+                    self.verify_tra_basic6(count=NUM_PKTS)
+                    self.verify_tra_basic4(count=NUM_PKTS)
+                    self.verify_tun_66(self.params[socket.AF_INET6],
+                                       count=NUM_PKTS)
+                    self.verify_tun_44(self.params[socket.AF_INET],
+                                       count=NUM_PKTS)
 
                     #
                     # remove the SPDs, SAs, etc
                     #
                     self.unconfig_network()
 
+                    #
+                    # reconfigure the network and SA to run the
+                    # anti replay tests
+                    #
+                    self.config_network(self.params.values())
+                    self.verify_tra_anti_replay()
+                    self.unconfig_network()
+
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)