Merge pull request networkservicemesh#439 from NikitaSkrynnik/issue-438

Fix golangci-lint job

pkg/kernel/const_linux.go

@@ -1,4 +1,6 @@
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+// Copyright (c) 2022 Cisco and/or its affiliates.
+//
+// Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -14,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package kernel

pkg/kernel/link.go

@@ -1,6 +1,8 @@
-// Copyright (c) 2020-2021 Intel Corporation. All Rights Reserved.
+// Copyright (c) 2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2020-2022 Intel Corporation. All Rights Reserved.
+//
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 // Package kernel contains Link representation of network interface

pkg/kernel/networkservice/connectioncontextkernel/client.go

@@ -1,6 +1,6 @@
-// Copyright (c) 2020-2021 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package connectioncontextkernel

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipaddress/client.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ipaddress

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go

@@ -114,49 +114,67 @@ func create(ctx context.Context, conn *networkservice.Connection, isClient bool)
 		}
 
 		// Remove no longer existing IPs
-		for _, ipNet := range toRemove {
-			now := time.Now()
-			addr := &netlink.Addr{
-				IPNet: ipNet,
-			}
-			if err := netlinkHandle.AddrDel(l, addr); err != nil {
-				return errors.Wrapf(err, "attempting to delete ip address %s to %s", addr.IPNet, l.Attrs().Name)
-			}
-			log.FromContext(ctx).
-				WithField("link.Name", l.Attrs().Name).
-				WithField("Addr", ipNet.String()).
-				WithField("duration", time.Since(now)).
-				WithField("netlink", "AddrDel").Debug("completed")
+
+		if err := removeOldIPAddrs(ctx, netlinkHandle, l, toRemove); err != nil {
+			return err
 		}
+
 		// Add new IP addresses
-		for _, ipNet := range toAdd {
-			now := time.Now()
-			addr := &netlink.Addr{
-				IPNet: ipNet,
-				Flags: unix.IFA_F_PERMANENT,
-			}
-			// Turns out IPv6 uses Duplicate Address Detection (DAD) which
-			// we don't need here and which can cause it to take more than a second
-			// before anything *works* (even though the interface is up).  This causes
-			// cryptic error messages.  To avoid, we use the flag to disable DAD for
-			// any IPv6 addresses. Further, it seems that this is only needed for veth type, not if we have a tapv2
-			if ipNet != nil && ipNet.IP.To4() == nil {
-				addr.Flags |= unix.IFA_F_NODAD
-			}
-			if err := netlinkHandle.AddrReplace(l, addr); err != nil {
-				return errors.Wrapf(err, "attempting to add ip address %s to %s (type: %s) with flags 0x%x", addr.IPNet, l.Attrs().Name, l.Type(), addr.Flags)
-			}
-			log.FromContext(ctx).
-				WithField("link.Name", l.Attrs().Name).
-				WithField("Addr", ipNet.String()).
-				WithField("duration", time.Since(now)).
-				WithField("netlink", "AddrAdd").Debug("completed")
+		if err := addNewIPAddrs(ctx, netlinkHandle, l, toAdd); err != nil {
+			return err
 		}
 		return waitForIPNets(ctx, ch, l, toAdd)
 	}
 	return nil
 }
 
