vxlan: vxlan/vxlan.api API cleanup

[vpp.git] / test / test_srmpls.py

diff --git a/test/test_srmpls.py b/test/test_srmpls.py
index ded4a71..b9abeae 100644 (file)
--- a/test/test_srmpls.py
+++ b/test/test_srmpls.py
@@ -1,13 +1,12 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
 
 from framework import VppTestCase, VppTestRunner
+from vpp_ip import DpoProto
 from vpp_ip_route import VppIpRoute, VppRoutePath, VppMplsRoute, \
-    VppMplsIpBind, VppIpMRoute, VppMRoutePath, \
-    MRouteItfFlags, MRouteEntryFlags, DpoProto, VppIpTable, VppMplsTable, \
-    VppMplsLabel, MplsLspMode
+    VppIpTable, VppMplsTable, VppMplsLabel
 from vpp_mpls_tunnel_interface import VppMPLSTunnelInterface
 
 from scapy.packet import Raw
@@ -50,6 +49,14 @@ def verify_mpls_stack(tst, rx, mpls_labels):
 class TestSRMPLS(VppTestCase):
     """ SR-MPLS Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestSRMPLS, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestSRMPLS, cls).tearDownClass()
+
     def setUp(self):
         super(TestSRMPLS, self).setUp()
 
@@ -77,7 +84,6 @@ class TestSRMPLS(VppTestCase):
         for i in self.pg_interfaces:
             i.unconfig_ip4()
             i.unconfig_ip6()
-            i.ip6_disable()
             i.disable_mpls()
             i.admin_down()
         super(TestSRMPLS, self).tearDown()