X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_container.py;h=474805333c5f3ec76703125cbcca978bdb91a12a;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=56644bce610ec7c5eea6b9e84286effa81cb8576;hpb=8d991d923b52a2692370bfa33902d29ff5d2f826;p=vpp.git diff --git a/test/test_container.py b/test/test_container.py index 56644bce610..474805333c5 100644 --- a/test/test_container.py +++ b/test/test_container.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Container integration tests """ import unittest @@ -45,9 +45,9 @@ class ContainerIntegrationTestCase(VppTestCase): """Run standard test teardown and log various show commands """ super(ContainerIntegrationTestCase, self).tearDown() - if not self.vpp_dead: - self.logger.info(self.vapi.cli("show ip arp")) - self.logger.info(self.vapi.cli("show ip6 neighbors")) + + def show_commands_at_teardown(self): + self.logger.info(self.vapi.cli("show ip neighbors")) def run_basic_conn_test(self, af, acl_side): """ Basic connectivity test """ @@ -81,11 +81,11 @@ class ContainerIntegrationTestCase(VppTestCase): for i in range(2): intf = self.lo_interfaces[i] intf.admin_up() - intf._local_ip4 = self.pg_interfaces[i].remote_ip4 - intf._local_ip4_prefix_len = 32 + intf.local_ip4 = self.pg_interfaces[i].remote_ip4 + intf.local_ip4_prefix_len = 32 intf.config_ip4() - intf._local_ip6 = self.pg_interfaces[i].remote_ip6 - intf._local_ip6_prefix_len = 128 + intf.local_ip6 = self.pg_interfaces[i].remote_ip6 + intf.local_ip6_prefix_len = 128 intf.config_ip6() def test_0110_basic_conn_test(self):