Merge pull request #1352 from shaloulcy/pouch_info_volume_driver

feature: add volume drivers info for system info

apis/swagger.yml

@@ -1283,6 +1283,13 @@ definitions:
         description: |
           The logging driver to use as a default for new containers.
         type: "string"
+      VolumeDrivers:
+        description: |
+          The list of volume drivers which the pouchd supports
+        type: "array"
+        items:
+          type: "string"
+        example: ["local", "tmpfs"]
       CgroupDriver:
         description: |
           The driver to use for managing cgroups.

cli/info.go

@@ -66,6 +66,7 @@ func prettyPrintInfo(cli *Cli, info *types.SystemInfo) error {
 	fmt.Fprintln(os.Stdout, "Storage Driver:", info.Driver)
 	fmt.Fprintln(os.Stdout, "Driver Status:", info.DriverStatus)
 	fmt.Fprintln(os.Stdout, "Logging Driver:", info.LoggingDriver)
+	fmt.Fprintln(os.Stdout, "Volume Drivers:", info.VolumeDrivers)
 	fmt.Fprintln(os.Stdout, "Cgroup Driver:", info.CgroupDriver)
 	if len(info.Runtimes) > 0 {
 		fmt.Fprintln(os.Stdout, "Runtimes:")

daemon/mgr/system.go

@@ -15,6 +15,7 @@ import (
 	"github.com/alibaba/pouch/pkg/meta"
 	"github.com/alibaba/pouch/pkg/system"
 	"github.com/alibaba/pouch/registry"
+	volumedriver "github.com/alibaba/pouch/storage/volume/driver"
 	"github.com/alibaba/pouch/version"
 
 	"github.com/pkg/errors"
@@ -103,6 +104,7 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
 	if err != nil {
 		logrus.Warnf("failed to get image info: %v", err)
 	}
+	volumeDrivers := volumedriver.AllDriversName()
 
 	info := types.SystemInfo{
 		Architecture: runtime.GOARCH,
@@ -128,6 +130,7 @@ func (mgr *SystemManager) Info() (types.SystemInfo, error) {
 		Labels:             mgr.config.Labels,
 		LiveRestoreEnabled: true,
 		LoggingDriver:      mgr.config.DefaultLogConfig.LogDriver,
+		VolumeDrivers:      volumeDrivers,
 		LxcfsEnabled:       mgr.config.IsLxcfsEnabled,
 		MemTotal:           totalMem,
 		Name:               hostname,

storage/volume/driver/driver.go

@@ -3,6 +3,7 @@ package driver
 import (
 	"fmt"
 	"regexp"
+	"sort"
 	"sync"
 
 	"github.com/alibaba/pouch/plugins"
@@ -220,6 +221,9 @@ func Exist(name string) bool {
 
 // AllDriversName return all registered backend driver's name.
 func AllDriversName() []string {
+	// probing all volume plugins.
+	backendDrivers.GetAll()
+
 	backendDrivers.Lock()
 	defer backendDrivers.Unlock()
 
@@ -228,6 +232,9 @@ func AllDriversName() []string {
 		names = append(names, n)
 	}
 
+	// sort the names.
+	sort.Strings(names)
+
 	return names
 }
 

test/api_system_test.go

@@ -51,6 +51,12 @@ func (suite *APISystemSuite) TestInfo(c *check.C) {
 	c.Assert(got.ServerVersion, check.Equals, version.Version)
 	c.Assert(got.Driver, check.Equals, "overlayfs")
 	c.Assert(got.NCPU, check.Equals, int64(runtime.NumCPU()))
+
+	// Check the volume drivers
+	c.Assert(len(got.VolumeDrivers), check.Equals, 3)
+	c.Assert(got.VolumeDrivers[0], check.Equals, "ceph")
+	c.Assert(got.VolumeDrivers[1], check.Equals, "local")
+	c.Assert(got.VolumeDrivers[2], check.Equals, "tmpfs")
 }
 
 // TestVersion tests /version API.