Merge master

sdg0919 · Jan 29, 2016 · c6487b9 · c6487b9
2 parents 5be5e2c + 1cb8f03
commit c6487b9
Show file tree

Hide file tree

Showing 334 changed files with 12,330 additions and 5,023 deletions.
diff --git a/api/addresser/addresser.go b/api/addresser/addresser.go
@@ -8,8 +8,9 @@ import (
 	"github.com/juju/loggo"
 
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 var logger = loggo.GetLogger("juju.api.addresser")
@@ -58,20 +59,20 @@ func (api *API) CleanupIPAddresses() error {
 	return errors.Trace(result.Error)
 }
 
-var newEntityWatcher = watcher.NewEntityWatcher
+var newEntitiesWatcher = apiwatcher.NewEntitiesWatcher
 
-// WatchIPAddresses returns a EntityWatcher for observing the
+// WatchIPAddresses returns a EntitiesWatcher for observing the
 // tags of IP addresses with changes in life cycle.
 // The initial event will contain the tags of any IP addresses
 // which are no longer Alive.
-func (api *API) WatchIPAddresses() (watcher.EntityWatcher, error) {
-	var result params.EntityWatchResult
+func (api *API) WatchIPAddresses() (watcher.EntitiesWatcher, error) {
+	var result params.EntitiesWatchResult
 	err := api.facade.FacadeCall("WatchIPAddresses", nil, &result)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
 	if result.Error == nil {
-		w := newEntityWatcher(api.facade.RawAPICaller(), result)
+		w := newEntitiesWatcher(api.facade.RawAPICaller(), result)
 		return w, nil
 	}
 	return nil, errors.Trace(result.Error)

diff --git a/api/addresser/addresser_test.go b/api/addresser/addresser_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/juju/juju/api/addresser"
 	"github.com/juju/juju/api/base"
 	apitesting "github.com/juju/juju/api/base/testing"
-	"github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	apiservertesting "github.com/juju/juju/apiserver/testing"
 	coretesting "github.com/juju/juju/testing"
+	"github.com/juju/juju/watcher"
 )
 
 type AddresserSuite struct {
@@ -97,20 +97,20 @@ func (s *AddresserSuite) TestCleanupIPAddressesServerError(c *gc.C) {
 func (s *AddresserSuite) TestWatchIPAddressesSuccess(c *gc.C) {
 	var numFacadeCalls int
 	var numWatcherCalls int
-	expectedResult := params.EntityWatchResult{
-		EntityWatcherId: "42",
+	expectedResult := params.EntitiesWatchResult{
+		EntitiesWatcherId: "42",
 		Changes: []string{
 			"ipaddress-11111111-0000-0000-0000-000000000000",
 			"ipaddress-22222222-0000-0000-0000-000000000000",
 		},
 	}
-	watcherFunc := func(caller base.APICaller, result params.EntityWatchResult) watcher.EntityWatcher {
+	watcherFunc := func(caller base.APICaller, result params.EntitiesWatchResult) watcher.EntitiesWatcher {
 		numWatcherCalls++
 		c.Check(caller, gc.NotNil)
 		c.Check(result, jc.DeepEquals, expectedResult)
 		return nil
 	}
-	s.PatchValue(addresser.NewEntityWatcher, watcherFunc)
+	s.PatchValue(addresser.NewEntitiesWatcher, watcherFunc)
 
 	apiCaller := successAPICaller(c, "WatchIPAddresses", nil, expectedResult, &numFacadeCalls)
 	api := addresser.NewAPI(apiCaller)
@@ -136,7 +136,7 @@ func (s *AddresserSuite) TestWatchIPAddressesClientError(c *gc.C) {
 
 func (s *AddresserSuite) TestWatchIPAddressesServerError(c *gc.C) {
 	var called int
-	expectedResult := params.EntityWatchResult{
+	expectedResult := params.EntitiesWatchResult{
 		Error: apiservertesting.ServerError("server boom!"),
 	}
 	apiCaller := successAPICaller(c, "WatchIPAddresses", nil, expectedResult, &called)

diff --git a/api/addresser/export_test.go b/api/addresser/export_test.go
@@ -3,4 +3,4 @@
 
 package addresser
 
-var NewEntityWatcher = &newEntityWatcher
+var NewEntitiesWatcher = &newEntitiesWatcher
diff --git a/api/base/testing/apicaller.go b/api/base/testing/apicaller.go
@@ -14,6 +14,7 @@ import (
 	gc "gopkg.in/check.v1"
 
 	"github.com/juju/juju/api/base"
+	coretesting "github.com/juju/juju/testing"
 )
 
 // APICallerFunc is a function type that implements APICaller.
@@ -30,7 +31,7 @@ func (APICallerFunc) BestFacadeVersion(facade string) int {
 }
 
 func (APICallerFunc) EnvironTag() (names.EnvironTag, error) {
-	return names.NewEnvironTag(""), nil
+	return coretesting.EnvironmentTag, nil
 }
 
 func (APICallerFunc) Close() error {

diff --git a/api/cleaner/cleaner.go b/api/cleaner/cleaner.go
@@ -5,8 +5,9 @@ package cleaner
 
 import (
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 const cleanerFacade = "Cleaner"
@@ -37,6 +38,6 @@ func (api *API) WatchCleanups() (watcher.NotifyWatcher, error) {
 	if err := result.Error; err != nil {
 		return nil, result.Error
 	}
-	w := watcher.NewNotifyWatcher(api.facade.RawAPICaller(), result)
+	w := apiwatcher.NewNotifyWatcher(api.facade.RawAPICaller(), result)
 	return w, nil
 }
diff --git a/api/common/apiaddresser.go b/api/common/apiaddresser.go
@@ -5,9 +5,10 @@ package common
 
 import (
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/network"
+	"github.com/juju/juju/watcher"
 )
 
 // APIAddresser provides common client-side API
@@ -76,5 +77,5 @@ func (a *APIAddresser) WatchAPIHostPorts() (watcher.NotifyWatcher, error) {
 	if err != nil {
 		return nil, err
 	}
-	return watcher.NewNotifyWatcher(a.facade.RawAPICaller(), result), nil
+	return apiwatcher.NewNotifyWatcher(a.facade.RawAPICaller(), result), nil
 }
diff --git a/api/common/environwatcher.go b/api/common/environwatcher.go
@@ -5,9 +5,10 @@ package common
 
 import (
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/environs/config"
+	"github.com/juju/juju/watcher"
 )
 
 // EnvironWatcher provides common client-side API functions
@@ -30,7 +31,7 @@ func (e *EnvironWatcher) WatchForEnvironConfigChanges() (watcher.NotifyWatcher,
 	if err != nil {
 		return nil, err
 	}
-	return watcher.NewNotifyWatcher(e.facade.RawAPICaller(), result), nil
+	return apiwatcher.NewNotifyWatcher(e.facade.RawAPICaller(), result), nil
 }
 
 // EnvironConfig returns the current environment configuration.

diff --git a/api/common/watch.go b/api/common/watch.go
@@ -9,8 +9,9 @@ import (
 	"github.com/juju/names"
 
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 // Watch starts a NotifyWatcher for the entity with the specified tag.
@@ -30,5 +31,5 @@ func Watch(facade base.FacadeCaller, tag names.Tag) (watcher.NotifyWatcher, erro
 	if result.Error != nil {
 		return nil, result.Error
 	}
-	return watcher.NewNotifyWatcher(facade.RawAPICaller(), result), nil
+	return apiwatcher.NewNotifyWatcher(facade.RawAPICaller(), result), nil
 }
diff --git a/api/deployer/deployer_test.go b/api/deployer/deployer_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/network"
 	"github.com/juju/juju/state"
-	statetesting "github.com/juju/juju/state/testing"
 	coretesting "github.com/juju/juju/testing"
+	"github.com/juju/juju/watcher/watchertest"
 )
 
 func TestAll(t *stdtesting.T) {
@@ -104,8 +104,8 @@ func (s *deployerSuite) TestWatchUnits(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	w, err := machine.WatchUnits()
 	c.Assert(err, jc.ErrorIsNil)
-	defer statetesting.AssertStop(c, w)
-	wc := statetesting.NewStringsWatcherC(c, s.BackingState, w)
+	wc := watchertest.NewStringsWatcherC(c, w, s.BackingState.StartSync)
+	defer wc.AssertStops()
 
 	// Initial event.
 	wc.AssertChange("mysql/0", "logging/0")
@@ -126,9 +126,6 @@ func (s *deployerSuite) TestWatchUnits(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	wc.AssertChange("logging/0")
 	wc.AssertNoChange()
-
-	statetesting.AssertStop(c, w)
-	wc.AssertClosed()
 }
 
 func (s *deployerSuite) TestUnit(c *gc.C) {

diff --git a/api/deployer/machine.go b/api/deployer/machine.go
@@ -8,8 +8,9 @@ import (
 
 	"github.com/juju/names"
 
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 // Machine represents a juju machine as seen by the deployer worker.
@@ -37,6 +38,6 @@ func (m *Machine) WatchUnits() (watcher.StringsWatcher, error) {
 	if result.Error != nil {
 		return nil, result.Error
 	}
-	w := watcher.NewStringsWatcher(m.st.facade.RawAPICaller(), result)
+	w := apiwatcher.NewStringsWatcher(m.st.facade.RawAPICaller(), result)
 	return w, nil
 }
diff --git a/api/firewaller/firewaller.go b/api/firewaller/firewaller.go
@@ -9,8 +9,9 @@ import (
 
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/api/common"
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 const firewallerFacade = "Firewaller"
@@ -85,7 +86,7 @@ func (st *State) WatchEnvironMachines() (watcher.StringsWatcher, error) {
 	if err := result.Error; err != nil {
 		return nil, result.Error
 	}
-	w := watcher.NewStringsWatcher(st.facade.RawAPICaller(), result)
+	w := apiwatcher.NewStringsWatcher(st.facade.RawAPICaller(), result)
 	return w, nil
 }
 
@@ -111,6 +112,6 @@ func (st *State) WatchOpenedPorts() (watcher.StringsWatcher, error) {
 	if err := result.Error; err != nil {
 		return nil, result.Error
 	}
-	w := watcher.NewStringsWatcher(st.facade.RawAPICaller(), result)
+	w := apiwatcher.NewStringsWatcher(st.facade.RawAPICaller(), result)
 	return w, nil
 }
diff --git a/api/firewaller/machine.go b/api/firewaller/machine.go
@@ -7,10 +7,11 @@ import (
 
 	"github.com/juju/names"
 
-	"github.com/juju/juju/api/watcher"
+	apiwatcher "github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/instance"
 	"github.com/juju/juju/network"
+	"github.com/juju/juju/watcher"
 )
 
 // Machine represents a juju machine as seen by the firewaller worker.
@@ -43,7 +44,7 @@ func (m *Machine) WatchUnits() (watcher.StringsWatcher, error) {
 	if result.Error != nil {
 		return nil, result.Error
 	}
-	w := watcher.NewStringsWatcher(m.st.facade.RawAPICaller(), result)
+	w := apiwatcher.NewStringsWatcher(m.st.facade.RawAPICaller(), result)
 	return w, nil
 }
 

diff --git a/api/firewaller/machine_test.go b/api/firewaller/machine_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/juju/juju/instance"
 	"github.com/juju/juju/network"
 	"github.com/juju/juju/state"
-	statetesting "github.com/juju/juju/state/testing"
+	"github.com/juju/juju/watcher/watchertest"
 )
 
 type machineSuite struct {
@@ -70,8 +70,8 @@ func (s *machineSuite) TestInstanceId(c *gc.C) {
 func (s *machineSuite) TestWatchUnits(c *gc.C) {
 	w, err := s.apiMachine.WatchUnits()
 	c.Assert(err, jc.ErrorIsNil)
-	defer statetesting.AssertStop(c, w)
-	wc := statetesting.NewStringsWatcherC(c, s.BackingState, w)
+	wc := watchertest.NewStringsWatcherC(c, w, s.BackingState.StartSync)
+	defer wc.AssertStops()
 
 	// Initial event.
 	wc.AssertChange("wordpress/0")
@@ -92,9 +92,6 @@ func (s *machineSuite) TestWatchUnits(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	wc.AssertChange("wordpress/0")
 	wc.AssertNoChange()
-
-	statetesting.AssertStop(c, w)
-	wc.AssertClosed()
 }
 
 func (s *machineSuite) TestActiveNetworks(c *gc.C) {

diff --git a/api/firewaller/service.go b/api/firewaller/service.go
@@ -9,8 +9,8 @@ import (
 	"github.com/juju/names"
 
 	"github.com/juju/juju/api/common"
-	"github.com/juju/juju/api/watcher"
 	"github.com/juju/juju/apiserver/params"
+	"github.com/juju/juju/watcher"
 )
 
 // Service represents the state of a service.

diff --git a/api/firewaller/service_test.go b/api/firewaller/service_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/juju/juju/api/firewaller"
 	"github.com/juju/juju/apiserver/params"
-	statetesting "github.com/juju/juju/state/testing"
+	"github.com/juju/juju/watcher/watchertest"
 )
 
 type serviceSuite struct {
@@ -47,8 +47,8 @@ func (s *serviceSuite) TestWatch(c *gc.C) {
 
 	w, err := s.apiService.Watch()
 	c.Assert(err, jc.ErrorIsNil)
-	defer statetesting.AssertStop(c, w)
-	wc := statetesting.NewNotifyWatcherC(c, s.BackingState, w)
+	wc := watchertest.NewNotifyWatcherC(c, w, s.BackingState.StartSync)
+	defer wc.AssertStops()
 
 	// Initial event.
 	wc.AssertOneChange()
@@ -62,9 +62,6 @@ func (s *serviceSuite) TestWatch(c *gc.C) {
 	err = s.service.Destroy()
 	c.Assert(err, jc.ErrorIsNil)
 	wc.AssertOneChange()
-
-	statetesting.AssertStop(c, w)
-	wc.AssertClosed()
 }
 
 func (s *serviceSuite) TestRefresh(c *gc.C) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		package addresser

		var NewEntityWatcher = &newEntityWatcher
		var NewEntitiesWatcher = &newEntitiesWatcher