hs-test: fix TCP with loss test

Load NSIM plugin.

Type: test

Change-Id: I250f51e6622419d98fd17216031a5b4d2da07fba
Signed-off-by: Matus Fabian <matfabia@cisco.com>

diff --git a/extras/hs-test/docker/Dockerfile.vpp b/extras/hs-test/docker/Dockerfile.vpp
index a8c9847..ace83c5 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.vpp
+++ b/extras/hs-test/docker/Dockerfile.vpp
@@ -17,6 +17,7 @@ COPY \
    $DIR/quic_plugin.so \
    $DIR/http_static_plugin.so \
    $DIR/ping_plugin.so \
+   $DIR/nsim_plugin.so \
    $DIR/prom_plugin.so \
    $DIR/tlsopenssl_plugin.so \
    /usr/lib/x86_64-linux-gnu/vpp_plugins/

diff --git a/extras/hs-test/echo_test.go b/extras/hs-test/echo_test.go
index 710163c..0515b5e 100644 (file)
--- a/extras/hs-test/echo_test.go
+++ b/extras/hs-test/echo_test.go
@@ -30,18 +30,15 @@ func TcpWithLossTest(s *VethsSuite) {
 
        clientVpp := s.getContainerByName("client-vpp").vppInstance
 
-       // TODO: investigate why this ping was here:
-       // ---------
        // Ensure that VPP doesn't abort itself with NSIM enabled
-       // Warning: Removing this ping will make the test fail!
-       // clientVpp.vppctl("ping %s", serverVeth.ip4AddressString())
-       // ---------
+       // Warning: Removing this ping will make VPP crash!
+       clientVpp.vppctl("ping %s", serverVeth.ip4AddressString())
 
        // Add loss of packets with Network Delay Simulator
        clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit" +
                " packet-size 1400 packets-per-drop 1000")
 
-       clientVpp.vppctl("nsim output-feature enable-disable " + s.getInterfaceByName(clientInterfaceName).name)
+       clientVpp.vppctl("nsim output-feature enable-disable host-" + s.getInterfaceByName(clientInterfaceName).name)
 
        // Do echo test from client-vpp container
        output := clientVpp.vppctl("test echo client uri tcp://%s/20022 verbose echo-bytes mbytes 50",

diff --git a/extras/hs-test/vppinstance.go b/extras/hs-test/vppinstance.go
index d78e6c5..7ddec7e 100644 (file)
--- a/extras/hs-test/vppinstance.go
+++ b/extras/hs-test/vppinstance.go
@@ -61,6 +61,7 @@ plugins {
   plugin prom_plugin.so { enable }
   plugin tlsopenssl_plugin.so { enable }
   plugin ping_plugin.so { enable }
+  plugin nsim_plugin.so { enable }
 }
 
 logging {