Skip to content

Commit

Permalink
Merge pull request clearcontainers#629 from jodh-intel/fix-list--cc-all
Browse files Browse the repository at this point in the history 
list: Ensure "--cc-all" details are correct
  • Loading branch information
Samuel Ortiz authored Sep 26, 2017
2 parents ec7d428 + b629d80 commit d9897e1
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 202 deletions.
46 changes: 6 additions & 40 deletions list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package main

import (
"encoding/json"
"errors"
"fmt"
"os"
"text/tabwriter"
Expand Down Expand Up @@ -186,16 +185,6 @@ func (f *formatJSON) Write(state []fullContainerState, showAll bool, file *os.Fi
}

func getContainers(context *cli.Context) ([]fullContainerState, error) {
runtimeConfig, ok := context.App.Metadata["runtimeConfig"].(oci.RuntimeConfig)
if !ok {
return nil, errors.New("invalid runtime config")
}

hypervisorDetails, err := getHypervisorDetails(runtimeConfig)
if err != nil {
return nil, err
}

podList, err := vci.ListPod()
if err != nil {
return nil, err
Expand All @@ -209,6 +198,12 @@ func getContainers(context *cli.Context) ([]fullContainerState, error) {
continue
}

hypervisorDetails := hypervisorDetails{
HypervisorPath: pod.HypervisorConfig.HypervisorPath,
ImagePath: pod.HypervisorConfig.ImagePath,
KernelPath: pod.HypervisorConfig.KernelPath,
}

for _, container := range pod.ContainersStatus {
ociState := oci.StatusToOCIState(container)

Expand All @@ -232,32 +227,3 @@ func getContainers(context *cli.Context) ([]fullContainerState, error) {

return s, nil
}

// getHypervisorDetails returns details of the hypervisor used to host
// the container.
func getHypervisorDetails(runtimeConfig oci.RuntimeConfig) (hypervisorDetails, error) {
initialHypervisorPath := runtimeConfig.HypervisorConfig.HypervisorPath
initialKernelPath := runtimeConfig.HypervisorConfig.KernelPath
initialImagePath := runtimeConfig.HypervisorConfig.ImagePath

hypervisorPath, err := resolvePath(initialHypervisorPath)
if err != nil {
return hypervisorDetails{}, err
}

kernelPath, err := resolvePath(initialKernelPath)
if err != nil {
return hypervisorDetails{}, err
}

imagePath, err := resolvePath(initialImagePath)
if err != nil {
return hypervisorDetails{}, err
}

return hypervisorDetails{
HypervisorPath: hypervisorPath,
KernelPath: kernelPath,
ImagePath: imagePath,
}, nil
}
257 changes: 95 additions & 162 deletions list_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"path/filepath"
"regexp"
"strings"
"syscall"
"testing"
"time"

Expand Down Expand Up @@ -99,67 +98,6 @@ func (w *TestFileWriter) Write(bytes []byte) (n int, err error) {
return w.File.Write(bytes)
}

func TestListGetHypervisorDetailsWithSymLinks(t *testing.T) {
tmpDir, err := ioutil.TempDir(testDir, "hypervisor-details-")
if err != nil {
t.Error(err)
}

kernel := path.Join(tmpDir, "kernel")
image := path.Join(tmpDir, "image")
hypervisor := path.Join(tmpDir, "image")

kernelLink := path.Join(tmpDir, "link-to-kernel")
imageLink := path.Join(tmpDir, "link-to-image")
hypervisorLink := path.Join(tmpDir, "link-to-hypervisor")

type testData struct {
file string
symLink string
}

for _, d := range []testData{
{kernel, kernelLink},
{image, imageLink},
{hypervisor, hypervisorLink},
} {
err = createEmptyFile(d.file)
if err != nil {
t.Error(err)
}

err = syscall.Symlink(d.file, d.symLink)
if err != nil {
t.Error(err)
}
}

hypervisorConfig := vc.HypervisorConfig{
KernelPath: kernelLink,
ImagePath: imageLink,
HypervisorPath: hypervisorLink,
}

runtimeConfig := oci.RuntimeConfig{
HypervisorConfig: hypervisorConfig,
}

expected := hypervisorDetails{
KernelPath: kernel,
ImagePath: image,
HypervisorPath: hypervisor,
}

result, err := getHypervisorDetails(runtimeConfig)
if err != nil {
t.Error(err)
}

assert.Equal(t, result, expected, "hypervisor configs")

os.RemoveAll(tmpDir)
}

func formatListDataAsBytes(formatter formatState, state []fullContainerState, showAll bool) (bytes []byte, err error) {
tmpfile, err := ioutil.TempFile("", "formatListData-")
if err != nil {
Expand Down Expand Up @@ -425,106 +363,6 @@ func TestListGetContainersListPodFail(t *testing.T) {
assert.True(vcMock.IsMockError(err))
}

func TestListGetContainersNoHypervisorDetails(t *testing.T) {
assert := assert.New(t)

testingImpl.ListPodFunc = func() ([]vc.PodStatus, error) {
// No pre-existing pods
return []vc.PodStatus{}, nil
}

defer func() {
testingImpl.ListPodFunc = nil
}()

tmpdir, err := ioutil.TempDir(testDir, "")
assert.NoError(err)
defer os.RemoveAll(tmpdir)

app := cli.NewApp()
ctx := cli.NewContext(app, nil, nil)
app.Name = "foo"

runtimeConfig, err := newTestRuntimeConfig(tmpdir, testConsole, true)
assert.NoError(err)

invalidRuntimeConfig := runtimeConfig

// remove required element
invalidRuntimeConfig.HypervisorConfig = vc.HypervisorConfig{}

ctx.App.Metadata = map[string]interface{}{
"runtimeConfig": invalidRuntimeConfig,
}

_, err = getContainers(ctx)
// invalid config provided
assert.Error(err)
assert.False(vcMock.IsMockError(err))

// valid config
ctx.App.Metadata["runtimeConfig"] = runtimeConfig

_, err = getContainers(ctx)
assert.NoError(err)
}

func TestListGetHypervisorDetailsMissingDetails(t *testing.T) {
assert := assert.New(t)

testingImpl.ListPodFunc = func() ([]vc.PodStatus, error) {
// No pre-existing pods
return []vc.PodStatus{}, nil
}

defer func() {
testingImpl.ListPodFunc = nil
}()

tmpdir, err := ioutil.TempDir(testDir, "")
assert.NoError(err)
defer os.RemoveAll(tmpdir)

app := cli.NewApp()
ctx := cli.NewContext(app, nil, nil)
app.Name = "foo"

runtimeConfig, err := newTestRuntimeConfig(tmpdir, testConsole, true)
assert.NoError(err)

ctx.App.Metadata = map[string]interface{}{}

invalidRuntimeConfig := runtimeConfig

// remove required element
invalidRuntimeConfig.HypervisorConfig.HypervisorPath = ""
ctx.App.Metadata["runtimeConfig"] = invalidRuntimeConfig

_, err = getContainers(ctx)
assert.Error(err)
assert.False(vcMock.IsMockError(err))

invalidRuntimeConfig = runtimeConfig

// remove required element
invalidRuntimeConfig.HypervisorConfig.ImagePath = ""
ctx.App.Metadata["runtimeConfig"] = invalidRuntimeConfig

_, err = getContainers(ctx)
assert.Error(err)
assert.False(vcMock.IsMockError(err))

invalidRuntimeConfig = runtimeConfig

// remove required element
invalidRuntimeConfig.HypervisorConfig.KernelPath = ""
ctx.App.Metadata["runtimeConfig"] = invalidRuntimeConfig

_, err = getContainers(ctx)
assert.Error(err)
assert.False(vcMock.IsMockError(err))
}

func TestListGetContainers(t *testing.T) {
assert := assert.New(t)

Expand Down Expand Up @@ -805,3 +643,98 @@ func TestListCLIFunctionQuiet(t *testing.T) {
trimmed := strings.TrimSpace(text)
assert.Equal(testPodID, trimmed)
}

func TestListGetContainersWithNewAndOldAssets(t *testing.T) {
assert := assert.New(t)

pod1 := &vcMock.Pod{
MockID: testPodID,
}

testPodID2 := strings.Replace(testPodID, "9", "1", -1)
assert.NotNil(testPodID2)

pod2 := &vcMock.Pod{
MockID: testPodID2,
}

pod1Path := "/this/is/path/1"
pod2Path := "/i/am/called/path/number/2"

testingImpl.ListPodFunc = func() ([]vc.PodStatus, error) {
return []vc.PodStatus{
{
ID: pod1.ID(),
ContainersStatus: []vc.ContainerStatus{
{
ID: pod1.ID(),
Annotations: map[string]string{},
},
},
HypervisorConfig: vc.HypervisorConfig{
KernelPath: path.Join(pod1Path, "kernel"),
ImagePath: path.Join(pod1Path, "image"),
HypervisorPath: path.Join(pod1Path, "hypervisor"),
},
},
{
ID: pod2.ID(),
ContainersStatus: []vc.ContainerStatus{
{
ID: pod2.ID(),
Annotations: map[string]string{},
},
},
HypervisorConfig: vc.HypervisorConfig{
KernelPath: path.Join(pod2Path, "kernel"),
ImagePath: path.Join(pod2Path, "image"),
HypervisorPath: path.Join(pod2Path, "hypervisor"),
},
},
}, nil
}

defer func() {
testingImpl.ListPodFunc = nil
}()

tmpdir, err := ioutil.TempDir(testDir, "")
assert.NoError(err)
defer os.RemoveAll(tmpdir)

app := cli.NewApp()
ctx := cli.NewContext(app, nil, nil)
app.Name = "foo"

runtimeConfig, err := newTestRuntimeConfig(tmpdir, testConsole, true)
assert.NoError(err)

ctx.App.Metadata = map[string]interface{}{
"runtimeConfig": runtimeConfig,
}

state, err := getContainers(ctx)
assert.NoError(err)

seenPath1 := false
seenPath2 := false

for _, s := range state {
if s.ID == testPodID {
for _, p := range []string{s.HypervisorPath, s.ImagePath, s.KernelPath} {
assert.True(strings.HasPrefix(p, pod1Path))

}
seenPath1 = true
} else if s.ID == testPodID2 {
for _, p := range []string{s.HypervisorPath, s.ImagePath, s.KernelPath} {
assert.True(strings.HasPrefix(p, pod2Path))

}
seenPath2 = true
}
}

assert.True(seenPath1)
assert.True(seenPath2)
}

0 comments on commit d9897e1

Please sign in to comment.