cli: kata-env: show if vsocks are supported

Add a new field in `HostInfo` structure to show if vsocks are supported in the host. fixes #589 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Aug 21, 2018 · bfb2e84 · bfb2e84
1 parent 4784ac7
commit bfb2e84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cli/kata-env.go b/cli/kata-env.go
@@ -16,6 +16,7 @@ import (
 	"github.com/BurntSushi/toml"
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
+	vcUtils "github.com/kata-containers/runtime/virtcontainers/utils"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
 )
@@ -24,7 +25,7 @@ import (
 //
 // XXX: Increment for every change to the output format
 // (meaning any change to the EnvInfo type).
-const formatVersion = "1.0.14"
+const formatVersion = "1.0.15"
 
 // MetaInfo stores information on the format of the output itself
 type MetaInfo struct {
@@ -119,6 +120,7 @@ type HostInfo struct {
 	Distro             DistroInfo
 	CPU                CPUInfo
 	VMContainerCapable bool
+	SupportVSocks      bool
 }
 
 // EnvInfo collects all information that will be displayed by the
@@ -212,6 +214,7 @@ func getHostInfo() (HostInfo, error) {
 		Distro:             hostDistro,
 		CPU:                hostCPU,
 		VMContainerCapable: hostVMContainerCapable,
+		SupportVSocks:      vcUtils.SupportsVsocks(),
 	}
 
 	return host, nil

diff --git a/cli/kata-env_test.go b/cli/kata-env_test.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/BurntSushi/toml"
 	vc "github.com/kata-containers/runtime/virtcontainers"
+	vcUtils "github.com/kata-containers/runtime/virtcontainers/utils"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
 
@@ -179,6 +180,7 @@ func genericGetExpectedHostDetails(tmpdir string) (HostInfo, error) {
 		Distro:             expectedDistro,
 		CPU:                expectedCPU,
 		VMContainerCapable: false,
+		SupportVSocks:      vcUtils.SupportsVsocks(),
 	}
 
 	testProcCPUInfo := filepath.Join(tmpdir, "cpuinfo")