openstack/tempest
Code Issues Proposed changes

Merge "Use project_reader in compute floating_ips tests"

Browse Source
This commit is contained in:
Zuul
2026-04-02 02:54:42 +00:00
committed by Gerrit Code Review
parent 8f7e587222 7535fb1fcf
commit 9307558eb0
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tempest/api/compute/floating_ips/base.py
+5
View File
@@ -41,3 +41,8 @@ class BaseFloatingIPsTest(base.BaseV2ComputeTest):
def setup_clients(cls):
super(BaseFloatingIPsTest, cls).setup_clients()
cls.client = cls.floating_ips_client
if CONF.enforce_scope.nova and hasattr(cls, 'os_project_reader'):
cls.reader_floating_ips_client = (
cls.os_project_reader.compute_floating_ips_client)
else:
cls.reader_floating_ips_client = cls.client
tempest/api/compute/floating_ips/test_floating_ips_actions.py
+5 -4
View File
@@ -37,10 +37,11 @@ class FloatingIPsTestJSON(base.BaseFloatingIPsTest):
floating_ip_id_allocated = body['id']
self.addCleanup(self.client.delete_floating_ip,
floating_ip_id_allocated)
floating_ip_details = self.client.show_floating_ip(
floating_ip_details = self.reader_floating_ips_client.show_floating_ip(
floating_ip_id_allocated)['floating_ip']
# Checking if the details of allocated IP is in list of floating IP
body = self.client.list_floating_ips()['floating_ips']
body = self.reader_floating_ips_client.list_floating_ips()[
'floating_ips']
self.assertIn(floating_ip_details, body)
@decorators.idempotent_id('de45e989-b5ca-4a9b-916b-04a52e7bbb8b')
@@ -87,8 +88,8 @@ class FloatingIPsAssociationTestJSON(base.BaseFloatingIPsTest):
self.server_id)
# Check instance_id in the floating_ip body
body = (self.client.show_floating_ip(self.floating_ip_id)
['floating_ip'])
body = (self.reader_floating_ips_client.show_floating_ip(
self.floating_ip_id)['floating_ip'])
self.assertEqual(self.server_id, body['instance_id'])
# Disassociation of floating IP that was associated in this method
tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py
+2 -1
View File
@@ -34,7 +34,8 @@ class FloatingIPsNegativeTestJSON(base.BaseFloatingIPsTest):
super(FloatingIPsNegativeTestJSON, cls).resource_setup()
# Generating a nonexistent floatingIP id
body = cls.client.list_floating_ips()['floating_ips']
body = cls.reader_floating_ips_client.list_floating_ips()[
'floating_ips']
floating_ip_ids = [floating_ip['id'] for floating_ip in body]
while True:
if CONF.service_available.neutron:
tempest/api/compute/floating_ips/test_list_floating_ips.py
+4 -2
View File
@@ -39,7 +39,8 @@ class FloatingIPDetailsTestJSON(base.BaseFloatingIPsTest):
@decorators.idempotent_id('16db31c3-fb85-40c9-bbe2-8cf7b67ff99f')
def test_list_floating_ips(self):
"""Test listing floating ips"""
body = self.client.list_floating_ips()['floating_ips']
body = self.reader_floating_ips_client.list_floating_ips()[
'floating_ips']
floating_ips = body
self.assertNotEmpty(floating_ips,
"Expected floating IPs. Got zero.")
@@ -58,7 +59,8 @@ class FloatingIPDetailsTestJSON(base.BaseFloatingIPsTest):
floating_ip_instance_id = body['instance_id']
floating_ip_ip = body['ip']
floating_ip_fixed_ip = body['fixed_ip']
body = self.client.show_floating_ip(floating_ip_id)['floating_ip']
body = self.reader_floating_ips_client.show_floating_ip(
floating_ip_id)['floating_ip']
# Comparing the details of floating IP
self.assertEqual(floating_ip_instance_id,
body['instance_id'])
tempest/api/compute/floating_ips/test_list_floating_ips_negative.py
+2 -1
View File
@@ -41,4 +41,5 @@ class FloatingIPDetailsNegativeTestJSON(base.BaseFloatingIPsTest):
else:
non_exist_id = data_utils.rand_int_id(start=999)
self.assertRaises(lib_exc.NotFound,
self.client.show_floating_ip, non_exist_id)
self.reader_floating_ips_client.show_floating_ip,
non_exist_id)