virtcontainers: fix go test CI

1. Fix go test failures. 2. Add golint required comments. 3. Fix gocyclo errors. 4. Fix misspell errors. Signed-off-by: Peng Tao <bergwolf@gmail.com>
kata-containers · Jun 11, 2018 · 47238ac · 47238ac
1 parent 593e78d
commit 47238ac
Show file tree

Hide file tree

Showing 25 changed files with 277 additions and 167 deletions.
diff --git a/cli/config.go b/cli/config.go
@@ -359,7 +359,7 @@ func newQemuHypervisorConfig(h hypervisor) (vc.HypervisorConfig, error) {
 }
 
 func newFactoryConfig(f factory) (oci.FactoryConfig, error) {
-	return oci.FactoryConfig{f.Template}, nil
+	return oci.FactoryConfig{Template: f.Template}, nil
 }
 
 func newShimConfig(s shim) (vc.ShimConfig, error) {

diff --git a/cli/create.go b/cli/create.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 
 	vc "github.com/kata-containers/runtime/virtcontainers"
-	vm "github.com/kata-containers/runtime/virtcontainers/factory"
+	vf "github.com/kata-containers/runtime/virtcontainers/factory"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -102,7 +102,7 @@ func create(containerID, bundlePath, console, pidFilePath string, detach bool,
 	}
 
 	if runtimeConfig.FactoryConfig.Template {
-		factoryConfig := vm.FactoryConfig{
+		factoryConfig := vf.Config{
 			Template: true,
 			VMConfig: vc.VMConfig{
 				HypervisorType:   runtimeConfig.HypervisorType,
@@ -112,7 +112,7 @@ func create(containerID, bundlePath, console, pidFilePath string, detach bool,
 			},
 		}
 		kataLog.WithField("factory", factoryConfig).Info("load vm factory")
-		f, err := vm.NewFactory(factoryConfig, true)
+		f, err := vf.NewFactory(factoryConfig, true)
 		if err != nil {
 			kataLog.WithError(err).Info("load vm factory failed")
 		} else {

diff --git a/cli/factory.go b/cli/factory.go
@@ -7,9 +7,10 @@ package main
 
 import (
 	"errors"
+	"fmt"
 
 	vc "github.com/kata-containers/runtime/virtcontainers"
-	vm "github.com/kata-containers/runtime/virtcontainers/factory"
+	vf "github.com/kata-containers/runtime/virtcontainers/factory"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
 	"github.com/urfave/cli"
 )
@@ -38,7 +39,7 @@ var initFactoryCommand = cli.Command{
 		}
 
 		if runtimeConfig.FactoryConfig.Template {
-			factoryConfig := vm.FactoryConfig{
+			factoryConfig := vf.Config{
 				Template: true,
 				VMConfig: vc.VMConfig{
 					HypervisorType:   runtimeConfig.HypervisorType,
@@ -48,13 +49,15 @@ var initFactoryCommand = cli.Command{
 				},
 			}
 			kataLog.WithField("factory", factoryConfig).Info("create vm factory")
-			_, err := vm.NewFactory(factoryConfig, false)
+			_, err := vf.NewFactory(factoryConfig, false)
 			if err != nil {
 				kataLog.WithError(err).Error("create vm factory failed")
 				return err
 			}
+			fmt.Println("vm factory initialized")
 		} else {
 			kataLog.Error("vm factory is not enabled")
+			fmt.Println("vm factory is not enabled")
 		}
 
 		return nil
@@ -71,7 +74,7 @@ var destroyFactoryCommand = cli.Command{
 		}
 
 		if runtimeConfig.FactoryConfig.Template {
-			factoryConfig := vm.FactoryConfig{
+			factoryConfig := vf.Config{
 				Template: true,
 				VMConfig: vc.VMConfig{
 					HypervisorType:   runtimeConfig.HypervisorType,
@@ -81,14 +84,15 @@ var destroyFactoryCommand = cli.Command{
 				},
 			}
 			kataLog.WithField("factory", factoryConfig).Info("load vm factory")
-			f, err := vm.NewFactory(factoryConfig, true)
+			f, err := vf.NewFactory(factoryConfig, true)
 			if err != nil {
 				kataLog.WithError(err).Error("load vm factory failed")
 				// ignore error
 			} else {
 				f.CloseFactory()
 			}
 		}
+		fmt.Println("vm factory destroyed")
 		return nil
 	},
 }
diff --git a/virtcontainers/agent_test.go b/virtcontainers/agent_test.go
@@ -99,7 +99,7 @@ func TestNewAgentFromUnknownAgentType(t *testing.T) {
 }
 
 func testNewAgentConfig(t *testing.T, config SandboxConfig, expected interface{}) {
-	agentConfig := newAgentConfig(config)
+	agentConfig := newAgentConfig(config.AgentType, config.AgentConfig)
 	if reflect.DeepEqual(agentConfig, expected) == false {
 		t.Fatal()
 	}