add lxcfs flag to cli

Signed-off-by: codejuan <[email protected]>
yangliyi0101 · Jan 10, 2018 · f0465d0 · f0465d0
1 parent a45d30d
commit f0465d0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 0 deletions.
diff --git a/cli/container.go b/cli/container.go
@@ -28,6 +28,7 @@ type container struct {
 	memorySwap       string
 	memorySwappiness int64
 	devices          []string
+	enableLxcfs      bool
 }
 
 func (c *container) config() (*types.ContainerCreateConfig, error) {
@@ -106,5 +107,7 @@ func (c *container) config() (*types.ContainerCreateConfig, error) {
 	}
 	config.HostConfig.Devices = deviceMappings
 
+	config.EnableLxcfs = c.enableLxcfs
+
 	return config, nil
 }
diff --git a/cli/create.go b/cli/create.go
@@ -56,6 +56,7 @@ func (cc *CreateCommand) addFlags() {
 	flagSet.StringVarP(&cc.memory, "memory", "m", "", "Container memory limit")
 	flagSet.StringVar(&cc.memorySwap, "memory-swap", "", "Container swap limit")
 	flagSet.StringSliceVarP(&cc.devices, "device", "", nil, "Add a host device to the container")
+	flagSet.BoolVar(&cc.enableLxcfs, "enableLxcfs", false, "Enable lxcfs")
 }
 
 // runCreate is the entry of create command.

diff --git a/cli/run.go b/cli/run.go
@@ -65,6 +65,7 @@ func (rc *RunCommand) addFlags() {
 	flagSet.StringVarP(&rc.memory, "memory", "m", "", "Container memory limit")
 	flagSet.StringVar(&rc.memorySwap, "memory-swap", "", "Container swap limit")
 	flagSet.StringSliceVarP(&rc.devices, "device", "", nil, "Add a host device to the container")
+	flagSet.BoolVar(&rc.enableLxcfs, "enableLxcfs", false, "Enable lxcfs")
 }
 
 // runRun is the entry of run command.

diff --git a/test/cli_create_test.go b/test/cli_create_test.go
@@ -118,3 +118,23 @@ func (suite *PouchCreateSuite) TestCreateWithLabels(c *check.C) {
 		c.Errorf("failed to set label: %s", label)
 	}
 }
+
+// TestCreateEnableLxcfs tries to test create a container with lxcfs.
+func (suite *PouchCreateSuite) TestCreateEnableLxcfs(c *check.C) {
+	name := "create-lxcfs"
+
+	res := command.PouchRun("create", "--name", name, "--enableLxcfs=true", busyboxImage)
+	res.Assert(c, icmd.Success)
+
+	output := command.PouchRun("inspect", name).Stdout()
+
+	result := &types.ContainerJSON{}
+	if err := json.Unmarshal([]byte(output), result); err != nil {
+		c.Errorf("failed to decode inspect output: %v", err)
+	}
+	c.Assert(result.Config.EnableLxcfs, check.NotNil)
+
+	if result.Config.EnableLxcfs != true {
+		c.Errorf("failed to set EnableLxcfs")
+	}
+}
diff --git a/test/cli_run_test.go b/test/cli_run_test.go
@@ -151,3 +151,15 @@ func (suite *PouchRunSuite) TestRunInWrongWay(c *check.C) {
 		c.Assert(res.Error, check.NotNil, check.Commentf(tc.name))
 	}
 }
+
+// TestRunEnableLxcfs is to verify run container with lxcfs.
+func (suite *PouchRunSuite) TestRunEnableLxcfs(c *check.C) {
+	name := "test-run-lxcfs"
+
+	res := command.PouchRun("run", "--name", name, "--enableLxcfs=true", busyboxImage, "cat", "/proc/uptime")
+	res.Assert(c, icmd.Success)
+
+	if out := res.Combined(); !strings.Contains(out, " 0.0") {
+		c.Fatalf("upexpected output %s expected %s\n", out, " 0.0")
+	}
+}