launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #15332
[Merge] lp:~jtv/juju-core/mpv-publicstorage into lp:~maas-maintainers/juju-core/maas-provider-skeleton
Jeroen T. Vermeulen has proposed merging lp:~jtv/juju-core/mpv-publicstorage into lp:~maas-maintainers/juju-core/maas-provider-skeleton.
Commit message:
"Implement" Environ.PublicStorage (by returning nil to say that it's not there).
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~jtv/juju-core/mpv-publicstorage/+merge/152703
Plus a bit more unit testing. Unit testing is nice.
Jeroen
--
https://code.launchpad.net/~jtv/juju-core/mpv-publicstorage/+merge/152703
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/juju-core/mpv-publicstorage into lp:~maas-maintainers/juju-core/maas-provider-skeleton.
=== modified file 'environs/maas/environ.go'
--- environs/maas/environ.go 2013-03-08 11:36:53 +0000
+++ environs/maas/environ.go 2013-03-11 15:28:22 +0000
@@ -313,7 +313,7 @@
}
func (*maasEnviron) PublicStorage() environs.StorageReader {
- panic("Not implemented.")
+ return nil
}
func (environ *maasEnviron) Destroy([]environs.Instance) error {
=== modified file 'environs/maas/environ_test.go'
--- environs/maas/environ_test.go 2013-03-08 11:59:36 +0000
+++ environs/maas/environ_test.go 2013-03-11 15:28:22 +0000
@@ -152,6 +152,19 @@
c.Check(string(instances[0].Id()), Equals, resourceURI1)
}
+func (suite *EnvironSuite) TestStorageReturnsStorage(c *C) {
+ env := suite.makeEnviron()
+ storage := env.Storage()
+ c.Check(storage, NotNil)
+ specificStorage := storage.(*maasStorage)
+ c.Check(specificStorage.environUnlocked, Equals, env)
+}
+
+func (suite *EnvironSuite) TestPublicStorageIsNotImplemented(c *C) {
+ env := suite.makeEnviron()
+ c.Check(env.PublicStorage(), IsNil)
+}
+
func (suite *EnvironSuite) TestStartInstanceStartsInstance(c *C) {
input := `{"system_id": "test"}`
node := suite.testMAASObject.TestServer.NewNode(input)