runtime: delete unused sub-commands.

This PR delete codes not used anymore.

Fixes: #332

Signed-off-by: bin liu <bin@hyper.sh>

src/runtime/pkg/katautils/create.go

@@ -104,7 +104,7 @@ func SetEphemeralStorageType(ociSpec specs.Spec) specs.Spec {
 
 // CreateSandbox create a sandbox container
 func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec specs.Spec, runtimeConfig oci.RuntimeConfig, rootFs vc.RootFs,
-	containerID, bundlePath, console string, disableOutput, systemdCgroup, builtIn bool) (_ vc.VCSandbox, _ vc.Process, err error) {
+	containerID, bundlePath, console string, disableOutput, systemdCgroup bool) (_ vc.VCSandbox, _ vc.Process, err error) {
 	span, ctx := Trace(ctx, "createSandbox")
 	defer span.Finish()
 
@@ -113,9 +113,7 @@ func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec specs.Spec, runtimeCo
 		return nil, vc.Process{}, err
 	}
 
-	if builtIn {
-		sandboxConfig.Stateful = true
-	}
+	sandboxConfig.Stateful = true
 
 	if err := checkForFIPS(&sandboxConfig); err != nil {
 		return nil, vc.Process{}, err
@@ -171,13 +169,6 @@ func CreateSandbox(ctx context.Context, vci vc.VC, ociSpec specs.Spec, runtimeCo
 		return nil, vc.Process{}, fmt.Errorf("BUG: Container list from sandbox is wrong, expecting only one container, found %d containers", len(containers))
 	}
 
-	if !builtIn {
-		err = AddContainerIDMapping(ctx, containerID, sandbox.ID())
-		if err != nil {
-			return nil, vc.Process{}, err
-		}
-	}
-
 	return sandbox, containers[0].Process(), nil
 }
 
@@ -211,7 +202,7 @@ func checkForFIPS(sandboxConfig *vc.SandboxConfig) error {
 }
 
 // CreateContainer create a container
