sysinfo.py (openstack-cyborg-8.0.0) | : | sysinfo.py (openstack-cyborg-9.0.0) | ||
---|---|---|---|---|
skipping to change at line 176 | skipping to change at line 176 | |||
return nics | return nics | |||
def _generate_driver_device(nic): | def _generate_driver_device(nic): | |||
driver_device_obj = driver_device.DriverDevice() | driver_device_obj = driver_device.DriverDevice() | |||
driver_device_obj.vendor = nic["vendor"] | driver_device_obj.vendor = nic["vendor"] | |||
driver_device_obj.stub = nic["stub"] | driver_device_obj.stub = nic["stub"] | |||
driver_device_obj.model = nic.get("model", "miss_model_info") | driver_device_obj.model = nic.get("model", "miss_model_info") | |||
driver_device_obj.vendor_board_info = nic.get( | driver_device_obj.vendor_board_info = nic.get( | |||
"vendor_board_info", | "vendor_board_info", | |||
"miss_vb_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.std_board_info = jsonutils.dumps(std_board_info) | |||
driver_device_obj.type = nic["type"] | driver_device_obj.type = nic["type"] | |||
driver_device_obj.controlpath_id = _generate_controlpath_id(nic) | driver_device_obj.controlpath_id = _generate_controlpath_id(nic) | |||
driver_device_obj.deployable_list = _generate_dep_list(nic) | driver_device_obj.deployable_list = _generate_dep_list(nic) | |||
return driver_device_obj | return driver_device_obj | |||
def _generate_controlpath_id(nic): | def _generate_controlpath_id(nic): | |||
driver_cpid = driver_controlpath_id.DriverControlPathID() | driver_cpid = driver_controlpath_id.DriverControlPathID() | |||
driver_cpid.cpid_type = "PCI" | driver_cpid.cpid_type = "PCI" | |||
driver_cpid.cpid_info = utils.pci_str_to_json(nic["device"]) | driver_cpid.cpid_info = utils.pci_str_to_json(nic["device"]) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added |