Merge "use deleted=False instead of deleted=0 in queries"
diff --git a/tempest/tests/compute/images/test_images_whitebox.py b/tempest/tests/compute/images/test_images_whitebox.py
index f371fe4..40433a7 100644
--- a/tempest/tests/compute/images/test_images_whitebox.py
+++ b/tempest/tests/compute/images/test_images_whitebox.py
@@ -50,7 +50,7 @@
cls.image_ids.remove(image_id)
@classmethod
- def update_state(self, server_id, vm_state, task_state, deleted=0):
+ def update_state(self, server_id, vm_state, task_state, deleted=False):
"""Update states of an instance in database for validation"""
if not task_state:
task_state = "NULL"
@@ -63,7 +63,7 @@
self.connection.execute(stmt, autocommit=True)
- def _test_create_image_409_base(self, vm_state, task_state, deleted=0):
+ def _test_create_image_409_base(self, vm_state, task_state, deleted=False):
"""Base method for create image tests based on vm and task states"""
try:
self.update_state(self.shared_server['id'], vm_state,
diff --git a/tempest/tests/compute/servers/test_servers_whitebox.py b/tempest/tests/compute/servers/test_servers_whitebox.py
index 152b3f7..980f6cf 100644
--- a/tempest/tests/compute/servers/test_servers_whitebox.py
+++ b/tempest/tests/compute/servers/test_servers_whitebox.py
@@ -63,7 +63,7 @@
# Set vcpu quota for tenant if not already set
if not result:
cores_hard_limit = 2
- stmt = quotas.insert().values(deleted=0,
+ stmt = quotas.insert().values(deleted=False,
project_id=self.tenant_id,
resource='cores',
hard_limit=cores_hard_limit)
@@ -95,7 +95,7 @@
# Set memory quota for tenant if not already set
if not result:
ram_hard_limit = 1024
- stmt = quotas.insert().values(deleted=0,
+ stmt = quotas.insert().values(deleted=False,
project_id=self.tenant_id,
resource='ram',
hard_limit=ram_hard_limit)
@@ -116,7 +116,7 @@
stmt = quotas.delete()
self.connection.execute(stmt, autocommit=True)
- def update_state(self, server_id, vm_state, task_state, deleted=0):
+ def update_state(self, server_id, vm_state, task_state, deleted=False):
"""Update states of an instance in database for validation"""
if not task_state:
task_state = 'NULL'