[dts] [PATCH V1] tests/ipgre: optimize script

[Wenjie Li <wenjiex.a.li@intel.com>]

1. could support cvl nic, add cvl to nic list
2. move dut.kill_all from tear_down_all to tear_down, since testpmd will
be started in every case, if one case is failed, the testpmd is still
runnning, this will affect the following cases.

Signed-off-by: Wenjie Li <wenjiex.a.li@intel.com>
---
 tests/TestSuite_ipgre.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_ipgre.py b/tests/TestSuite_ipgre.py
index 7fbddf1..e10b0e0 100644
--- a/tests/TestSuite_ipgre.py
+++ b/tests/TestSuite_ipgre.py
@@ -63,7 +63,7 @@ class TestIpgre(TestCase):
         """
         self.printFlag = self._enable_debug
         ports = self.dut.get_ports()
-        self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville"],
+        self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "carlsville", "columbiaville_25g", "columbiaville_100g"],
                     "GRE tunnel packet type only support by fortville and carlsville")
         self.verify(len(ports) >= 1, "Insufficient ports for testing")
         valports = [_ for _ in ports if self.tester.get_local_port(_) != -1]
@@ -439,12 +439,11 @@ class TestIpgre(TestCase):
         Run after each test case.
         Nothing to do.
         """
-        pass
+        self.dut.kill_all()
 
     def tear_down_all(self):
         """
         Run after each test suite.
         Nothing to do.
         """
-        self.dut.kill_all()
         pass
-- 
2.17.1