summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/smoke/testcases.yaml4
-rw-r--r--functest/ci/testcases.yaml4
-rw-r--r--functest/opnfv_tests/openstack/trunk/__init__.py0
-rw-r--r--functest/opnfv_tests/openstack/trunk/trunk.py27
4 files changed, 4 insertions, 31 deletions
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 7cb723d52..68ddaeac8 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -168,7 +168,7 @@ tiers:
installer: '(fuel)|(apex)|(compass)'
scenario: ''
run:
- module: 'functest.opnfv_tests.openstack.trunk.trunk'
- class: 'TempestNeutronTrunk'
+ module: 'functest.opnfv_tests.openstack.tempest.tempest'
+ class: 'TempestCommon'
args:
mode: 'neutron.tests.tempest.(api|scenario).test_trunk'
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index b12d41631..20520ffdf 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -230,8 +230,8 @@ tiers:
installer: '(fuel)|(apex)|(compass)'
scenario: ''
run:
- module: 'functest.opnfv_tests.openstack.trunk.trunk'
- class: 'TempestNeutronTrunk'
+ module: 'functest.opnfv_tests.openstack.tempest.tempest'
+ class: 'TempestCommon'
args:
mode: 'neutron.tests.tempest.(api|scenario).test_trunk'
diff --git a/functest/opnfv_tests/openstack/trunk/__init__.py b/functest/opnfv_tests/openstack/trunk/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/functest/opnfv_tests/openstack/trunk/__init__.py
+++ /dev/null
diff --git a/functest/opnfv_tests/openstack/trunk/trunk.py b/functest/opnfv_tests/openstack/trunk/trunk.py
deleted file mode 100644
index 8d177675b..000000000
--- a/functest/opnfv_tests/openstack/trunk/trunk.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2018 Orange and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# pylint: disable=missing-docstring
-
-from six.moves import configparser
-
-from functest.opnfv_tests.openstack.tempest import tempest
-
-
-class TempestNeutronTrunk(tempest.TempestCommon):
- """Tempest neutron trunk testcase implementation."""
-
- def configure(self, **kwargs):
- super(TempestNeutronTrunk, self).configure(**kwargs)
- rconfig = configparser.RawConfigParser()
- rconfig.read(self.conf_file)
- rconfig.set('network-feature-enabled', 'api_extensions', 'all')
- with open(self.conf_file, 'wb') as config_file:
- rconfig.write(config_file)
- self.backup_tempest_config(self.conf_file, self.res_dir)