Merge "api-tests: Common way to define required extensions"
diff --git a/neutron/tests/tempest/api/test_qos.py b/neutron/tests/tempest/api/test_qos.py
index c15f10a..93f96b7 100644
--- a/neutron/tests/tempest/api/test_qos.py
+++ b/neutron/tests/tempest/api/test_qos.py
@@ -80,7 +80,8 @@
def test_policy_update(self):
policy = self.create_qos_policy(name='test-policy',
description='',
- shared=False)
+ shared=False,
+ tenant_id=self.admin_client.tenant_id)
self.admin_client.update_qos_policy(policy['id'],
description='test policy desc2',
shared=True)
@@ -117,7 +118,8 @@
def test_shared_policy_update(self):
policy = self.create_qos_policy(name='test-policy',
description='',
- shared=True)
+ shared=True,
+ tenant_id=self.admin_client.tenant_id)
self.admin_client.update_qos_policy(policy['id'],
description='test policy desc2')
@@ -603,7 +605,8 @@
def test_policy_sharing_with_wildcard(self):
qos_pol = self.create_qos_policy(
name=data_utils.rand_name('test-policy'),
- description='test-shared-policy', shared=False)
+ description='test-shared-policy', shared=False,
+ tenant_id=self.admin_client.tenant_id)
self.assertNotIn(qos_pol, self.client2.list_qos_policies()['policies'])
# test update shared False -> True
diff --git a/neutron/tests/tempest/api/test_tag.py b/neutron/tests/tempest/api/test_tag.py
index cf8f3a2..dc78e60 100644
--- a/neutron/tests/tempest/api/test_tag.py
+++ b/neutron/tests/tempest/api/test_tag.py
@@ -45,6 +45,10 @@
self.client.update_tag(self.resource, self.res_id, 'red')
self._get_and_compare_tags(['red', 'blue', 'green'])
+ # add a tag with a dot
+ self.client.update_tag(self.resource, self.res_id, 'black.or.white')
+ self._get_and_compare_tags(['red', 'blue', 'green', 'black.or.white'])
+
# replace tags
tags = ['red', 'yellow', 'purple']
res_body = self.client.update_tags(self.resource, self.res_id, tags)
diff --git a/neutron/tests/tempest/scenario/test_qos.py b/neutron/tests/tempest/scenario/test_qos.py
index c4d22cd..616ecb5 100644
--- a/neutron/tests/tempest/scenario/test_qos.py
+++ b/neutron/tests/tempest/scenario/test_qos.py
@@ -20,7 +20,6 @@
from tempest.lib import decorators
from tempest.lib import exceptions
from tempest import test
-import testtools
from neutron.common import utils
from neutron.services.qos import qos_consts
@@ -83,7 +82,6 @@
@classmethod
@test.requires_ext(extension="qos", service="network")
@base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
- @testtools.skip('bug/1662109')
def resource_setup(cls):
super(QoSTest, cls).resource_setup()