openstack/cyborg
Code Issues Proposed changes

Merge "Refactor device_profile retrieve in ARQ post API"

Browse Source
This commit is contained in:
Zuul 2020-10-12 10:19:31 +00:00 committed by Gerrit Code Review
commit 56d98c73fd
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cyborg/api/controllers/v2/arqs.py
View File

@ -103,18 +103,6 @@ class ARQsController(base.CyborgController):
nova/nova/accelerator/cyborg.py.
"""
def _get_devprof(self, context, devprof_name):
"""Get the contents of a device profile.
Since this is just a read, it is ok for the API layer
to do this, instead of the conductor.
"""
try:
obj_devprof = objects.DeviceProfile.get_by_name(context,
devprof_name)
return obj_devprof
except Exception:
return None
@authorize_wsgi.authorize_wsgi("cyborg:arq", "create", False)
@expose.expose(ARQCollection, body=types.jsontype,
status_code=http_client.CREATED)
@ -134,11 +122,14 @@ class ARQsController(base.CyborgController):
devprof = None
dp_name = req.get('device_profile_name')
if dp_name is not None:
devprof = self._get_devprof(context, dp_name)
if devprof is None:
try:
devprof = objects.DeviceProfile.get_by_name(context, dp_name)
except exception.ResourceNotFound:
raise exception.ResourceNotFound(
resource='Device Profile',
msg='with name=%s' % dp_name)
except Exception as e:
raise e
else:
raise exception.DeviceProfileNameNeeded()
LOG.info('[arqs] post. device profile name=%s', dp_name)

6
cyborg/tests/unit/api/controllers/v2/test_arqs.py
View File

@ -206,9 +206,11 @@ class TestARQsController(v2_test.APITestV2):
@mock.patch('cyborg.objects.DeviceProfile.get_by_name')
@mock.patch('cyborg.objects.ExtARQ.create')
def test_create_with_wrong_dp(self, mock_obj_extarq, mock_obj_dp):
mock_obj_dp.side_effect = Exception
mock_obj_extarq.side_effect = self.fake_extarqs
params = {'device_profile_name': 'wrong_device_profile_name'}
mock_obj_dp.side_effect = exception.ResourceNotFound(
resource='Device Profile',
msg='with name=%s' % params.get('device_profile_name'))
mock_obj_extarq.side_effect = self.fake_extarqs
exc = None
try:
self.post_json(self.ARQ_URL, params, headers=self.headers)