diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-20 19:55:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-20 19:55:37 +0000 |
| commit | 4511849567d8105becd6464f36fb91f0a7ac1ed2 (patch) | |
| tree | 42f01b9adfdad1940bae04670ce39105793637d0 /ironic | |
| parent | 7ae288c771ef4b6aeab16c161607973187fdf57f (diff) | |
| parent | 9c6cd3f5d2bca97e5cffc0047d6fe3136d45d7cc (diff) | |
| download | ironic-4511849567d8105becd6464f36fb91f0a7ac1ed2.tar.gz | |
Merge "Set resource_url when getting all ports or portgroups" into stable/xena
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/api/controllers/v1/port.py | 6 | ||||
| -rw-r--r-- | ironic/api/controllers/v1/portgroup.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/api/controllers/v1/test_node.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ironic/api/controllers/v1/port.py b/ironic/api/controllers/v1/port.py index eacbdf5db..0658fbf3f 100644 --- a/ironic/api/controllers/v1/port.py +++ b/ironic/api/controllers/v1/port.py @@ -407,10 +407,12 @@ class PortsController(rest.RestController): and not uuidutils.is_uuid_like(node)): raise exception.NotAcceptable() + resource_url = 'ports' return self._get_ports_collection(node_uuid or node, address, portgroup, marker, limit, sort_key, - sort_dir, fields=fields, - detail=detail, project=project) + sort_dir, resource_url=resource_url, + fields=fields, detail=detail, + project=project) @METRICS.timer('PortsController.detail') @method.expose() diff --git a/ironic/api/controllers/v1/portgroup.py b/ironic/api/controllers/v1/portgroup.py index 9a2c2dc05..7900c4683 100644 --- a/ironic/api/controllers/v1/portgroup.py +++ b/ironic/api/controllers/v1/portgroup.py @@ -283,10 +283,12 @@ class PortgroupsController(pecan.rest.RestController): fields = api_utils.get_request_return_fields(fields, detail, _DEFAULT_RETURN_FIELDS) + resource_url = 'portgroups' return self._get_portgroups_collection(node, address, marker, limit, sort_key, sort_dir, fields=fields, + resource_url=resource_url, detail=detail, project=project) diff --git a/ironic/tests/unit/api/controllers/v1/test_node.py b/ironic/tests/unit/api/controllers/v1/test_node.py index b642f3ee3..ee957178c 100644 --- a/ironic/tests/unit/api/controllers/v1/test_node.py +++ b/ironic/tests/unit/api/controllers/v1/test_node.py @@ -1499,6 +1499,7 @@ class TestListNodes(test_api_base.BaseApiTest): headers=headers) self.assertEqual(1, len(data['portgroups'])) self.assertIn('next', data) + self.assertIn('portgroups', data['next']) def test_portgroups_subresource_link(self): node = obj_utils.create_test_node(self.context) @@ -1537,6 +1538,7 @@ class TestListNodes(test_api_base.BaseApiTest): data = self.get_json('/nodes/%s/ports?limit=1' % node.uuid) self.assertEqual(1, len(data['ports'])) self.assertIn('next', data) + self.assertIn('ports', data['next']) def test_ports_subresource_noid(self): node = obj_utils.create_test_node(self.context) |