-func CreateContainer(ctx context.Context, vci vc.VC, sandbox vc.VCSandbox, ociSpec specs.Spec, rootFs vc.RootFs, containerID, bundlePath, console string, disableOutput, builtIn bool) (vc.Process, error) {
+func CreateContainer(ctx context.Context, sandbox vc.VCSandbox, ociSpec specs.Spec, rootFs vc.RootFs, containerID, bundlePath, console string, disableOutput bool) (vc.Process, error) {
 	var c vc.VCContainer
 
 	span, ctx := Trace(ctx, "createContainer")
@@ -242,22 +233,9 @@ func CreateContainer(ctx context.Context, vci vc.VC, sandbox vc.VCSandbox, ociSp
 
 	span.SetTag("sandbox", sandboxID)
 
-	if builtIn {
-		c, err = sandbox.CreateContainer(contConfig)
-		if err != nil {
-			return vc.Process{}, err
-		}
-	} else {
-		kataUtilsLogger = kataUtilsLogger.WithField("sandbox", sandboxID)
-
-		sandbox, c, err = vci.CreateContainer(ctx, sandboxID, contConfig)
-		if err != nil {
-			return vc.Process{}, err
-		}
-
-		if err := AddContainerIDMapping(ctx, containerID, sandboxID); err != nil {
-			return vc.Process{}, err
-		}
+	c, err = sandbox.CreateContainer(contConfig)
+	if err != nil {
+		return vc.Process{}, err
 	}
 
 	// Run pre-start OCI hooks.

src/runtime/pkg/katautils/create_test.go

@@ -40,6 +40,10 @@ var (
 
 	// testingImpl is a concrete mock RVC implementation used for testing
 	testingImpl = &vcmock.VCMock{}
+	// mock sandbox
+	mockSandbox = &vcmock.Sandbox{
+		MockID: testSandboxID,
+	}
 
 	tc ktu.TestConstraint
 )
@@ -258,11 +262,6 @@ func TestSetKernelParamsUserOptionTakesPriority(t *testing.T) {
 func TestCreateSandboxConfigFail(t *testing.T) {
 	assert := assert.New(t)
 
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
 	tmpdir, err := ioutil.TempDir("", "")
 	assert.NoError(err)
 	defer os.RemoveAll(tmpdir)
@@ -295,7 +294,7 @@ func TestCreateSandboxConfigFail(t *testing.T) {
 
 	rootFs := vc.RootFs{Mounted: true}
 
-	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true, false)
+	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true)
 	assert.Error(err)
 }
 
@@ -306,11 +305,6 @@ func TestCreateSandboxFail(t *testing.T) {
 
 	assert := assert.New(t)
 
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
 	tmpdir, err := ioutil.TempDir("", "")
 	assert.NoError(err)
 	defer os.RemoveAll(tmpdir)
@@ -331,7 +325,7 @@ func TestCreateSandboxFail(t *testing.T) {
 
 	rootFs := vc.RootFs{Mounted: true}
 
-	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true, false)
+	_, _, err = CreateSandbox(context.Background(), testingImpl, spec, runtimeConfig, rootFs, testContainerID, bundlePath, testConsole, true, true)
 	assert.Error(err)
 	assert.True(vcmock.IsMockError(err))
 }
@@ -381,11 +375,6 @@ func TestCheckForFips(t *testing.T) {
 func TestCreateContainerContainerConfigFail(t *testing.T) {
 	assert := assert.New(t)
 
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
 	tmpdir, err := ioutil.TempDir("", "")
 	assert.NoError(err)
 	defer os.RemoveAll(tmpdir)
@@ -413,22 +402,16 @@ func TestCreateContainerContainerConfigFail(t *testing.T) {
 	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
-		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)
+		_, err = CreateContainer(context.Background(), mockSandbox, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput)
 		assert.Error(err)
 		assert.False(vcmock.IsMockError(err))
 		assert.True(strings.Contains(err.Error(), containerType))
-		os.RemoveAll(path)
 	}
 }
 
 func TestCreateContainerFail(t *testing.T) {
 	assert := assert.New(t)
 
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
 	tmpdir, err := ioutil.TempDir("", "")
 	assert.NoError(err)
 	defer os.RemoveAll(tmpdir)
@@ -456,27 +439,21 @@ func TestCreateContainerFail(t *testing.T) {
 	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
-		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)
+		_, err = CreateContainer(context.Background(), mockSandbox, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput)
 		assert.Error(err)
 		assert.True(vcmock.IsMockError(err))
-		os.RemoveAll(path)
 	}
 }
 
 func TestCreateContainer(t *testing.T) {
 	assert := assert.New(t)
 
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
-	testingImpl.CreateContainerFunc = func(ctx context.Context, sandboxID string, containerConfig vc.ContainerConfig) (vc.VCSandbox, vc.VCContainer, error) {
-		return &vcmock.Sandbox{}, &vcmock.Container{}, nil
+	mockSandbox.CreateContainerFunc = func(containerConfig vc.ContainerConfig) (vc.VCContainer, error) {
+		return &vcmock.Container{}, nil
 	}
 
 	defer func() {
-		testingImpl.CreateContainerFunc = nil
+		mockSandbox.CreateContainerFunc = nil
 	}()
 
 	tmpdir, err := ioutil.TempDir("", "")
@@ -506,8 +483,7 @@ func TestCreateContainer(t *testing.T) {
 	rootFs := vc.RootFs{Mounted: true}
 
 	for _, disableOutput := range []bool{true, false} {
-		_, err = CreateContainer(context.Background(), testingImpl, nil, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput, false)
+		_, err = CreateContainer(context.Background(), mockSandbox, spec, rootFs, testContainerID, bundlePath, testConsole, disableOutput)
 		assert.NoError(err)
-		os.RemoveAll(path)
 	}
 }

src/runtime/pkg/katautils/oci.go

@@ -1,110 +0,0 @@
-// Copyright (c) 2018 Intel Corporation
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-package katautils
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless"
-)
-
-const ctrsMappingDirMode = os.FileMode(0750)
-
-var ctrsMapTreePath = "/var/run/kata-containers/containers-mapping"
-
-// SetCtrsMapTreePath let the testcases change the ctrsMapTreePath to a test dir
-func SetCtrsMapTreePath(path string) {
-	ctrsMapTreePath = path
-}
-
-// doUpdatePath returns whether a ctrsMapTreePath needs to be updated with a rootless prefix
-func doUpdatePath() bool {
-	return rootless.IsRootless() && !strings.HasPrefix(ctrsMapTreePath, rootless.GetRootlessDir())
-}
-
-// FetchContainerIDMapping This function assumes it should find only one file inside the container
-// ID directory. If there are several files, we could not determine which
-// file name corresponds to the sandbox ID associated, and this would throw
-// an error.
-func FetchContainerIDMapping(containerID string) (string, error) {
-	if containerID == "" {
-		return "", fmt.Errorf("Missing container ID")
-	}
-
-	if doUpdatePath() {
-		SetCtrsMapTreePath(filepath.Join(rootless.GetRootlessDir(), ctrsMapTreePath))
-	}
-
-	dirPath := filepath.Join(ctrsMapTreePath, containerID)
-
-	files, err := ioutil.ReadDir(dirPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-
-		return "", err
-	}
-
-	if len(files) != 1 {
-		return "", fmt.Errorf("Too many files (%d) in %q", len(files), dirPath)
-	}
-
-	return files[0].Name(), nil
-}
-
-// AddContainerIDMapping add a container id mapping to sandbox id
-func AddContainerIDMapping(ctx context.Context, containerID, sandboxID string) error {
-	span, _ := Trace(ctx, "addContainerIDMapping")
-	defer span.Finish()
-
-	if containerID == "" {
-		return fmt.Errorf("Missing container ID")
-	}
-
-	if sandboxID == "" {
-		return fmt.Errorf("Missing sandbox ID")
-	}
-
-	if doUpdatePath() {
-		SetCtrsMapTreePath(filepath.Join(rootless.GetRootlessDir(), ctrsMapTreePath))
-	}
-	parentPath := filepath.Join(ctrsMapTreePath, containerID)
-
-	if err := os.RemoveAll(parentPath); err != nil {
-		return err
-	}
-
-	path := filepath.Join(parentPath, sandboxID)
-
-	if err := os.MkdirAll(path, ctrsMappingDirMode); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// DelContainerIDMapping delete container id mapping from a sandbox
-func DelContainerIDMapping(ctx context.Context, containerID string) error {
-	span, _ := Trace(ctx, "delContainerIDMapping")
-	defer span.Finish()
-
-	if containerID == "" {
-		return fmt.Errorf("Missing container ID")
-	}
-
-	if doUpdatePath() {
-		SetCtrsMapTreePath(filepath.Join(rootless.GetRootlessDir(), ctrsMapTreePath))
-	}
-	path := filepath.Join(ctrsMapTreePath, containerID)
-
-	return os.RemoveAll(path)
-}

src/runtime/pkg/katautils/oci_test.go

@@ -1,140 +0,0 @@
-// Copyright (c) 2018 Intel Corporation
-// Copyright (c) 2018 HyperHQ Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-package katautils
-
-import (
-	"context"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless"
-	"github.com/stretchr/testify/assert"
-)
-
-func init() {
-	rootless.IsRootless = func() bool { return false }
-}
-
-func createTempContainerIDMapping(containerID, sandboxID string) (string, error) {
-	tmpDir, err := ioutil.TempDir("", "containers-mapping")
-	if err != nil {
-		return "", err
-	}
-	ctrsMapTreePath = tmpDir
-
-	path := filepath.Join(ctrsMapTreePath, containerID, sandboxID)
-	if err := os.MkdirAll(path, 0750); err != nil {
-		return "", err
-	}
-
-	return tmpDir, nil
-}
-
-func TestFetchContainerIDMappingContainerIDEmptyFailure(t *testing.T) {
-	assert := assert.New(t)
-
-	sandboxID, err := FetchContainerIDMapping("")
-	assert.Error(err)
-	assert.Empty(sandboxID)
-}
-
-func TestFetchContainerIDMappingEmptyMappingSuccess(t *testing.T) {
-	assert := assert.New(t)
-
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
-	sandboxID, err := FetchContainerIDMapping(testContainerID)
-	assert.NoError(err)
-	assert.Empty(sandboxID)
-}
-
-func TestFetchContainerIDMappingTooManyFilesFailure(t *testing.T) {
-	assert := assert.New(t)
-
-	path, err := createTempContainerIDMapping(testContainerID, testSandboxID)
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	err = os.MkdirAll(filepath.Join(ctrsMapTreePath, testContainerID, testSandboxID+"2"), ctrsMappingDirMode)
-	assert.NoError(err)
-
-	sandboxID, err := FetchContainerIDMapping(testContainerID)
-	assert.Error(err)
-	assert.Empty(sandboxID)
-}
-
-func TestFetchContainerIDMappingSuccess(t *testing.T) {
-	assert := assert.New(t)
-
-	path, err := createTempContainerIDMapping(testContainerID, testSandboxID)
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-
-	sandboxID, err := FetchContainerIDMapping(testContainerID)
-	assert.NoError(err)
-	assert.Equal(sandboxID, testSandboxID)
-}
-
-func TestAddContainerIDMappingContainerIDEmptyFailure(t *testing.T) {
-	assert := assert.New(t)
-
-	err := AddContainerIDMapping(context.Background(), "", testSandboxID)
-	assert.Error(err)
-}
-
-func TestAddContainerIDMappingSandboxIDEmptyFailure(t *testing.T) {
-	assert := assert.New(t)
-
-	err := AddContainerIDMapping(context.Background(), testContainerID, "")
-	assert.Error(err)
-}
-
-func TestAddContainerIDMappingSuccess(t *testing.T) {
-	assert := assert.New(t)
-
-	path, err := ioutil.TempDir("", "containers-mapping")
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-	ctrsMapTreePath = path
-
-	_, err = os.Stat(filepath.Join(ctrsMapTreePath, testContainerID, testSandboxID))
-	assert.True(os.IsNotExist(err))
-
-	err = AddContainerIDMapping(context.Background(), testContainerID, testSandboxID)
-	assert.NoError(err)
-
-	_, err = os.Stat(filepath.Join(ctrsMapTreePath, testContainerID, testSandboxID))
-	assert.NoError(err)
-}
-
-func TestDelContainerIDMappingContainerIDEmptyFailure(t *testing.T) {
-	assert := assert.New(t)
-
-	err := DelContainerIDMapping(context.Background(), "")
-	assert.Error(err)
-}
-
-func TestDelContainerIDMappingSuccess(t *testing.T) {
-	assert := assert.New(t)
-
-	path, err := createTempContainerIDMapping(testContainerID, testSandboxID)
-	assert.NoError(err)
-	defer os.RemoveAll(path)
-
-	_, err = os.Stat(filepath.Join(ctrsMapTreePath, testContainerID, testSandboxID))
-	assert.NoError(err)
-
-	err = DelContainerIDMapping(context.Background(), testContainerID)
-	assert.NoError(err)
-
-	_, err = os.Stat(filepath.Join(ctrsMapTreePath, testContainerID, testSandboxID))
-	assert.True(os.IsNotExist(err))
-}