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

Add CNI-Genie reference in code

Browse Source 
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
This commit is contained in:
Ritu Sood
2019-01-24 06:48:37 -08:00
committed by Kuralamudhan Ramakrishnan
parent 05b4321ab1
commit b43e1d1dca
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multus/multus.go
View File

@@ -314,6 +314,8 @@ func delPlugins(exec invoke.Exec, argIfname string, delegates []*types.DelegateN
return nil return nil
} }
// Merge code based on CNI-Genie's code
// https://github.com/Huawei-PaaS/CNI-Genie/blob/master/genie/genie-controller.go#L882
func mergeWithResult(srcObj, dstObj cnitypes.Result) (cnitypes.Result, error) { func mergeWithResult(srcObj, dstObj cnitypes.Result) (cnitypes.Result, error) {
srcObj, err := updateRoutes(srcObj) srcObj, err := updateRoutes(srcObj)
if err != nil { if err != nil {