summaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
Diffstat (limited to 'testcases')
-rw-r--r--testcases/integration.py7
-rw-r--r--testcases/testcase.py20
2 files changed, 27 insertions, 0 deletions
diff --git a/testcases/integration.py b/testcases/integration.py
index fdd8b09c..ffde5822 100644
--- a/testcases/integration.py
+++ b/testcases/integration.py
@@ -22,10 +22,13 @@ import copy
from testcases import TestCase
from conf import settings as S
from collections import OrderedDict
+from tools import namespace
+from tools import veth
from core.loader import Loader
CHECK_PREFIX = 'validate_'
+
class IntegrationTestCase(TestCase):
"""IntegrationTestCase class
"""
@@ -115,6 +118,10 @@ class IntegrationTestCase(TestCase):
step_ok = False
if step[0] == 'vswitch':
test_object = self._vswitch_ctl.get_vswitch()
+ elif step[0] == 'namespace':
+ test_object = namespace
+ elif step[0] == 'veth':
+ test_object = veth
elif step[0] == 'trafficgen':
test_object = self._traffic_ctl
# in case of send_traffic method, ensure that specified
diff --git a/testcases/testcase.py b/testcases/testcase.py
index e5f8a14c..5f5c9358 100644
--- a/testcases/testcase.py
+++ b/testcases/testcase.py
@@ -234,6 +234,26 @@ class TestCase(object):
# restore original settings
S.load_from_dict(self._settings_original)
+ # cleanup any namespaces created
+ if os.path.isdir('/tmp/namespaces'):
+ import tools.namespace
+ namespace_list = os.listdir('/tmp/namespaces')
+ if len(namespace_list):
+ self._logger.info('Cleaning up namespaces')
+ for name in namespace_list:
+ tools.namespace.delete_namespace(name)
+ os.rmdir('/tmp/namespaces')
+ # cleanup any veth ports created
+ if os.path.isdir('/tmp/veth'):
+ import tools.veth
+ veth_list = os.listdir('/tmp/veth')
+ if len(veth_list):
+ self._logger.info('Cleaning up veth ports')
+ for eth in veth_list:
+ port1, port2 = eth.split('-')
+ tools.veth.del_veth_port(port1, port2)
+ os.rmdir('/tmp/veth')
+
def run_report(self):
""" Report test results
"""