sysinfo.py (openstack-cyborg-8.0.0) | : | sysinfo.py (openstack-cyborg-9.0.0) | ||
---|---|---|---|---|
skipping to change at line 123 | skipping to change at line 123 | |||
def _generate_dep_list(fpga): | def _generate_dep_list(fpga): | |||
dep_list = [] | dep_list = [] | |||
driver_dep = driver_deployable.DriverDeployable() | driver_dep = driver_deployable.DriverDeployable() | |||
driver_dep.attribute_list = _generate_attribute_list(fpga) | driver_dep.attribute_list = _generate_attribute_list(fpga) | |||
driver_dep.attach_handle_list = [] | driver_dep.attach_handle_list = [] | |||
# NOTE(wenping) Now simply named as <Compute_hostname>_<Device_address> | # NOTE(wenping) Now simply named as <Compute_hostname>_<Device_address> | |||
# once cyborg needs to support Inspur FPGA devices discovered from a | # once cyborg needs to support Inspur FPGA devices discovered from a | |||
# baremetal node, we might need to support more formats. | # baremetal node, we might need to support more formats. | |||
driver_dep.name = CONF.host + '_' + fpga["devices"] | driver_dep.name = CONF.host + '_' + fpga["devices"] | |||
driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"]).upper() | driver_dep.driver_name = VENDOR_MAPS.get(fpga["vendor_id"], '').upper() | |||
driver_dep.num_accelerators = 1 | driver_dep.num_accelerators = 1 | |||
driver_dep.attach_handle_list = [_generate_attach_handle(fpga)] | driver_dep.attach_handle_list = [_generate_attach_handle(fpga)] | |||
dep_list.append(driver_dep) | dep_list.append(driver_dep) | |||
return dep_list | return dep_list | |||
def _generate_attribute_list(fpga): | def _generate_attribute_list(fpga): | |||
attr_list = [] | attr_list = [] | |||
for k, v in fpga.items(): | for k, v in fpga.items(): | |||
if k == "rc": | if k == "rc": | |||
driver_attr = driver_attribute.DriverAttribute() | driver_attr = driver_attribute.DriverAttribute() | |||
driver_attr.key, driver_attr.value = k, v | driver_attr.key, driver_attr.value = k, v | |||
attr_list.append(driver_attr) | attr_list.append(driver_attr) | |||
if k == "traits": | if k == "traits": | |||
values = fpga.get(k, []) | for index, val in enumerate(v): | |||
for index, val in enumerate(values): | ||||
driver_attr = driver_attribute.DriverAttribute( | driver_attr = driver_attribute.DriverAttribute( | |||
key="trait" + str(index), value=val) | key="trait" + str(index), value=val) | |||
attr_list.append(driver_attr) | attr_list.append(driver_attr) | |||
return attr_list | return attr_list | |||
def _generate_attach_handle(fpga): | def _generate_attach_handle(fpga): | |||
driver_ah = driver_attach_handle.DriverAttachHandle() | driver_ah = driver_attach_handle.DriverAttachHandle() | |||
driver_ah.attach_type = constants.AH_TYPE_PCI | driver_ah.attach_type = constants.AH_TYPE_PCI | |||
driver_ah.attach_info = utils.pci_str_to_json(fpga["devices"]) | driver_ah.attach_info = utils.pci_str_to_json(fpga["devices"]) | |||
driver_ah.in_use = False | driver_ah.in_use = False | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |