Skip multisvm tempest tests for singlesvm setup
We have tempest tests, that should run only on multisvm mode drivers and that are not skipped for single_svm setup. Change-Id: I7d5e1880713bd3b23efd5c8efee30b448ce8b268 Closes-Bug: #1420498
This commit is contained in:
parent
75da4bc5b5
commit
071b41f438
|
@ -13,6 +13,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest.common.utils import data_utils
|
||||
from tempest import config_share as config
|
||||
|
@ -233,6 +235,8 @@ class SharesActionsAdminTest(base.BaseSharesAdminTest):
|
|||
self.assertEqual(filters['host'], share['host'])
|
||||
|
||||
@test.attr(type=["gate", ])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_list_shares_with_detail_filter_by_share_network_id(self):
|
||||
__, base_share = self.shares_client.get_share(self.share['id'])
|
||||
filters = {'share_network_id': base_share['share_network_id']}
|
||||
|
|
|
@ -14,11 +14,14 @@
|
|||
# under the License.
|
||||
|
||||
import six # noqa
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest import config_share as config
|
||||
from tempest.openstack.common import log as logging
|
||||
from tempest import test
|
||||
|
||||
CONF = config.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -53,6 +56,8 @@ class SecurityServiceListMixin(object):
|
|||
[self.assertIn(key, s_s.keys()) for s_s in listed for key in keys]
|
||||
|
||||
@test.attr(type=["gate", "smoke"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_list_security_services_filter_by_share_network(self):
|
||||
sn = self.shares_client.get_share_network(
|
||||
self.os.shares_client.share_network_id)[1]
|
||||
|
@ -168,6 +173,8 @@ class SecurityServicesTest(base.BaseSharesTest,
|
|||
self.assertDictContainsSubset(upd_data, get)
|
||||
|
||||
@test.attr(type=["gate", "smoke"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_try_update_valid_keys_sh_server_exists(self):
|
||||
ss_data = self.generate_security_service_data()
|
||||
resp, ss = self.create_security_service(**ss_data)
|
||||
|
|
|
@ -13,10 +13,15 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest import config_share as config
|
||||
from tempest import exceptions
|
||||
from tempest import test
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class SecServicesMappingNegativeTest(base.BaseSharesTest):
|
||||
|
||||
|
@ -85,6 +90,8 @@ class SecServicesMappingNegativeTest(base.BaseSharesTest):
|
|||
"wrong_id", "wrong_id")
|
||||
|
||||
@test.attr(type=["gate", "smoke", "negative"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_delete_ss_from_sn_used_by_share_server(self):
|
||||
sn = self.shares_client.get_share_network(
|
||||
self.os.shares_client.share_network_id)[1]
|
||||
|
|
|
@ -14,12 +14,15 @@
|
|||
# under the License.
|
||||
|
||||
import six # noqa
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest import config_share as config
|
||||
from tempest import exceptions
|
||||
from tempest.openstack.common import log as logging
|
||||
from tempest import test
|
||||
|
||||
CONF = config.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
@ -71,6 +74,8 @@ class SecurityServicesNegativeTest(base.BaseSharesTest):
|
|||
"", name="name")
|
||||
|
||||
@test.attr(type=["gate", "smoke", "negative"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_try_update_invalid_keys_sh_server_exists(self):
|
||||
ss_data = self.generate_security_service_data()
|
||||
resp, ss = self.create_security_service(**ss_data)
|
||||
|
|
|
@ -14,10 +14,14 @@
|
|||
# under the License.
|
||||
|
||||
import six # noqa
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest import config_share as config
|
||||
from tempest import test
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class ShareNetworkListMixin(object):
|
||||
|
||||
|
@ -176,6 +180,8 @@ class ShareNetworksTest(base.BaseSharesTest, ShareNetworkListMixin):
|
|||
self.assertDictContainsSubset(update_data, updated)
|
||||
|
||||
@test.attr(type=["gate", "smoke"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_update_valid_keys_sh_server_exists(self):
|
||||
resp, share = self.create_share(cleanup_in_class=False)
|
||||
self.assertIn(int(resp["status"]), test.HTTP_SUCCESS)
|
||||
|
|
|
@ -13,10 +13,15 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest import config_share as config
|
||||
from tempest import exceptions
|
||||
from tempest import test
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class ShareNetworksNegativeTest(base.BaseSharesTest):
|
||||
|
||||
|
@ -53,6 +58,8 @@ class ShareNetworksNegativeTest(base.BaseSharesTest):
|
|||
"", name="name")
|
||||
|
||||
@test.attr(type=["gate", "smoke", "negative"])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_try_update_invalid_keys_sh_server_exists(self):
|
||||
resp, share = self.create_share(cleanup_in_class=False)
|
||||
self.assertIn(int(resp["status"]), test.HTTP_SUCCESS)
|
||||
|
|
|
@ -13,6 +13,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import testtools # noqa
|
||||
|
||||
from tempest.api.share import base
|
||||
from tempest.common.utils import data_utils
|
||||
from tempest import config_share as config
|
||||
|
@ -165,6 +167,8 @@ class SharesActionsTest(base.BaseSharesTest):
|
|||
self.assertEqual(filters['host'], share['host'])
|
||||
|
||||
@test.attr(type=["gate", ])
|
||||
@testtools.skipIf(
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_list_shares_with_detail_filter_by_share_network_id(self):
|
||||
__, base_share = self.shares_client.get_share(self.share['id'])
|
||||
filters = {'share_network_id': base_share['share_network_id']}
|
||||
|
|
Loading…
Reference in New Issue