Merge lp:~ack/juju-core/uuid-in-environment-info into lp:~go-bot/juju-core/trunk

[Alberto Donato]

Add the environment UUID to the EnvironmentInfo API call response.

Add the environment UUID to the EnvironmentInfo API call response.

[William Reade (fwereade)]

LGTM, thanks.

review: Approve

[Dimiter Naydenov (dimitern)]

LGTM, nice

review: Approve

[Go Bot (go-bot)]

The attempt to merge lp:~ack/juju-core/uuid-in-environment-info into lp:juju-core failed. Below is the output from the failed tests.

state/apiserver/client/client.go
ok launchpad.net/juju-core/bzr 7.356s
ok launchpad.net/juju-core/cert 4.400s
ok launchpad.net/juju-core/charm 0.569s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.009s
ok launchpad.net/juju-core/cmd 0.252s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 111.377s
ok launchpad.net/juju-core/cmd/jujud 42.190s
ok launchpad.net/juju-core/constraints 0.013s
ok launchpad.net/juju-core/container/lxc 0.296s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.389s
ok launchpad.net/juju-core/environs 1.814s
ok launchpad.net/juju-core/environs/agent 2.518s
? launchpad.net/juju-core/environs/all [no test files]
ok launchpad.net/juju-core/environs/azure 2.256s
ok launchpad.net/juju-core/environs/cloudinit 0.579s
ok launchpad.net/juju-core/environs/config 1.008s
ok launchpad.net/juju-core/environs/dummy 15.409s
ok launchpad.net/juju-core/environs/ec2 91.226s
ok launchpad.net/juju-core/environs/imagemetadata 0.309s
ok launchpad.net/juju-core/environs/instances 0.236s
ok launchpad.net/juju-core/environs/jujutest 0.278s
ok launchpad.net/juju-core/environs/local 0.401s
ok launchpad.net/juju-core/environs/localstorage 0.272s
ok launchpad.net/juju-core/environs/maas 8.655s
ok launchpad.net/juju-core/environs/openstack 8.772s
? launchpad.net/juju-core/environs/testing [no test files]
ok launchpad.net/juju-core/environs/tools 19.593s
? launchpad.net/juju-core/errors [no test files]
ok launchpad.net/juju-core/instance 0.007s
ok launchpad.net/juju-core/juju 12.487s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.008s
ok launchpad.net/juju-core/log/syslog 0.010s
ok launchpad.net/juju-core/rpc 0.294s
ok launchpad.net/juju-core/rpc/jsoncodec 0.297s
ok launchpad.net/juju-core/schema 0.011s

----------------------------------------------------------------------
FAIL: machine_test.go:571: MachineSuite.TestWatchMachine

[LOG] 2.58661 INFO juju state: opening state; mongo addresses: ["localhost:36087"]; entity ""
[LOG] 2.58940 INFO juju state: connection established
[LOG] 2.62867 INFO juju state: initializing environment
machine_test.go:607:
    testing.NewNotifyWatcherC(c, s.State, w).AssertOneChange()
testing/watcher.go:65:
    c.Fatalf("watcher sent unexpected change: (_, %v)", ok)
... Error: watcher sent unexpected change: (_, true)

OOPS: 292 passed, 1 FAILED
--- FAIL: TestPackage (62.00 seconds)
FAIL
FAIL launchpad.net/juju-core/state 62.249s
? launchpad.net/juju-core/state/api [no test files]
? launchpad.net/juju-core/state/api/common [no test files]
ok launchpad.net/juju-core/state/api/machineagent 1.777s
ok launchpad.net/juju-core/state/api/machiner 2.027s
ok launchpad.net/juju-core/state/api/params 0.022s
ok launchpa...

=== modified file 'state/api/client.go'
--- state/api/client.go	2013-06-12 18:53:10 +0000
+++ state/api/client.go	2013-07-08 12:34:47 +0000
@@ -185,6 +185,7 @@
 	DefaultSeries string
 	ProviderType  string
 	Name          string
+	UUID          string
 }
 
 // EnvironmentInfo returns details about the Juju environment.

=== modified file 'state/apiserver/client/client.go'
--- state/apiserver/client/client.go	2013-06-28 12:26:09 +0000
+++ state/apiserver/client/client.go	2013-07-08 12:34:47 +0000
@@ -274,14 +274,21 @@
 // EnvironmentInfo returns information about the current environment (default
 // series and type).
 func (c *Client) EnvironmentInfo() (api.EnvironmentInfo, error) {
-	conf, err := c.api.state.EnvironConfig()
-	if err != nil {
-		return api.EnvironmentInfo{}, err
-	}
+	state := c.api.state
+	conf, err := state.EnvironConfig()
+	if err != nil {
+		return api.EnvironmentInfo{}, err
+	}
+	env, err := state.Environment()
+	if err != nil {
+		return api.EnvironmentInfo{}, err
+	}
+	
 	info := api.EnvironmentInfo{
 		DefaultSeries: conf.DefaultSeries(),
 		ProviderType:  conf.Type(),
 		Name:          conf.Name(),
+		UUID:          env.UUID(),
 	}
 	return info, nil
 }

=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2013-06-28 12:26:09 +0000
+++ state/apiserver/client/client_test.go	2013-07-08 12:34:47 +0000
@@ -135,9 +135,12 @@
 	conf, _ := s.State.EnvironConfig()
 	info, err := s.APIState.Client().EnvironmentInfo()
 	c.Assert(err, IsNil)
+	env, err := s.State.Environment()
+	c.Assert(err, IsNil)
 	c.Assert(info.DefaultSeries, Equals, conf.DefaultSeries())
 	c.Assert(info.ProviderType, Equals, conf.Type())
 	c.Assert(info.Name, Equals, conf.Name())
+	c.Assert(info.UUID, Equals, env.UUID())
 }
 
 var clientAnnotationsTests = []struct {