Merge lp:~thumper/juju-core/local-provider-skeleton into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Add skeleton provider and environ for local.

https://codereview.appspot.com/10679045/

Add skeleton provider and environ for local.

https://codereview.appspot.com/10679045/

[Tim Penhey (thumper)]

Reviewers: mp+171951_code.launchpad.net,

Message:
Please take a look.

Description:
Add skeleton provider and environ for local.

https://code.launchpad.net/~thumper/juju-core/local-provider-skeleton/+merge/171951

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/10679045/

Affected files:
   A [revision details]
   A environs/local/environ-provider.go
   A environs/local/environ.go
   A environs/local/local_test.go

[Ian Booth (wallyworld)]

LGTM with the tweak to the test

https://codereview.appspot.com/10679045/diff/2005/environs/local/local_test.go
File environs/local/local_test.go (right):

https://codereview.appspot.com/10679045/diff/2005/environs/local/local_test.go#newcode29
environs/local/local_test.go:29: c.Assert(error, IsNil)
Please assert that the returned provider really is a local provider

https://codereview.appspot.com/10679045/

[William Reade (fwereade)]

LGTM

https://codereview.appspot.com/10679045/

[William Reade (fwereade)]

review: Approve

[Tim Penhey (thumper)]

Please take a look.

https://codereview.appspot.com/10679045/diff/2005/environs/local/local_test.go
File environs/local/local_test.go (right):

https://codereview.appspot.com/10679045/diff/2005/environs/local/local_test.go#newcode29
environs/local/local_test.go:29: c.Assert(error, IsNil)
On 2013/06/28 06:05:02, wallyworld wrote:
> Please assert that the returned provider really is a local provider

Done.

https://codereview.appspot.com/10679045/

