github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-07-06 04:16:14 +00:00
Code Issues Projects Releases Wiki Activity

assign device id to pciBusID in delegated config

Browse Source 
This allows host-device plugin to recognize
Device PCI address passed from Multus.
It is related to the change in host-device which
enables use of device pci address as a config option:
https://github.com/containernetworking/plugins/pull/300
This commit is contained in:
Zenghui Shi 2019-04-25 15:31:45 +08:00 committed by Doug Smith
parent 1a32c636ff
commit 91d9964d07
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
types/conf.go
View File

@ -273,6 +273,7 @@ func delegateAddDeviceID(inBytes []byte, deviceID string) ([]byte, error) {
} }
// Inject deviceID // Inject deviceID
rawConfig["deviceID"] = deviceID rawConfig["deviceID"] = deviceID
rawConfig["pciBusID"] = deviceID
configBytes, err := json.Marshal(rawConfig) configBytes, err := json.Marshal(rawConfig)
if err != nil { if err != nil {
return nil, logging.Errorf("delegateAddDeviceID: failed to re-marshal Spec.Config: %v", err) return nil, logging.Errorf("delegateAddDeviceID: failed to re-marshal Spec.Config: %v", err)
@ -307,6 +308,7 @@ func addDeviceIDInConfList(inBytes []byte, deviceID string) ([]byte, error) {
} }
// Inject deviceID // Inject deviceID
firstPlugin["deviceID"] = deviceID firstPlugin["deviceID"] = deviceID
firstPlugin["pciBusID"] = deviceID
configBytes, err := json.Marshal(rawConfig) configBytes, err := json.Marshal(rawConfig)
if err != nil { if err != nil {