+func removeOldIPAddrs(ctx context.Context, netlinkHandle *netlink.Handle, l netlink.Link, ipAddrs []*net.IPNet) error {
+	for _, ipNet := range ipAddrs {
+		now := time.Now()
+		addr := &netlink.Addr{
+			IPNet: ipNet,
+		}
+		if err := netlinkHandle.AddrDel(l, addr); err != nil {
+			return errors.Wrapf(err, "attempting to delete ip address %s to %s", addr.IPNet, l.Attrs().Name)
+		}
+		log.FromContext(ctx).
+			WithField("link.Name", l.Attrs().Name).
+			WithField("Addr", ipNet.String()).
+			WithField("duration", time.Since(now)).
+			WithField("netlink", "AddrDel").Debug("completed")
+	}
+
+	return nil
+}
+
+func addNewIPAddrs(ctx context.Context, netlinkHandle *netlink.Handle, l netlink.Link, ipAddrs []*net.IPNet) error {
+	for _, ipNet := range ipAddrs {
+		now := time.Now()
+		addr := &netlink.Addr{
+			IPNet: ipNet,
+			Flags: unix.IFA_F_PERMANENT,
+		}
+		// Turns out IPv6 uses Duplicate Address Detection (DAD) which
+		// we don't need here and which can cause it to take more than a second
+		// before anything *works* (even though the interface is up).  This causes
+		// cryptic error messages.  To avoid, we use the flag to disable DAD for
+		// any IPv6 addresses. Further, it seems that this is only needed for veth type, not if we have a tapv2
+		if ipNet != nil && ipNet.IP.To4() == nil {
+			addr.Flags |= unix.IFA_F_NODAD
+		}
+		if err := netlinkHandle.AddrReplace(l, addr); err != nil {
+			return errors.Wrapf(err, "attempting to add ip address %s to %s (type: %s) with flags 0x%x", addr.IPNet, l.Attrs().Name, l.Type(), addr.Flags)
+		}
+		log.FromContext(ctx).
+			WithField("link.Name", l.Attrs().Name).
+			WithField("Addr", ipNet.String()).
+			WithField("duration", time.Since(now)).
+			WithField("netlink", "AddrAdd").Debug("completed")
+	}
+
+	return nil
+}
+
 func getIPAddrDifferences(netlinkHandle *netlink.Handle, l netlink.Link, newIPs []*net.IPNet) (toAdd, toRemove []*net.IPNet, err error) {
 	currentIPs, err := netlinkHandle.AddrList(l, netlink.FAMILY_ALL)
 	if err != nil {

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipaddress/server.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2020-2021 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ipaddress

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipneighbors/client.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2022 Cisco and/or its affiliates.
+//
 // Copyright (c) 2021-2022 Nordix Foundation.
 //
 // Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
@@ -16,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ipneighbors

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipneighbors/common.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2022 Cisco and/or its affiliates.
+//
 // Copyright (c) 2021-2022 Nordix Foundation.
 //
 // Copyright (c) 2022 Doc.ai and/or its affiliates.
@@ -16,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ipneighbors

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/ipneighbors/server.go

@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ipneighbors

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/server.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2022 Cisco and/or its affiliates.
+//
 // Copyright (c) 2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/routes/client.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2020 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package routes

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/routes/common.go

@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package routes

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/routes/server.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2020-2021 Cisco and/or its affiliates.
+// Copyright (c) 2020-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package routes

pkg/kernel/networkservice/connectioncontextkernel/mtu/client.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2021 Cisco and/or its affiliates.
+// Copyright (c) 2021-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package mtu

pkg/kernel/networkservice/connectioncontextkernel/mtu/common.go

@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package mtu

pkg/kernel/networkservice/connectioncontextkernel/mtu/server.go

@@ -1,8 +1,8 @@
-// Copyright (c) 2021 Cisco and/or its affiliates.
+// Copyright (c) 2021-2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package mtu

pkg/kernel/networkservice/connectioncontextkernel/server.go

@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package connectioncontextkernel

pkg/kernel/networkservice/ethernetcontext/vf_client.go

@@ -1,6 +1,8 @@
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Doc.ai and/or its affiliates.
+// Copyright (c) 2021-2022 Nordix Foundation.
+//
+// Copyright (c) 2021-2022 Doc.ai and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ethernetcontext

pkg/kernel/networkservice/ethernetcontext/vf_common.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2022 Cisco and/or its affiliates.
+//
 // Copyright (c) 2021-2022 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
@@ -14,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package ethernetcontext

pkg/kernel/networkservice/ethernetcontext/vf_server.go

@@ -1,6 +1,8 @@
-// Copyright (c) 2020 Doc.ai and/or its affiliates.
+// Copyright (c) 2022 Cisco and/or its affiliates.
 //
-// Copyright (c) 2021 Nordix Foundation.
+// Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
+//
+// Copyright (c) 2021-2022 Nordix Foundation.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +18,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 // Package ethernetcontext provides chain element for setup link ethernet properties