openstack/ironic
Code Issues Proposed changes

Set resource_url when getting all ports or portgroups

Browse Source 
Since the default value resource_url is None, make sure the
parameter is set to 'ports' when getting all ports.

Change-Id: Id603ae5a4a802dfc8f866b15c8d327d95eba9310
This commit is contained in:
Arne Wiebalck 2022-01-17 14:42:39 +01:00
parent 097ec2f8ee
commit 2ac740e09d
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/api/controllers/v1/port.py
View File

@ -407,10 +407,12 @@ class PortsController(rest.RestController):
and not uuidutils.is_uuid_like(node)): and not uuidutils.is_uuid_like(node)):
raise exception.NotAcceptable() raise exception.NotAcceptable()
resource_url = 'ports'
return self._get_ports_collection(node_uuid or node, address, return self._get_ports_collection(node_uuid or node, address,
portgroup, marker, limit, sort_key, portgroup, marker, limit, sort_key,
sort_dir, fields=fields, sort_dir, resource_url=resource_url,
detail=detail, project=project) fields=fields, detail=detail,
project=project)
@METRICS.timer('PortsController.detail') @METRICS.timer('PortsController.detail')
@method.expose() @method.expose()

2
ironic/api/controllers/v1/portgroup.py
View File

@ -283,10 +283,12 @@ class PortgroupsController(pecan.rest.RestController):
fields = api_utils.get_request_return_fields(fields, detail, fields = api_utils.get_request_return_fields(fields, detail,
_DEFAULT_RETURN_FIELDS) _DEFAULT_RETURN_FIELDS)
resource_url = 'portgroups'
return self._get_portgroups_collection(node, address, return self._get_portgroups_collection(node, address,
marker, limit, marker, limit,
sort_key, sort_dir, sort_key, sort_dir,
fields=fields, fields=fields,
resource_url=resource_url,
detail=detail, detail=detail,
project=project) project=project)

2
ironic/tests/unit/api/controllers/v1/test_node.py
View File

@ -1495,6 +1495,7 @@ class TestListNodes(test_api_base.BaseApiTest):
headers=headers) headers=headers)
self.assertEqual(1, len(data['portgroups'])) self.assertEqual(1, len(data['portgroups']))
self.assertIn('next', data) self.assertIn('next', data)
self.assertIn('portgroups', data['next'])
def test_portgroups_subresource_link(self): def test_portgroups_subresource_link(self):
node = obj_utils.create_test_node(self.context) node = obj_utils.create_test_node(self.context)
@ -1533,6 +1534,7 @@ class TestListNodes(test_api_base.BaseApiTest):
data = self.get_json('/nodes/%s/ports?limit=1' % node.uuid) data = self.get_json('/nodes/%s/ports?limit=1' % node.uuid)
self.assertEqual(1, len(data['ports'])) self.assertEqual(1, len(data['ports']))
self.assertIn('next', data) self.assertIn('next', data)
self.assertIn('ports', data['next'])
def test_ports_subresource_noid(self): def test_ports_subresource_noid(self):
node = obj_utils.create_test_node(self.context) node = obj_utils.create_test_node(self.context)

6
releasenotes/notes/fix_pagination_resource_url_ports-8d2696a6a7ab012f.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue where clients would get a 404 due to the port and
portgroups pagination breaking at max_limit due to an uninitialised
resource_url.