Merge pull request moby#25816 from anusha-ragunathan/vol-plugin-list

Make `docker volume list` lookup plugins installed using new model.
zambon · Aug 25, 2016 · 0c69260 · 0c69260
2 parents a36016c + 59c45f7
commit 0c69260
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/integration-cli/docker_cli_daemon_experimental_test.go b/integration-cli/docker_cli_daemon_experimental_test.go
@@ -206,6 +206,13 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
 		}
 	}()
 
+	out, err = s.d.Cmd("volume", "ls")
+	if err != nil {
+		c.Fatalf("Could not list volume: %v %s", err, out)
+	}
+	c.Assert(out, checker.Contains, volName)
+	c.Assert(out, checker.Contains, pluginName)
+
 	mountPoint, err := s.d.Cmd("volume", "inspect", volName, "--format", "{{.Mountpoint}}")
 	if err != nil {
 		c.Fatalf("Could not inspect volume: %v %s", err, mountPoint)

diff --git a/plugin/manager.go b/plugin/manager.go
@@ -181,14 +181,13 @@ func FindWithCapability(capability string) ([]Plugin, error) {
 		handleLegacy = manager.handleLegacy
 		manager.RLock()
 		defer manager.RUnlock()
-	pluginLoop:
 		for _, p := range manager.plugins {
 			for _, typ := range p.PluginObj.Manifest.Interface.Types {
-				if typ.Capability != capability || typ.Prefix != "docker" {
-					continue pluginLoop
+				if strings.EqualFold(typ.Capability, capability) && typ.Prefix == "docker" {
+					result = append(result, p)
+					break
 				}
 			}
-			result = append(result, p)
 		}
 	}
 	if handleLegacy {
@@ -244,9 +243,8 @@ func LookupWithCapability(name, capability string) (Plugin, error) {
 		return nil, err
 	}
 
-	capability = strings.ToLower(capability)
 	for _, typ := range p.PluginObj.Manifest.Interface.Types {
-		if typ.Capability == capability && typ.Prefix == "docker" {
+		if strings.EqualFold(typ.Capability, capability) && typ.Prefix == "docker" {
 			return p, nil
 		}
 	}

diff --git a/volume/drivers/extpoint.go b/volume/drivers/extpoint.go
@@ -107,7 +107,7 @@ func lookup(name string) (volume.Driver, error) {
 		return nil, fmt.Errorf("Error looking up volume plugin %s: %v", name, err)
 	}
 
-	d := NewVolumeDriver(name, p.Client())
+	d := NewVolumeDriver(p.Name(), p.Client())
 	if err := validateDriver(d); err != nil {
 		return nil, err
 	}