filesystem storage defaults to rootfs

wallyworld · wallyworld · commit 9065fd10c574 · 2015-02-26T11:57:13.000+10:00
diff --git a/apiserver/client/client.go b/apiserver/client/client.go
@@ -30,6 +30,7 @@ import (
 	"github.com/juju/juju/state/multiwatcher"
 	statestorage "github.com/juju/juju/state/storage"
 	"github.com/juju/juju/storage"
+	"github.com/juju/juju/storage/provider"
 	"github.com/juju/juju/version"
 )
 
@@ -323,6 +324,10 @@ func (c *Client) ServiceDeploy(args params.ServiceDeploy) error {
 	// TODO(axw) stop checking feature flag once storage has graduated.
 	var storageConstraints map[string]storage.Constraints
 	if featureflag.Enabled(feature.Storage) {
+		storageConstraints = args.Storage
+		if storageConstraints == nil {
+			storageConstraints = make(map[string]storage.Constraints)
+		}
 		// Validate the storage parameters against the charm metadata,
 		// and ensure there are no conflicting parameters.
 		if err := validateCharmStorage(args, ch); err != nil {
@@ -343,15 +348,23 @@ func (c *Client) ServiceDeploy(args params.ServiceDeploy) error {
 					store,
 				)
 			}
-			// TODO(axw) when storage pools, providers etc. are implemented,
-			// and we have a "loop" storage provider, we should create minimal
-			// constraints with the "loop" pool here.
-			return errors.Errorf(
-				"no constraints specified for charm storage %q, loop not implemented",
-				store,
-			)
+			if charmStorage.CountMin <= 0 {
+				continue
+			}
+			if charmStorage.Type == charm.StorageBlock {
+				// TODO(axw) clarify what the rules are for "block" kind when
+				// no constraints are specified. For "filesystem" we use rootfs.
+				return errors.Errorf(
+					"no constraints specified for block charm storage %q",
+					store,
+				)
+			}
+			storageConstraints[store] = storage.Constraints{
+				// The pool is the provider type since rootfs provider has no configuration.
+				Pool:  string(provider.RootfsProviderType),
+				Count: uint64(charmStorage.CountMin),
+			}
 		}
-		storageConstraints = args.Storage
 	}
 
 	var settings charm.Settings
diff --git a/apiserver/client/client_test.go b/apiserver/client/client_test.go
@@ -1519,6 +1519,25 @@ func (s *clientSuite) TestClientServiceDeployWithUnsupportedStoragePool(c *gc.C)
 		`.*pool "host-loop-pool" uses storage provider "hostloop" which is not supported for environments of type "dummy"`)
 }
 
+func (s *clientSuite) TestClientServiceDeployDefaultFilesystemStorage(c *gc.C) {
+	s.setupStoragePool(c)
+	s.makeMockCharmStore()
+	curl, bundle := addCharm(c, "storage-filesystem")
+	var cons constraints.Value
+	err := s.APIState.Client().ServiceDeployWithNetworks(curl.String(), "service", 1, "", cons, "", nil, nil)
+	c.Assert(err, jc.ErrorIsNil)
+	service := s.assertPrincipalDeployed(c, "service", curl, false, bundle, cons)
+	storageConstraintsOut, err := service.StorageConstraints()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(storageConstraintsOut, gc.DeepEquals, map[string]state.StorageConstraints{
+		"data": {
+			Count: 1,
+			Size:  1024,
+			Pool:  "rootfs",
+		},
+	})
+}
+
 func (s *clientSuite) setupServiceDeploy(c *gc.C, args string) (*charm.URL, charm.Charm, constraints.Value) {
 	s.makeMockCharmStore()
 	curl, bundle := addCharm(c, "dummy")
diff --git a/testcharms/charm-repo/quantal/storage-filesystem/hooks/install b/testcharms/charm-repo/quantal/storage-filesystem/hooks/install
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "Done!"
diff --git a/testcharms/charm-repo/quantal/storage-filesystem/metadata.yaml b/testcharms/charm-repo/quantal/storage-filesystem/metadata.yaml
@@ -0,0 +1,6 @@
+name: storage-filesystem
+summary: A charm needing filesystem storage
+description: See above
+storage:
+    data:
+        type: filesystem
diff --git a/testcharms/charm-repo/quantal/storage-filesystem/revision b/testcharms/charm-repo/quantal/storage-filesystem/revision
@@ -0,0 +1 @@
+1