=== added directory 'environs/local'
=== added file 'environs/local/environ-provider.go'
--- environs/local/environ-provider.go	1970-01-01 00:00:00 +0000
+++ environs/local/environ-provider.go	2013-06-30 23:00:36 +0000
@@ -0,0 +1,65 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package local
+
+import (
+	"fmt"
+
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/instance"
+	"launchpad.net/loggo"
+)
+
+var logger = loggo.GetLogger("juju.environs.local")
+
+var _ environs.EnvironProvider = (*environProvider)(nil)
+
+type environProvider struct{}
+
+var provider environProvider
+
+func init() {
+	environs.RegisterProvider("local", &environProvider{})
+}
+
+// Open implements environs.EnvironProvider.Open.
+func (environProvider) Open(cfg *config.Config) (environs.Environ, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+// Validate implements environs.EnvironProvider.Validate.
+func (environProvider) Validate(cfg, old *config.Config) (valid *config.Config, err error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+// BoilerplateConfig implements environs.EnvironProvider.BoilerplateConfig.
+func (environProvider) BoilerplateConfig() string {
+	return "not implemented"
+}
+
+// SecretAttrs implements environs.EnvironProvider.SecretAttrs.
+func (environProvider) SecretAttrs(cfg *config.Config) (map[string]interface{}, error) {
+	// don't have any secret attrs
+	return nil, nil
+}
+
+// Location specific methods that are able to be called by any instance that
+// has been created by this provider type.  So a machine agent may well call
+// these methods to find out its own address or instance id.
+
+// PublicAddress implements environs.EnvironProvider.PublicAddress.
+func (environProvider) PublicAddress() (string, error) {
+	return "", fmt.Errorf("not implemented")
+}
+
+// PrivateAddress implements environs.EnvironProvider.PrivateAddress.
+func (environProvider) PrivateAddress() (string, error) {
+	return "", fmt.Errorf("not implemented")
+}
+
+// InstanceId implements environs.EnvironProvider.InstanceId.
+func (environProvider) InstanceId() (instance.Id, error) {
+	return "", fmt.Errorf("not implemented")
+}
 
=== added file 'environs/local/environ.go'
--- environs/local/environ.go	1970-01-01 00:00:00 +0000
+++ environs/local/environ.go	2013-06-30 23:00:36 +0000
@@ -0,0 +1,107 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package local
+
+import (
+	"fmt"
+
+	"launchpad.net/juju-core/constraints"
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
+	"launchpad.net/juju-core/instance"
+	"launchpad.net/juju-core/state"
+	"launchpad.net/juju-core/state/api"
+)
+
+// localEnviron implements Environ.
+var _ environs.Environ = (*localEnviron)(nil)
+
+type localEnviron struct {
+	name string
+}
+
+// Name is specified in the Environ interface.
+func (env *localEnviron) Name() string {
+	return env.name
+}
+
+// Bootstrap is specified in the Environ interface.
+func (env *localEnviron) Bootstrap(cons constraints.Value) error {
+	return fmt.Errorf("not implemented")
+}
+
+// StateInfo is specified in the Environ interface.
+func (env *localEnviron) StateInfo() (*state.Info, *api.Info, error) {
+	return nil, nil, fmt.Errorf("not implemented")
+}
+
+// Config is specified in the Environ interface.
+func (env *localEnviron) Config() *config.Config {
+	panic("unimplemented")
+}
+
+// SetConfig is specified in the Environ interface.
+func (env *localEnviron) SetConfig(cfg *config.Config) error {
+	return fmt.Errorf("not implemented")
+}
+
+// StartInstance is specified in the Environ interface.
+func (env *localEnviron) StartInstance(
+	machineId, machineNonce, series string,
+	cons constraints.Value,
+	info *state.Info,
+	apiInfo *api.Info,
+) (instance.Instance, *instance.HardwareCharacteristics, error) {
+	return nil, nil, fmt.Errorf("not implemented")
+}
+
+// StopInstances is specified in the Environ interface.
+func (env *localEnviron) StopInstances([]instance.Instance) error {
+	return fmt.Errorf("not implemented")
+}
+
+// Instances is specified in the Environ interface.
+func (env *localEnviron) Instances(ids []instance.Id) ([]instance.Instance, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+// AllInstances is specified in the Environ interface.
+func (env *localEnviron) AllInstances() ([]instance.Instance, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+// Storage is specified in the Environ interface.
+func (env *localEnviron) Storage() environs.Storage {
+	panic("unimplemented")
+}
+
+// PublicStorage is specified in the Environ interface.
+func (env *localEnviron) PublicStorage() environs.StorageReader {
+	panic("unimplemented")
+}
+
+// Destroy is specified in the Environ interface.
+func (env *localEnviron) Destroy(insts []instance.Instance) error {
+	return fmt.Errorf("not implemented")
+}
+
+// OpenPorts is specified in the Environ interface.
+func (env *localEnviron) OpenPorts(ports []instance.Port) error {
+	return fmt.Errorf("not implemented")
+}
+
+// ClosePorts is specified in the Environ interface.
+func (env *localEnviron) ClosePorts(ports []instance.Port) error {
+	return fmt.Errorf("not implemented")
+}
+
+// Ports is specified in the Environ interface.
+func (env *localEnviron) Ports() ([]instance.Port, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+// Provider is specified in the Environ interface.
+func (env *localEnviron) Provider() environs.EnvironProvider {
+	return &provider
+}
 
=== added file 'environs/local/export_test.go'
--- environs/local/export_test.go	1970-01-01 00:00:00 +0000
+++ environs/local/export_test.go	2013-06-30 23:00:36 +0000
@@ -0,0 +1,6 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package local
+
+var Provider = provider
 
=== added file 'environs/local/local_test.go'
--- environs/local/local_test.go	1970-01-01 00:00:00 +0000
+++ environs/local/local_test.go	2013-06-30 23:00:36 +0000
@@ -0,0 +1,29 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package local_test
+
+import (
+	stdtesting "testing"
+
+	. "launchpad.net/gocheck"
+	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/local"
+	"launchpad.net/juju-core/testing"
+)
+
+func TestLocal(t *stdtesting.T) {
+	TestingT(t)
+}
+
+type localSuite struct {
+	testing.LoggingSuite
+}
+
+var _ = Suite(&localSuite{})
+
+func (*localSuite) TestProviderRegistered(c *C) {
+	provider, error := environs.Provider("local")
+	c.Assert(error, IsNil)
+	c.Assert(provider, DeepEquals, &local.Provider)
+}