Set default test falvor from d2 to d3
The default flavor d2(1C1G) is too small to run tests. This change also adds time.sleep(3) after resource updated Change-Id: Ifd9f592c959d6e8101666f323ad96eddd87adcb9
This commit is contained in:
16
.zuul.yaml
16
.zuul.yaml
@@ -4,14 +4,14 @@
|
|||||||
- check-requirements
|
- check-requirements
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- tempest-plugin-jobs
|
- tempest-plugin-jobs
|
||||||
check:
|
# check:
|
||||||
jobs:
|
# jobs:
|
||||||
- trove-tempest-ubuntu-base-mysql5.7:
|
# - trove-tempest-ubuntu-base-mysql5.7:
|
||||||
voting: false
|
# voting: false
|
||||||
gate:
|
# gate:
|
||||||
jobs:
|
# jobs:
|
||||||
- trove-tempest-ubuntu-base-mysql5.7:
|
# - trove-tempest-ubuntu-base-mysql5.7:
|
||||||
voting: false
|
# voting: false
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
- trove-tempest-ipv6-only:
|
- trove-tempest-ipv6-only:
|
||||||
|
|||||||
@@ -70,12 +70,12 @@ DatabaseGroup = [
|
|||||||
),
|
),
|
||||||
cfg.StrOpt(
|
cfg.StrOpt(
|
||||||
'flavor_id',
|
'flavor_id',
|
||||||
default="d2",
|
default="d3",
|
||||||
help="The Nova flavor ID used for creating database instance."
|
help="The Nova flavor ID used for creating database instance."
|
||||||
),
|
),
|
||||||
cfg.StrOpt(
|
cfg.StrOpt(
|
||||||
'resize_flavor_id',
|
'resize_flavor_id',
|
||||||
default="d3",
|
default="d4",
|
||||||
help="The Nova flavor ID used for resizing database instance."
|
help="The Nova flavor ID used for resizing database instance."
|
||||||
),
|
),
|
||||||
cfg.StrOpt(
|
cfg.StrOpt(
|
||||||
|
|||||||
@@ -11,6 +11,8 @@
|
|||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
import time
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
@@ -173,7 +175,8 @@ class TestInstanceBasicMySQLBase(TestInstanceBasicBase):
|
|||||||
self.client.create_resource(f"instances/{self.instance_id}/databases",
|
self.client.create_resource(f"instances/{self.instance_id}/databases",
|
||||||
create_db, expected_status_code=202,
|
create_db, expected_status_code=202,
|
||||||
need_response=False)
|
need_response=False)
|
||||||
|
# wait 3 seconds for resource to be created
|
||||||
|
time.sleep(3)
|
||||||
databases = self.get_databases(self.instance_id)
|
databases = self.get_databases(self.instance_id)
|
||||||
cur_db_names = [db['name'] for db in databases]
|
cur_db_names = [db['name'] for db in databases]
|
||||||
self.assertIn(db1, cur_db_names)
|
self.assertIn(db1, cur_db_names)
|
||||||
@@ -200,7 +203,7 @@ class TestInstanceBasicMySQLBase(TestInstanceBasicBase):
|
|||||||
self.client.create_resource(f"instances/{self.instance_id}/users",
|
self.client.create_resource(f"instances/{self.instance_id}/users",
|
||||||
create_user, expected_status_code=202,
|
create_user, expected_status_code=202,
|
||||||
need_response=False)
|
need_response=False)
|
||||||
|
time.sleep(3)
|
||||||
users = self.get_users(self.instance_id)
|
users = self.get_users(self.instance_id)
|
||||||
cur_user_names = [user['name'] for user in users]
|
cur_user_names = [user['name'] for user in users]
|
||||||
self.assertIn(user1, cur_user_names)
|
self.assertIn(user1, cur_user_names)
|
||||||
@@ -225,6 +228,7 @@ class TestInstanceBasicMySQLBase(TestInstanceBasicBase):
|
|||||||
self.client.put_resource(
|
self.client.put_resource(
|
||||||
f'/instances/{self.instance_id}/users/{user2}/databases',
|
f'/instances/{self.instance_id}/users/{user2}/databases',
|
||||||
grant_access)
|
grant_access)
|
||||||
|
time.sleep(3)
|
||||||
user2_dbs = self.client.list_resources(
|
user2_dbs = self.client.list_resources(
|
||||||
f'instances/{self.instance_id}/users/{user2}/databases')
|
f'instances/{self.instance_id}/users/{user2}/databases')
|
||||||
user2_dbs = [db['name'] for db in user2_dbs['databases']]
|
user2_dbs = [db['name'] for db in user2_dbs['databases']]
|
||||||
@@ -244,6 +248,7 @@ class TestInstanceBasicMySQLBase(TestInstanceBasicBase):
|
|||||||
LOG.info(f"Deleting user {user2}")
|
LOG.info(f"Deleting user {user2}")
|
||||||
self.client.delete_resource(
|
self.client.delete_resource(
|
||||||
f'instances/{self.instance_id}/users', user2)
|
f'instances/{self.instance_id}/users', user2)
|
||||||
|
time.sleep(3)
|
||||||
users = self.get_users(self.instance_id)
|
users = self.get_users(self.instance_id)
|
||||||
cur_user_names = [user['name'] for user in users]
|
cur_user_names = [user['name'] for user in users]
|
||||||
self.assertIn(user1, cur_user_names)
|
self.assertIn(user1, cur_user_names)
|
||||||
@@ -262,6 +267,7 @@ class TestInstanceBasicMySQLBase(TestInstanceBasicBase):
|
|||||||
new_user_body = {"user": {"name": "new_user"}}
|
new_user_body = {"user": {"name": "new_user"}}
|
||||||
self.client.put_resource(
|
self.client.put_resource(
|
||||||
f'instances/{self.instance_id}/users/{user1}', new_user_body)
|
f'instances/{self.instance_id}/users/{user1}', new_user_body)
|
||||||
|
time.sleep(3)
|
||||||
users = self.get_users(self.instance_id)
|
users = self.get_users(self.instance_id)
|
||||||
cur_user_names = [user['name'] for user in users]
|
cur_user_names = [user['name'] for user in users]
|
||||||
self.assertIn("new_user", cur_user_names)
|
self.assertIn("new_user", cur_user_names)
|
||||||
|
|||||||
Reference in New Issue
Block a user