"Fossies" - the Fresh Open Source Software Archive 
Source code changes of the file "cyborg/accelerator/drivers/ssd/utils.py" between
openstack-cyborg-8.0.0.tar.gz and openstack-cyborg-9.0.0.tar.gz
About: OpenStack Cyborg provides a general purpose management framework for acceleration resources. The "Zed" series (latest release).
| utils.py (openstack-cyborg-8.0.0) | : | utils.py (openstack-cyborg-9.0.0) | ||
|---|---|---|---|---|
| skipping to change at line 103 | skipping to change at line 103 | |||
| traits = get_traits(ssd_dict["vendor_id"], ssd_dict["product_id"]) | traits = get_traits(ssd_dict["vendor_id"], ssd_dict["product_id"]) | |||
| ssd_dict["rc"] = constants.RESOURCES["SSD"] | ssd_dict["rc"] = constants.RESOURCES["SSD"] | |||
| ssd_dict.update(traits) | ssd_dict.update(traits) | |||
| ssd_list.append(_generate_driver_device(ssd_dict)) | ssd_list.append(_generate_driver_device(ssd_dict)) | |||
| return ssd_list | return ssd_list | |||
| def _generate_driver_device(ssd): | def _generate_driver_device(ssd): | |||
| driver_device_obj = driver_device.DriverDevice() | driver_device_obj = driver_device.DriverDevice() | |||
| driver_device_obj.vendor = ssd["vendor_id"] | driver_device_obj.vendor = ssd["vendor_id"] | |||
| driver_device_obj.model = ssd.get('model', 'miss model info') | driver_device_obj.model = ssd.get('model', 'miss model info') | |||
| std_board_info = {'product_id': ssd.get('product_id', None), | std_board_info = {'product_id': ssd.get('product_id'), | |||
| 'controller': ssd.get('controller', None)} | 'controller': ssd.get('controller')} | |||
| vendor_board_info = {'vendor_info': ssd.get('vendor_info', 'ssd_vb_info')} | 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.std_board_info = jsonutils.dumps(std_board_info) | |||
| driver_device_obj.vendor_board_info = jsonutils.dumps(vendor_board_info) | driver_device_obj.vendor_board_info = jsonutils.dumps(vendor_board_info) | |||
| driver_device_obj.type = constants.DEVICE_SSD | driver_device_obj.type = constants.DEVICE_SSD | |||
| driver_device_obj.stub = ssd.get('stub', False) | driver_device_obj.stub = ssd.get('stub', False) | |||
| driver_device_obj.controlpath_id = _generate_controlpath_id(ssd) | driver_device_obj.controlpath_id = _generate_controlpath_id(ssd) | |||
| driver_device_obj.deployable_list = _generate_dep_list(ssd) | driver_device_obj.deployable_list = _generate_dep_list(ssd) | |||
| return driver_device_obj | return driver_device_obj | |||
| def _generate_controlpath_id(ssd): | def _generate_controlpath_id(ssd): | |||
| skipping to change at line 131 | skipping to change at line 131 | |||
| def _generate_dep_list(ssd): | def _generate_dep_list(ssd): | |||
| dep_list = [] | dep_list = [] | |||
| driver_dep = driver_deployable.DriverDeployable() | driver_dep = driver_deployable.DriverDeployable() | |||
| driver_dep.attribute_list = _generate_attribute_list(ssd) | driver_dep.attribute_list = _generate_attribute_list(ssd) | |||
| 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 SSD devices discovered from a baremetal | # once cyborg needs to support SSD devices discovered from a baremetal | |||
| # node, we might need to support more formats. | # node, we might need to support more formats. | |||
| driver_dep.name = ssd.get('hostname', '') + '_' + ssd["devices"] | driver_dep.name = ssd.get('hostname', '') + '_' + ssd["devices"] | |||
| driver_dep.driver_name = VENDOR_MAPS.get(ssd["vendor_id"]).upper() | driver_dep.driver_name = VENDOR_MAPS.get(ssd["vendor_id"], '').upper() | |||
| # driver_dep.num_accelerators for SSD is 1 | # driver_dep.num_accelerators for SSD is 1 | |||
| driver_dep.num_accelerators = 1 | driver_dep.num_accelerators = 1 | |||
| driver_dep.attach_handle_list = [_generate_attach_handle(ssd)] | driver_dep.attach_handle_list = [_generate_attach_handle(ssd)] | |||
| dep_list.append(driver_dep) | dep_list.append(driver_dep) | |||
| return dep_list | return dep_list | |||
| def _generate_attach_handle(ssd): | def _generate_attach_handle(ssd): | |||
| driver_ah = driver_attach_handle.DriverAttachHandle() | driver_ah = driver_attach_handle.DriverAttachHandle() | |||
| if ssd["rc"] == "CUSTOM_SSD": | if ssd["rc"] == "CUSTOM_SSD": | |||
| driver_ah.attach_type = constants.AH_TYPE_PCI | driver_ah.attach_type = constants.AH_TYPE_PCI | |||
| End of changes. 2 change blocks. | ||||
| 3 lines changed or deleted | 3 lines changed or added | |||