openstack/cyborg
Code Issues Proposed changes

no type field in ExpectedOneObject format message

Browse Source 
Co-Authored-By: Eric Xie <eric_xiett@163.com>
Change-Id: Idac2258cb411c2065212d4b76989d572b9f86f3d
This commit is contained in:
Shaohe Feng 2020-02-14 11:22:11 +00:00 committed by ericxiett
parent 46ddaa64ee
commit 60e9841290
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyborg/objects/extarq/fpga_ext_arq.py
View File

@ -222,7 +222,7 @@ class FPGAExtARQ(ExtARQ):
if count != 1:
self.update_check_state(
context, constants.ARQ_BIND_FAILED)
raise exception.ExpectedOneObject(type='controlpath_id',
raise exception.ExpectedOneObject(obj='controlpath_id',
count=count)
controlpath_id = cpid_list[0]
controlpath_id['cpid_info'] = jsonutils.loads(

19
cyborg/tests/unit/objects/test_fpga_ext_arq.py
View File

@ -307,6 +307,25 @@ class TestFPGAExtARQObject(base.DbTestCase):
mock_program.assert_called_once_with(
self.context, 'newtestnode1', self.cpid, bs_id, "intel_fpga")
@mock.patch('cyborg.objects.ExtARQ.update_check_state')
@mock.patch('cyborg.objects.Deployable.get_cpid_list')
def test_do_programming_with_not_one_cp(self, mock_cpid_list,
mock_check_state):
dep_uuid = self.deployable_uuids[0]
fake_dep = fake_deployable.fake_deployable_obj(
self.context, uuid=dep_uuid)
mock_cpid_list.return_value = []
obj_extarq = self.class_fgpa_objects["function_program"]
obj_extarq.arq.hostname = 'newtestnode1'
fake_dep.driver_name = "intel_fpga"
bs_id = obj_extarq._get_bitstream_id()
self.assertRaises(exception.ExpectedOneObject,
obj_extarq._do_programming,
self.context,
fake_dep,
bs_id)
@mock.patch('cyborg.common.placement_client.PlacementClient.'
'__init__')
@mock.patch('cyborg.common.placement_client.PlacementClient.'