From b43e1d1dcadda0123ac7b94f4cd65ceacd1ae448 Mon Sep 17 00:00:00 2001 From: Ritu Sood Date: Thu, 24 Jan 2019 06:48:37 -0800 Subject: [PATCH] Add CNI-Genie reference in code Signed-off-by: Ritu Sood --- multus/multus.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/multus/multus.go b/multus/multus.go index 058d1197d..7d6c602fd 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -314,6 +314,8 @@ func delPlugins(exec invoke.Exec, argIfname string, delegates []*types.DelegateN 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) { srcObj, err := updateRoutes(srcObj) if err != nil {