tests: make tests less make dependent

[vpp.git] / test / test_container.py

diff --git a/test/test_container.py b/test/test_container.py
index 139dfcf..739aaaf 100644 (file)
--- a/test/test_container.py
+++ b/test/test_container.py
@@ -1,8 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Container integration tests """
 
 import unittest
-from framework import VppTestCase, VppTestRunner, running_extended_tests
+from config import config
+from framework import VppTestCase, VppTestRunner
 from scapy.layers.l2 import Ether
 from scapy.packet import Raw
 from scapy.layers.inet import IP, UDP, TCP
@@ -21,7 +22,7 @@ class Conn(L4_Conn):
     pass
 
 
-@unittest.skipUnless(running_extended_tests, "part of extended tests")
+@unittest.skipUnless(config.extended, "part of extended tests")
 class ContainerIntegrationTestCase(VppTestCase):
     """ Container integration extended testcases """
 
@@ -47,8 +48,7 @@ class ContainerIntegrationTestCase(VppTestCase):
         super(ContainerIntegrationTestCase, self).tearDown()
 
     def show_commands_at_teardown(self):
-        self.logger.info(self.vapi.cli("show ip arp"))
-        self.logger.info(self.vapi.cli("show ip6 neighbors"))
+        self.logger.info(self.vapi.cli("show ip neighbors"))
 
     def run_basic_conn_test(self, af, acl_side):
         """ Basic connectivity test """
@@ -82,11 +82,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):