Tests: Refactor tearDown show command logging, add lifecycle markers.

[vpp.git] / test / test_span.py

diff --git a/test/test_span.py b/test/test_span.py
index dddd57f..78a4f76 100644 (file)
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -9,9 +9,8 @@ from scapy.layers.vxlan import VXLAN
 
 from framework import VppTestCase, VppTestRunner
 from util import Host, ppp
-from vpp_sub_interface import VppDot1QSubint, VppDot1ADSubint
+from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint, VppDot1ADSubint
 from vpp_gre_interface import VppGreInterface, VppGre6Interface
-from vpp_papi_provider import L2_VTR_OP
 from collections import namedtuple
 
 Tag = namedtuple('Tag', ['dot1', 'vlan'])
@@ -62,8 +61,9 @@ class TestSpan(VppTestCase):
 
     def tearDown(self):
         super(TestSpan, self).tearDown()
-        if not self.vpp_dead:
-            self.logger.info(self.vapi.ppcli("show interface span"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.ppcli("show interface span"))
 
     def xconnect(self, a, b, is_add=1):
         self.vapi.sw_interface_set_l2_xconnect(a, b, enable=is_add)
@@ -233,7 +233,7 @@ class TestSpan(VppTestCase):
 
         self.sub_if.admin_up()
         self.vapi.sw_interface_set_flags(self.vxlan.sw_if_index,
-                                         flags=1)
+                                         admin_up_down=1)
 
         self.bridge(self.vxlan.sw_if_index, is_add=1)
         # Create bi-directional cross-connects between pg0 subif and pg1