openstack
/
cyborg
Code Issues Proposed changes

Get return None for default 

Change-Id: I0c47ca61b2c89202d73a94d80c9551d346eacd20
This commit is contained in:
songwenping 2022-09-10 08:57:10 +08:00
parent 02bdbc5d6c
commit 7a2c8bc16a
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cyborg/accelerator/drivers/fake.py
View File

@ -104,8 +104,8 @@ class FakeDriver(GenericDriver):
device = driver_device.DriverDevice()
device.vendor = pci_dict["vendor_id"]
device.model = pci_dict.get('model', 'miss model info')
std_board_info = {'device_id': pci_dict.get('device_id', None),
'class': pci_dict.get('class', None)}
std_board_info = {'device_id': pci_dict.get('device_id'),
'class': pci_dict.get('class')}
device.std_board_info = jsonutils.dumps(std_board_info)
device.vendor_board_info = 'fake_vendor_info'
device.type = constants.DEVICE_FPGA

2
cyborg/accelerator/drivers/fpga/intel/sysinfo.py
View File

@ -240,7 +240,7 @@ def _generate_driver_device(fpga, pf_has_vf):
driver_device_obj.model = fpga.get('model', "miss_model_info")
driver_device_obj.vendor_board_info = fpga.get('vendor_board_info',
"miss_vb_info")
std_board_info = {'product_id': fpga.get('product_id', None)}
std_board_info = {'product_id': fpga.get('product_id')}
driver_device_obj.std_board_info = jsonutils.dumps(std_board_info)
driver_device_obj.type = fpga["type"]
driver_device_obj.controlpath_id = _generate_controlpath_id(fpga)

4
cyborg/accelerator/drivers/fpga/xilinx/sysinfo.py
View File

@ -173,8 +173,8 @@ def fpga_tree():
driver_device_obj = driver_device.DriverDevice()
driver_device_obj.vendor = fpga["vendor_id"]
driver_device_obj.model = fpga.get('model', 'miss model info')
std_board_info = {'product_id': fpga.get('product_id', None),
'controller': fpga.get('controller', None)}
std_board_info = {'product_id': fpga.get('product_id'),
'controller': fpga.get('controller')}
vendor_board_info = {
'vendor_info': fpga.get('vendor_info', 'fpga_vb_info')}
driver_device_obj.std_board_info = jsonutils.dumps(std_board_info)

2
cyborg/accelerator/drivers/nic/intel/sysinfo.py
View File

@ -185,7 +185,7 @@ def _generate_driver_device(nic):
driver_device_obj.vendor_board_info = nic.get(
"vendor_board_info",
"miss_vb_info")
std_board_info = {"product_id": nic.get("product_id", None)}
std_board_info = {"product_id": nic.get("product_id")}
driver_device_obj.std_board_info = jsonutils.dumps(std_board_info)
driver_device_obj.type = nic["type"]
driver_device_obj.controlpath_id = _generate_controlpath_id(nic)

2
cyborg/accelerator/drivers/qat/intel/sysinfo.py
View File

@ -144,7 +144,7 @@ def _generate_driver_device(qat):
driver_device_obj.vendor_board_info = qat.get(
"vendor_board_info",
"miss_vb_info")
std_board_info = {"product_id": qat.get("product_id", None)}
std_board_info = {"product_id": qat.get("product_id")}
driver_device_obj.std_board_info = jsonutils.dumps(std_board_info)
driver_device_obj.type = qat["type"]
driver_device_obj.controlpath_id = _generate_controlpath_id(qat)

4
cyborg/accelerator/drivers/ssd/utils.py
View File

@ -107,8 +107,8 @@ def _generate_driver_device(ssd):
driver_device_obj = driver_device.DriverDevice()
driver_device_obj.vendor = ssd["vendor_id"]
driver_device_obj.model = ssd.get('model', 'miss model info')
std_board_info = {'product_id': ssd.get('product_id', None),
'controller': ssd.get('controller', None)}
std_board_info = {'product_id': ssd.get('product_id'),
'controller': ssd.get('controller')}
vendor_board_info = {'vendor_info': ssd.get('vendor_info', 'ssd_vb_info')}
driver_device_obj.std_board_info = jsonutils.dumps(std_board_info)
driver_device_obj.vendor_board_info = jsonutils.dumps(vendor_board_info)