add test

Author: Heming Han

ecs-agent/netlib/model/ecscni/bridge_config.go

@@ -37,7 +37,7 @@ func (bc *BridgeConfig) String() string {
 // InterfaceName returns the veth pair name will be used inside the namespace
 func (bc *BridgeConfig) InterfaceName() string {
 	if bc.DeviceName == "" {
-		return defaultInterfaceName
+		return DefaultInterfaceName
 	}
 
 	return bc.DeviceName

ecs-agent/netlib/model/ecscni/client.go

@@ -30,16 +30,6 @@ const (
 	versionCommand = "--version"
 )
 
-// CNI defines the plugin invocation interface
-type CNI interface {
-	// Add calls the plugin add command with given configuration
-	Add(context.Context, PluginConfig) (types.Result, error)
-	// Del calls the plugin del command with given configuration
-	Del(context.Context, PluginConfig) error
-	// Version calls the version command of plugin
-	Version(string) (string, error)
-}
-
 // CNIClient is the client to invoke the plugin
 type cniClient struct {
 	pluginPath []string

ecs-agent/netlib/model/ecscni/client_test.go

@@ -0,0 +1,50 @@
+//go:build unit
+// +build unit
+
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package ecscni
+
+import (
+	"context"
+	"testing"
+
+	mock_libcni "github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/ecscni/mocks_libcni"
+
+	"github.com/golang/mock/gomock"
+)
+
+func TestAddDel(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+	ctx, _ := context.WithCancel(context.TODO())
+
+	client := NewCNIClient([]string{})
+	mockLibCNIClient := mock_libcni.NewMockCNI(ctrl)
+	client.(*cniClient).cni = mockLibCNIClient
+
+	config := &TestCNIConfig{
+		CNIConfig: CNIConfig{
+			NetNSPath:      NetNS,
+			CNISpecVersion: CNIVersion,
+			CNIPluginName:  PluginName,
+		},
+		NetworkInterfaceName: IfName,
+	}
+
+	client.Add(ctx, config)
+	client.Del(ctx, config)
+	mockLibCNIClient.EXPECT().AddNetwork(gomock.Any(), gomock.Any())
+	mockLibCNIClient.EXPECT().DelNetwork(gomock.Any(), gomock.Any())
+}

ecs-agent/netlib/model/ecscni/eni_config.go

@@ -75,7 +75,7 @@ func (ec *ENIConfig) NSPath() string {
 
 func (ec *ENIConfig) InterfaceName() string {
 	if ec.DeviceName == "" {
-		return defaultENIName
+		return DefaultENIName
 	}
 	return ec.DeviceName
 }

ecs-agent/netlib/model/ecscni/generate_mocks_linux.go renamed to ecs-agent/netlib/model/ecscni/generate_mocks.go

@@ -11,9 +11,6 @@
 // express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 
-//go:build !windows
-// +build !windows
-
 package ecscni
 
-//go:generate mockgen -build_flags=--mod=mod -destination=mocks/ecscni_mocks_linux.go -copyright_file=../../../../scripts/copyright_file github.com/aws/amazon-ecs-agent/ecs-agent/netlib/model/ecscni Config,NetNSUtil,CNI
+//go:generate mockgen -destination=../mocks_libcni/libcni_mocks.go -copyright_file=../../../../scripts/copyright_file github.com/containernetworking/cni/libcni CNI