juju-core

Merge lp:~gz/juju-core/addservice_using_networks into lp:~go-bot/juju-core/trunk

addservice_using_networks
Merge into trunk

Proposed by Martin Packman on 2014-03-25

Status:	Merged
Approved by:	Martin Packman on 2014-03-25
Approved revision:	no longer in the source branch.
Merged at revision:	2477
Proposed branch:	lp:~gz/juju-core/addservice_using_networks
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	331 lines (+54/-31) 13 files modified cmd/juju/status_test.go (+1/-1) environs/jujutest/livetests.go (+1/-1) juju/conn_test.go (+1/-1) juju/deploy.go (+2/-1) juju/testing/conn.go (+5/-1) state/apiserver/charmrevisionupdater/testing/suite.go (+5/-5) state/apiserver/client/run_test.go (+4/-4) state/compat_test.go (+1/-1) state/conn_test.go (+4/-0) state/export_test.go (+5/-1) state/service_test.go (+10/-0) state/state.go (+2/-2) state/state_test.go (+13/-13)
To merge this branch:	bzr merge lp:~gz/juju-core/addservice_using_networks
Related bugs:	Link a bug report
Related blueprints:	Support MaaS VLANs in Juju (Essential)

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-25	Pending
Review via email: mp+212635@code.launchpad.net

Commit message

Add networks params to AddService

Append includeNetworks and excludeNetworks to AddService
function parameters, and updates callers appropriately.
New AddTestingServiceWithNetworks created in a couple of
places and used for basic test.

https://codereview.appspot.com/79800043/

R=dimitern

Description of the change

Add networks params to AddService

https://codereview.appspot.com/79800043/

Revision history for this message

Martin Packman (gz) wrote on 2014-03-25:

Download full text (15.6 KiB)

Reviewers: mp+212635_code.launchpad.net,

Message:
Please take a look.

Description:
Add networks params to AddService

https://code.launchpad.net/~gz/juju-core/addservice_using_networks/+merge/212635

(do not edit description out of merge proposal)

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

Affected files (+59, -34 lines):
   A [revision details]
   M cmd/juju/status_test.go
   M environs/jujutest/livetests.go
   M juju/conn_test.go
   M juju/deploy.go
   M juju/testing/conn.go
   M state/apiserver/charmrevisionupdater/testing/suite.go
   M state/apiserver/client/run_test.go
   M state/conn_test.go
   M state/export_test.go
   M state/service_test.go
   M state/state.go
   M state/state_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140324132340-bdfed5wwtmq8ws97
+New revision: <email address hidden>

Index: juju/conn_test.go
=== modified file 'juju/conn_test.go'
--- juju/conn_test.go 2014-03-17 22:42:51 +0000
+++ juju/conn_test.go 2014-03-25 14:51:19 +0000
@@ -400,7 +400,7 @@
   curl := coretesting.Charms.ClonedURL(s.repo.Path, "quantal", "riak")
   sch, err := s.conn.PutCharm(curl, s.repo, false)
   c.Assert(err, gc.IsNil)
- svc, err := s.conn.State.AddService("testriak", "user-admin", sch)
+ svc, err := s.conn.State.AddService("testriak", "user-admin", sch,
[]string{}, []string{})
   c.Assert(err, gc.IsNil)
   units, err := juju.AddUnits(s.conn.State, svc, 2, "")
   c.Assert(err, gc.IsNil)

Index: juju/deploy.go
=== modified file 'juju/deploy.go'
--- juju/deploy.go 2013-12-19 21:17:26 +0000
+++ juju/deploy.go 2014-03-25 14:51:19 +0000
@@ -49,7 +49,8 @@
   }
   // TODO(fwereade): transactional State.AddService including settings,
constraints
   // (minimumUnitCount, initialMachineIds?).
- service, err := st.AddService(args.ServiceName, "user-admin", args.Charm)
+ // TODO(gz): pass through real includeNetworks and excludeNetworks vals
+ service, err := st.AddService(args.ServiceName, "user-admin", args.Charm,
[]string{}, []string{})
   if err != nil {
    return nil, err
   }

Reviewers: mp+212635_code.launchpad.net,

Message:
Please take a look.

Description:
Add networks params to AddService

https://code.launchpad.net/~gz/juju-core/addservice_using_networks/+merge/212635

(do not edit description out of merge proposal)

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

Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140324132340-bdfed5wwtmq8ws97
+New revision: martin.packman@canonical.com-20140325145119-e7vbnmubrjwxs319

Index: juju/conn_test.go
=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2014-03-17 22:42:51 +0000
+++ juju/conn_test.go	2014-03-25 14:51:19 +0000
@@ -400,7 +400,7 @@
  	curl := coretesting.Charms.ClonedURL(s.repo.Path, "quantal", "riak")
  	sch, err := s.conn.PutCharm(curl, s.repo, false)
  	c.Assert(err, gc.IsNil)
-	svc, err := s.conn.State.AddService("testriak", "user-admin", sch)
+	svc, err := s.conn.State.AddService("testriak", "user-admin", sch,  
[]string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	units, err := juju.AddUnits(s.conn.State, svc, 2, "")
  	c.Assert(err, gc.IsNil)

Index: juju/deploy.go
=== modified file 'juju/deploy.go'
--- juju/deploy.go	2013-12-19 21:17:26 +0000
+++ juju/deploy.go	2014-03-25 14:51:19 +0000
@@ -49,7 +49,8 @@
  	}
  	// TODO(fwereade): transactional State.AddService including settings,  
constraints
  	// (minimumUnitCount, initialMachineIds?).
-	service, err := st.AddService(args.ServiceName, "user-admin", args.Charm)
+	// TODO(gz): pass through real includeNetworks and excludeNetworks vals
+	service, err := st.AddService(args.ServiceName, "user-admin", args.Charm,  
[]string{}, []string{})
  	if err != nil {
  		return nil, err
  	}

Index: state/service_test.go
=== modified file 'state/service_test.go'
--- state/service_test.go	2014-03-18 15:51:17 +0000
+++ state/service_test.go	2014-03-25 14:51:19 +0000
@@ -1433,8 +1433,18 @@
  func (s *ServiceSuite) TestNetworks(c *gc.C) {
  	service, err := s.State.Service(s.mysql.Name())
  	c.Assert(err, gc.IsNil)
-	includedNetworks, excludedNetworks, err := service.Networks()
-	c.Assert(err, gc.IsNil)
-	c.Check(includedNetworks, gc.DeepEquals, []string{})
-	c.Check(excludedNetworks, gc.DeepEquals, []string{})
+	includeNetworks, excludeNetworks, err := service.Networks()
+	c.Assert(err, gc.IsNil)
+	c.Check(includeNetworks, gc.DeepEquals, []string{})
+	c.Check(excludeNetworks, gc.DeepEquals, []string{})
+}
+
+func (s *ServiceSuite) TestNetworksOnService(c *gc.C) {
+	includeNetworks := []string{"yes", "on"}
+	excludeNetworks := []string{"no", "off"}
+	service := s.AddTestingServiceWithNetworks(c, "withnets", s.charm,  
includeNetworks, excludeNetworks)
+	haveIncludeNetworks, haveExcludeNetworks, err := service.Networks()
+	c.Assert(err, gc.IsNil)
+	c.Check(haveIncludeNetworks, gc.DeepEquals, includeNetworks)
+	c.Check(haveExcludeNetworks, gc.DeepEquals, excludeNetworks)
  }

Index: cmd/juju/status_test.go
=== modified file 'cmd/juju/status_test.go'
--- cmd/juju/status_test.go	2014-01-24 14:52:58 +0000
+++ cmd/juju/status_test.go	2014-03-25 14:51:19 +0000
@@ -1626,7 +1626,7 @@
  func (as addService) step(c *gc.C, ctx *context) {
  	ch, ok := ctx.charms[as.charm]
  	c.Assert(ok, gc.Equals, true)
-	_, err := ctx.st.AddService(as.name, "user-admin", ch)
+	_, err := ctx.st.AddService(as.name, "user-admin", ch, []string{},  
[]string{})
  	c.Assert(err, gc.IsNil)
  }

Index: environs/jujutest/livetests.go
=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2014-03-14 02:19:35 +0000
+++ environs/jujutest/livetests.go	2014-03-25 14:51:19 +0000
@@ -452,7 +452,7 @@
  	url := coretesting.Charms.ClonedURL(repoDir,  
mtools0.Version.Series, "dummy")
  	sch, err := conn.PutCharm(url, &charm.LocalRepository{repoDir}, false)
  	c.Assert(err, gc.IsNil)
-	svc, err := conn.State.AddService("dummy", "user-admin", sch)
+	svc, err := conn.State.AddService("dummy", "user-admin", sch, []string{},  
[]string{})
  	c.Assert(err, gc.IsNil)
  	units, err := juju.AddUnits(conn.State, svc, 1, "")
  	c.Assert(err, gc.IsNil)

Index: juju/testing/conn.go
=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go	2014-03-07 22:45:37 +0000
+++ juju/testing/conn.go	2014-03-25 14:51:19 +0000
@@ -293,8 +293,12 @@
  }

func (s *JujuConnSuite) AddTestingService(c *gc.C, name string, ch  
*state.Charm) *state.Service {
+	return s.AddTestingServiceWithNetworks(c, name, ch, []string{},  
[]string{})
+}
+
+func (s *JujuConnSuite) AddTestingServiceWithNetworks(c *gc.C, name  
string, ch *state.Charm, includeNetworks, excludeNetworks []string)  
*state.Service {
  	c.Assert(s.State, gc.NotNil)
-	service, err := s.State.AddService(name, "user-admin", ch)
+	service, err := s.State.AddService(name, "user-admin", ch,  
includeNetworks, excludeNetworks)
  	c.Assert(err, gc.IsNil)
  	return service
  }

Index: state/apiserver/charmrevisionupdater/testing/suite.go
=== modified file 'state/apiserver/charmrevisionupdater/testing/suite.go'
--- state/apiserver/charmrevisionupdater/testing/suite.go	2014-01-17  
00:06:37 +0000
+++ state/apiserver/charmrevisionupdater/testing/suite.go	2014-03-25  
14:51:19 +0000
@@ -88,10 +88,10 @@
  }

// AddService adds a service for the specified charm to state.
-func (s *CharmSuite) AddService(c *gc.C, charmName, serviceName string) {
+func (s *CharmSuite) AddService(c *gc.C, charmName, serviceName string,  
includeNetworks, excludeNetworks []string) {
  	ch, ok := s.charms[charmName]
  	c.Assert(ok, gc.Equals, true)
-	_, err := s.State.AddService(serviceName, "user-admin", ch)
+	_, err := s.State.AddService(serviceName, "user-admin", ch,  
includeNetworks, excludeNetworks)
  	c.Assert(err, gc.IsNil)
  }

@@ -127,12 +127,12 @@

// mysql is out of date
  	s.AddCharmWithRevision(c, "mysql", 22)
-	s.AddService(c, "mysql", "mysql")
+	s.AddService(c, "mysql", "mysql", []string{}, []string{})
  	s.AddUnit(c, "mysql", "1")

// wordpress is up to date
  	s.AddCharmWithRevision(c, "wordpress", 26)
-	s.AddService(c, "wordpress", "wordpress")
+	s.AddService(c, "wordpress", "wordpress", []string{}, []string{})
  	s.AddUnit(c, "wordpress", "2")
  	s.AddUnit(c, "wordpress", "2")
  	// wordpress/0 has a version, wordpress/1 is unknown
@@ -140,6 +140,6 @@

// varnish is a charm that does not have a version in the mock store.
  	s.AddCharmWithRevision(c, "varnish", 5)
-	s.AddService(c, "varnish", "varnish")
+	s.AddService(c, "varnish", "varnish", []string{}, []string{})
  	s.AddUnit(c, "varnish", "3")
  }

Index: state/conn_test.go
=== modified file 'state/conn_test.go'
--- state/conn_test.go	2014-03-17 06:05:54 +0000
+++ state/conn_test.go	2014-03-25 14:51:19 +0000
@@ -79,6 +79,10 @@
  	return state.AddTestingService(c, s.State, name, ch)
  }

+func (s *ConnSuite) AddTestingServiceWithNetworks(c *gc.C, name string, ch  
*state.Charm, includeNetworks, excludeNetworks []string) *state.Service {
+	return state.AddTestingServiceWithNetworks(c, s.State, name, ch,  
includeNetworks, excludeNetworks)
+}
+
  func (s *ConnSuite) AddSeriesCharm(c *gc.C, name, series string)  
*state.Charm {
  	return state.AddCustomCharm(c, s.State, name, "", "", series, -1)
  }

Index: state/export_test.go
=== modified file 'state/export_test.go'
--- state/export_test.go	2014-03-19 23:07:33 +0000
+++ state/export_test.go	2014-03-25 14:51:19 +0000
@@ -142,7 +142,11 @@
  }

func AddTestingService(c *gc.C, st *State, name string, ch *Charm)  
*Service {
-	service, err := st.AddService(name, "user-admin", ch)
+	return AddTestingServiceWithNetworks(c, st, name, ch, []string{},  
[]string{})
+}
+
+func AddTestingServiceWithNetworks(c *gc.C, st *State, name string, ch  
*Charm, includeNetworks, excludeNetworks []string) *Service {
+	service, err := st.AddService(name, "user-admin", ch, includeNetworks,  
excludeNetworks)
  	c.Assert(err, gc.IsNil)
  	return service
  }

Index: state/apiserver/client/run_test.go
=== modified file 'state/apiserver/client/run_test.go'
--- state/apiserver/client/run_test.go	2014-03-13 07:54:56 +0000
+++ state/apiserver/client/run_test.go	2014-03-25 14:51:19 +0000
@@ -76,16 +76,16 @@

func (s *runSuite) TestGetAllUnitNames(c *gc.C) {
  	charm := s.AddTestingCharm(c, "dummy")
-	magic, err := s.State.AddService("magic", "user-admin", charm)
+	magic, err := s.State.AddService("magic", "user-admin", charm,  
[]string{}, []string{})
  	s.addUnit(c, magic)
  	s.addUnit(c, magic)

-	notAssigned, err := s.State.AddService("not-assigned", "user-admin",  
charm)
+	notAssigned, err := s.State.AddService("not-assigned", "user-admin",  
charm, []string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	_, err = notAssigned.AddUnit()
  	c.Assert(err, gc.IsNil)

-	_, err = s.State.AddService("no-units", "user-admin", charm)
+	_, err = s.State.AddService("no-units", "user-admin", charm, []string{},  
[]string{})
  	c.Assert(err, gc.IsNil)

for i, test := range []struct {
@@ -241,7 +241,7 @@
  	s.addMachineWithAddress(c, "10.3.2.1")

charm := s.AddTestingCharm(c, "dummy")
-	magic, err := s.State.AddService("magic", "user-admin", charm)
+	magic, err := s.State.AddService("magic", "user-admin", charm,  
[]string{}, []string{})
  	s.addUnit(c, magic)
  	s.addUnit(c, magic)

Index: state/state.go
=== modified file 'state/state.go'
--- state/state.go	2014-03-24 10:22:17 +0000
+++ state/state.go	2014-03-25 14:51:19 +0000
@@ -907,7 +907,7 @@
  // AddService creates a new service, running the supplied charm, with the
  // supplied name (which must be unique). If the charm defines peer  
relations,
  // they will be created automatically.
-func (st *State) AddService(name, ownerTag string, ch *Charm) (service  
*Service, err error) {
+func (st *State) AddService(name, ownerTag string, ch *Charm,  
includeNetworks, excludeNetworks []string) (service *Service, err error) {
  	defer utils.ErrorContextf(&err, "cannot add service %q", name)
  	kind, ownerId, err := names.ParseTag(ownerTag, names.UserTagKind)
  	if err != nil || kind != names.UserTagKind {
@@ -951,7 +951,7 @@
  	ops := []txn.Op{
  		env.assertAliveOp(),
  		createConstraintsOp(st, svc.globalKey(), constraints.Value{}),
-		createNetworksOp(st, svc.globalKey(), []string{}, []string{}),
+		createNetworksOp(st, svc.globalKey(), includeNetworks, excludeNetworks),
  		createSettingsOp(st, svc.settingsKey(), nil),
  		{
  			C:      st.users.Name,

Index: state/state_test.go
=== modified file 'state/state_test.go'
--- state/state_test.go	2014-03-20 01:23:05 +0000
+++ state/state_test.go	2014-03-25 14:51:19 +0000
@@ -964,19 +964,19 @@

func (s *StateSuite) TestAddService(c *gc.C) {
  	charm := s.AddTestingCharm(c, "dummy")
-	_, err := s.State.AddService("haha/borken", "user-admin", charm)
+	_, err := s.State.AddService("haha/borken", "user-admin", charm,  
[]string{}, []string{})
  	c.Assert(err, gc.ErrorMatches, `cannot add service "haha/borken": invalid  
name`)
  	_, err = s.State.Service("haha/borken")
  	c.Assert(err, gc.ErrorMatches, `"haha/borken" is not a valid service  
name`)

// set that a nil charm is handled correctly
-	_, err = s.State.AddService("umadbro", "user-admin", nil)
+	_, err = s.State.AddService("umadbro", "user-admin", nil, []string{},  
[]string{})
  	c.Assert(err, gc.ErrorMatches, `cannot add service "umadbro": charm is  
nil`)

-	wordpress, err := s.State.AddService("wordpress", "user-admin", charm)
+	wordpress, err := s.State.AddService("wordpress", "user-admin", charm,  
[]string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	c.Assert(wordpress.Name(), gc.Equals, "wordpress")
-	mysql, err := s.State.AddService("mysql", "user-admin", charm)
+	mysql, err := s.State.AddService("mysql", "user-admin", charm,  
[]string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	c.Assert(mysql.Name(), gc.Equals, "mysql")

@@ -1003,7 +1003,7 @@
  	c.Assert(err, gc.IsNil)
  	err = env.Destroy()
  	c.Assert(err, gc.IsNil)
-	_, err = s.State.AddService("s1", "user-admin", charm)
+	_, err = s.State.AddService("s1", "user-admin", charm, []string{},  
[]string{})
  	c.Assert(err, gc.ErrorMatches, `cannot add service "s1": environment is  
no longer alive`)
  }

@@ -1018,7 +1018,7 @@
  		c.Assert(env.Life(), gc.Equals, state.Alive)
  		c.Assert(env.Destroy(), gc.IsNil)
  	}).Check()
-	_, err = s.State.AddService("s1", "user-admin", charm)
+	_, err = s.State.AddService("s1", "user-admin", charm, []string{},  
[]string{})
  	c.Assert(err, gc.ErrorMatches, `cannot add service "s1": environment is  
no longer alive`)
  }

@@ -1030,19 +1030,19 @@

func (s *StateSuite) TestAddServiceNoTag(c *gc.C) {
  	charm := s.AddTestingCharm(c, "dummy")
-	_, err := s.State.AddService("wordpress", state.AdminUser, charm)
+	_, err := s.State.AddService("wordpress", state.AdminUser, charm,  
[]string{}, []string{})
  	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": Invalid  
ownertag admin")
  }

func (s *StateSuite) TestAddServiceNotUserTag(c *gc.C) {
  	charm := s.AddTestingCharm(c, "dummy")
-	_, err := s.State.AddService("wordpress", "machine-3", charm)
+	_, err := s.State.AddService("wordpress", "machine-3", charm, []string{},  
[]string{})
  	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": Invalid  
ownertag machine-3")
  }

func (s *StateSuite) TestAddServiceNonExistentUser(c *gc.C) {
  	charm := s.AddTestingCharm(c, "dummy")
-	_, err := s.State.AddService("wordpress", "user-notAuser", charm)
+	_, err := s.State.AddService("wordpress", "user-notAuser", charm,  
[]string{}, []string{})
  	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": user  
notAuser doesn't exist")
  }

@@ -1053,13 +1053,13 @@
  	c.Assert(len(services), gc.Equals, 0)

// Check that after adding services the result is ok.
-	_, err = s.State.AddService("wordpress", "user-admin", charm)
+	_, err = s.State.AddService("wordpress", "user-admin", charm, []string{},  
[]string{})
  	c.Assert(err, gc.IsNil)
  	services, err = s.State.AllServices()
  	c.Assert(err, gc.IsNil)
  	c.Assert(len(services), gc.Equals, 1)

-	_, err = s.State.AddService("mysql", "user-admin", charm)
+	_, err = s.State.AddService("mysql", "user-admin", charm, []string{},  
[]string{})
  	c.Assert(err, gc.IsNil)
  	services, err = s.State.AllServices()
  	c.Assert(err, gc.IsNil)
@@ -2524,7 +2524,7 @@
  	// Add a service and 4 units: one with a different version, one
  	// with an empty version, one with the current version, and one
  	// with the new version.
-	service, err := s.State.AddService("wordpress", "user-admin",  
s.AddTestingCharm(c, "wordpress"))
+	service, err := s.State.AddService("wordpress", "user-admin",  
s.AddTestingCharm(c, "wordpress"), []string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	unit0, err := service.AddUnit()
  	c.Assert(err, gc.IsNil)
@@ -2574,7 +2574,7 @@
  	// Add a machine and a unit with the current version.
  	machine, err := s.State.AddMachine("series", state.JobHostUnits)
  	c.Assert(err, gc.IsNil)
-	service, err := s.State.AddService("wordpress", "user-admin",  
s.AddTestingCharm(c, "wordpress"))
+	service, err := s.State.AddService("wordpress", "user-admin",  
s.AddTestingCharm(c, "wordpress"), []string{}, []string{})
  	c.Assert(err, gc.IsNil)
  	unit, err := service.AddUnit()
  	c.Assert(err, gc.IsNil)

Revision history for this message

Dimiter Naydenov (dimitern) wrote on 2014-03-25:

LGTM, with one improvement: when no networks are to be given to a
service, passing nil instead of []string{} is better (for both args).

https://codereview.appspot.com/79800043/diff/1/cmd/juju/status_test.go
File cmd/juju/status_test.go (right):

https://codereview.appspot.com/79800043/diff/1/cmd/juju/status_test.go#newcode1629
cmd/juju/status_test.go:1629: _, err := ctx.st.AddService(as.name,
"user-admin", ch, []string{}, []string{})
Just passing nil, nil should be enough.

https://codereview.appspot.com/79800043/diff/1/environs/jujutest/livetests.go
File environs/jujutest/livetests.go (right):

https://codereview.appspot.com/79800043/diff/1/environs/jujutest/livetests.go#newcode455
environs/jujutest/livetests.go:455: svc, err :=
conn.State.AddService("dummy", "user-admin", sch, []string{},
[]string{})
ditto (and all other places)

https://codereview.appspot.com/79800043/

Revision history for this message

Go Bot (go-bot) wrote on 2014-03-25:

Attempt to merge into lp:juju-core failed due to conflicts:

text conflict in state/service_test.go

Revision history for this message

Go Bot (go-bot) wrote on 2014-03-25:

Download full text (9.7 KiB)

The attempt to merge lp:~gz/juju-core/addservice_using_networks into lp:juju-core failed. Below is the output from the failed tests.

The attempt to merge lp:~gz/juju-core/addservice_using_networks into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core	0.011s
ok  	launchpad.net/juju-core/agent	1.080s
ok  	launchpad.net/juju-core/agent/mongo	0.522s
ok  	launchpad.net/juju-core/agent/tools	0.197s
ok  	launchpad.net/juju-core/bzr	5.169s
ok  	launchpad.net/juju-core/cert	3.212s
ok  	launchpad.net/juju-core/charm	0.457s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
?   	launchpad.net/juju-core/charm/testing	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.033s
ok  	launchpad.net/juju-core/cloudinit/sshinit	0.810s
ok  	launchpad.net/juju-core/cmd	0.189s
ok  	launchpad.net/juju-core/cmd/charm-admin	0.736s
?   	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	200.990s
ok  	launchpad.net/juju-core/cmd/jujud	65.036s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	8.467s
?   	launchpad.net/juju-core/cmd/plugins/juju-restore	[no test files]
ok  	launchpad.net/juju-core/cmd/plugins/local	0.164s
?   	launchpad.net/juju-core/cmd/plugins/local/juju-local	[no test files]
ok  	launchpad.net/juju-core/constraints	0.032s
ok  	launchpad.net/juju-core/container	0.051s
ok  	launchpad.net/juju-core/container/factory	0.057s
ok  	launchpad.net/juju-core/container/kvm	0.244s
ok  	launchpad.net/juju-core/container/kvm/mock	0.042s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	4.352s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
?   	launchpad.net/juju-core/container/lxc/testing	[no test files]
?   	launchpad.net/juju-core/container/testing	[no test files]
ok  	launchpad.net/juju-core/downloader	5.259s
ok  	launchpad.net/juju-core/environs	2.250s
ok  	launchpad.net/juju-core/environs/bootstrap	9.761s
ok  	launchpad.net/juju-core/environs/cloudinit	0.444s
ok  	launchpad.net/juju-core/environs/config	1.613s
ok  	launchpad.net/juju-core/environs/configstore	0.029s
ok  	launchpad.net/juju-core/environs/filestorage	0.026s
ok  	launchpad.net/juju-core/environs/httpstorage	0.677s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.453s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.044s
ok  	launchpad.net/juju-core/environs/jujutest	0.170s
ok  	launchpad.net/juju-core/environs/manual	11.124s
ok  	launchpad.net/juju-core/environs/simplestreams	0.242s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	0.982s
ok  	launchpad.net/juju-core/environs/storage	0.753s
ok  	launchpad.net/juju-core/environs/sync	43.043s
ok  	launchpad.net/juju-core/environs/testing	0.190s
ok  	launchpad.net/juju-core/environs/tools	4.476s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/errors	0.011s
ok  	launchpad.net/juju-core/instance	0.028s
?   	launchpad.net/juju-core/instance/testing	[no test files]
ok  	launchpad.net/juju-core/juju	18.669s
ok  	launchpad.net/juju-core/juju/arch	0.014s
ok  	launchpad.net/juju-core/juju/osenv	0.016s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.012s
ok  	launchpad.net/juju-core/log/syslog	0.038s
?   	launchpad.net/juju-core/log/syslog/testing	[no test files]
ok  	launchpad.net/juju-core/names	0.018s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	5.121s
ok  	launchpad.net/juju-core/provider/common	7.280s
ok  	launchpad.net/juju-core/provider/dummy	16.899s
ok  	launchpad.net/juju-core/provider/ec2	15.192s
ok  	launchpad.net/juju-core/provider/joyent	3.537s
ok  	launchpad.net/juju-core/provider/local	16.522s
ok  	launchpad.net/juju-core/provider/maas	13.284s
ok  	launchpad.net/juju-core/provider/manual	1.092s
ok  	launchpad.net/juju-core/provider/openstack	29.391s
ok  	launchpad.net/juju-core/replicaset	77.815s
ok  	launchpad.net/juju-core/rpc	0.084s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.026s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.022s
FAIL	launchpad.net/juju-core/state [build failed]
ok  	launchpad.net/juju-core/state/api	1.618s
ok  	launchpad.net/juju-core/state/api/agent	1.714s
?   	launchpad.net/juju-core/state/api/base	[no test files]
ok  	launchpad.net/juju-core/state/api/charmrevisionupdater	1.297s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	6.287s
ok  	launchpad.net/juju-core/state/api/environment	1.729s
ok  	launchpad.net/juju-core/state/api/firewaller	9.382s
ok  	launchpad.net/juju-core/state/api/keymanager	3.483s
ok  	launchpad.net/juju-core/state/api/keyupdater	2.221s
ok  	launchpad.net/juju-core/state/api/logger	1.955s
ok  	launchpad.net/juju-core/state/api/machiner	4.313s
ok  	launchpad.net/juju-core/state/api/params	0.029s
ok  	launchpad.net/juju-core/state/api/provisioner	8.801s
ok  	launchpad.net/juju-core/state/api/rsyslog	1.671s
?   	launchpad.net/juju-core/state/api/testing	[no test files]
ok  	launchpad.net/juju-core/state/api/uniter	26.000s
ok  	launchpad.net/juju-core/state/api/upgrader	8.377s
ok  	launchpad.net/juju-core/state/api/usermanager	1.765s
ok  	launchpad.net/juju-core/state/api/watcher	3.010s
ok  	launchpad.net/juju-core/state/apiserver	11.777s
ok  	launchpad.net/juju-core/state/apiserver/agent	2.853s
ok  	launchpad.net/juju-core/state/apiserver/charmrevisionupdater	2.308s
?   	launchpad.net/juju-core/state/apiserver/charmrevisionupdater/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/client	42.965s
ok  	launchpad.net/juju-core/state/apiserver/common	2.291s
?   	launchpad.net/juju-core/state/apiserver/common/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/deployer	4.122s
ok  	launchpad.net/juju-core/state/apiserver/environment	1.359s
ok  	launchpad.net/juju-core/state/apiserver/firewaller	5.507s
ok  	launchpad.net/juju-core/state/apiserver/keymanager	4.595s
?   	launchpad.net/juju-core/state/apiserver/keymanager/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/keyupdater	2.699s
ok  	launchpad.net/juju-core/state/apiserver/logger	3.144s
ok  	launchpad.net/juju-core/state/apiserver/machine	2.535s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	10.297s
ok  	launchpad.net/juju-core/state/apiserver/rsyslog	2.660s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	17.966s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	9.422s
ok  	launchpad.net/juju-core/state/apiserver/usermanager	1.815s
ok  	launchpad.net/juju-core/state/multiwatcher	0.661s
ok  	launchpad.net/juju-core/state/presence	6.424s
ok  	launchpad.net/juju-core/state/statecmd	1.617s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	5.010s
ok  	launchpad.net/juju-core/store	16.976s
ok  	launchpad.net/juju-core/testing	1.283s
ok  	launchpad.net/juju-core/testing/testbase	0.014s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.107s
ok  	launchpad.net/juju-core/tools	0.016s
ok  	launchpad.net/juju-core/upgrades	6.138s
ok  	launchpad.net/juju-core/upstart	1.037s
ok  	launchpad.net/juju-core/utils	2.062s
ok  	launchpad.net/juju-core/utils/exec	0.029s
ok  	launchpad.net/juju-core/utils/fslock	0.898s
ok  	launchpad.net/juju-core/utils/parallel	0.896s
ok  	launchpad.net/juju-core/utils/set	0.012s
ok  	launchpad.net/juju-core/utils/shell	0.031s
ok  	launchpad.net/juju-core/utils/ssh	18.756s
?   	launchpad.net/juju-core/utils/ssh/testing	[no test files]
ok  	launchpad.net/juju-core/utils/tailer	0.952s
ok  	launchpad.net/juju-core/utils/voyeur	0.014s
ok  	launchpad.net/juju-core/utils/zip	0.081s
ok  	launchpad.net/juju-core/version	0.051s
ok  	launchpad.net/juju-core/worker	17.003s
ok  	launchpad.net/juju-core/worker/authenticationworker	2.782s
ok  	launchpad.net/juju-core/worker/charmrevisionworker	1.806s
ok  	launchpad.net/juju-core/worker/cleaner	1.092s
ok  	launchpad.net/juju-core/worker/deployer	3.066s
ok  	launchpad.net/juju-core/worker/firewaller	8.246s
ok  	launchpad.net/juju-core/worker/instancepoller	1.572s
ok  	launchpad.net/juju-core/worker/localstorage	0.051s
ok  	launchpad.net/juju-core/worker/logger	1.357s
ok  	launchpad.net/juju-core/worker/machineenvironmentworker	7.208s
ok  	launchpad.net/juju-core/worker/machiner	2.645s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.141s
ok  	launchpad.net/juju-core/worker/peergrouper	1.458s
ok  	launchpad.net/juju-core/worker/provisioner	42.935s
ok  	launchpad.net/juju-core/worker/resumer	1.408s
ok  	launchpad.net/juju-core/worker/rsyslog	3.422s
ok  	launchpad.net/juju-core/worker/terminationworker	0.047s
ok  	launchpad.net/juju-core/worker/uniter	104.206s
ok  	launchpad.net/juju-core/worker/uniter/charm	2.311s
ok  	launchpad.net/juju-core/worker/uniter/debug	1.089s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.011s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.398s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.253s
ok  	launchpad.net/juju-core/worker/upgrader	3.068s

warning: building out-of-date packages:
	launchpad.net/goamz/ec2/ec2test
	launchpad.net/goamz/s3/s3test
	launchpad.net/goose/testservices/hook
	launchpad.net/goose/testservices/identityservice
	launchpad.net/goose/testservices
	launchpad.net/goose/testservices/novaservice
	launchpad.net/goose/testservices/swiftservice
	launchpad.net/goose/testservices/openstackservice
installing these packages with 'go test -i ./...' will speed future tests.

# launchpad.net/juju-core/state
state/compat_test.go:75: not enough arguments in call to s.state.AddService

Revision history for this message

Go Bot (go-bot) wrote on 2014-03-25:

Download full text (10.1 KiB)

The attempt to merge lp:~gz/juju-core/addservice_using_networks into lp:juju-core failed. Below is the output from the failed tests.

ok  	launchpad.net/juju-core	0.011s
ok  	launchpad.net/juju-core/agent	1.074s
ok  	launchpad.net/juju-core/agent/mongo	0.563s
ok  	launchpad.net/juju-core/agent/tools	0.190s
ok  	launchpad.net/juju-core/bzr	5.159s
ok  	launchpad.net/juju-core/cert	2.821s
ok  	launchpad.net/juju-core/charm	0.408s
?   	launchpad.net/juju-core/charm/hooks	[no test files]
?   	launchpad.net/juju-core/charm/testing	[no test files]
ok  	launchpad.net/juju-core/cloudinit	0.027s
ok  	launchpad.net/juju-core/cloudinit/sshinit	0.800s
ok  	launchpad.net/juju-core/cmd	0.199s
ok  	launchpad.net/juju-core/cmd/charm-admin	0.915s
?   	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	202.043s
ok  	launchpad.net/juju-core/cmd/jujud	63.899s
ok  	launchpad.net/juju-core/cmd/plugins/juju-metadata	10.408s
?   	launchpad.net/juju-core/cmd/plugins/juju-restore	[no test files]
ok  	launchpad.net/juju-core/cmd/plugins/local	0.204s
?   	launchpad.net/juju-core/cmd/plugins/local/juju-local	[no test files]
ok  	launchpad.net/juju-core/constraints	0.031s
ok  	launchpad.net/juju-core/container	0.043s
ok  	launchpad.net/juju-core/container/factory	0.052s
ok  	launchpad.net/juju-core/container/kvm	0.199s
ok  	launchpad.net/juju-core/container/kvm/mock	0.043s
?   	launchpad.net/juju-core/container/kvm/testing	[no test files]
ok  	launchpad.net/juju-core/container/lxc	4.298s
?   	launchpad.net/juju-core/container/lxc/mock	[no test files]
?   	launchpad.net/juju-core/container/lxc/testing	[no test files]
?   	launchpad.net/juju-core/container/testing	[no test files]
ok  	launchpad.net/juju-core/downloader	5.209s
ok  	launchpad.net/juju-core/environs	2.257s
ok  	launchpad.net/juju-core/environs/bootstrap	10.255s
ok  	launchpad.net/juju-core/environs/cloudinit	0.558s
ok  	launchpad.net/juju-core/environs/config	1.797s
ok  	launchpad.net/juju-core/environs/configstore	0.030s
ok  	launchpad.net/juju-core/environs/filestorage	0.027s
ok  	launchpad.net/juju-core/environs/httpstorage	0.682s
ok  	launchpad.net/juju-core/environs/imagemetadata	0.419s
?   	launchpad.net/juju-core/environs/imagemetadata/testing	[no test files]
ok  	launchpad.net/juju-core/environs/instances	0.046s
ok  	launchpad.net/juju-core/environs/jujutest	0.222s
ok  	launchpad.net/juju-core/environs/manual	12.353s
ok  	launchpad.net/juju-core/environs/simplestreams	0.280s
?   	launchpad.net/juju-core/environs/simplestreams/testing	[no test files]
ok  	launchpad.net/juju-core/environs/sshstorage	1.044s
ok  	launchpad.net/juju-core/environs/storage	0.962s
ok  	launchpad.net/juju-core/environs/sync	43.127s
ok  	launchpad.net/juju-core/environs/testing	0.134s
ok  	launchpad.net/juju-core/environs/tools	4.519s
?   	launchpad.net/juju-core/environs/tools/testing	[no test files]
ok  	launchpad.net/juju-core/errors	0.011s
ok  	launchpad.net/juju-core/instance	0.018s
?   	launchpad.net/juju-core/instance/testing	[no test files]
ok  	launchpad.net/juju-core/juju	17.847s
ok  	launchpad.net/juju-core/juju/arch	0.015s
ok  	launchpad.net/juju-core/juju/osenv	0.017s
?   	launchpad.net/juju-core/juju/testing	[no test files]
ok  	launchpad.net/juju-core/log	0.012s
ok  	launchpad.net/juju-core/log/syslog	0.040s
?   	launchpad.net/juju-core/log/syslog/testing	[no test files]
ok  	launchpad.net/juju-core/names	0.021s
?   	launchpad.net/juju-core/provider	[no test files]
?   	launchpad.net/juju-core/provider/all	[no test files]
ok  	launchpad.net/juju-core/provider/azure	4.217s
ok  	launchpad.net/juju-core/provider/common	9.218s
ok  	launchpad.net/juju-core/provider/dummy	16.492s
ok  	launchpad.net/juju-core/provider/ec2	16.953s
ok  	launchpad.net/juju-core/provider/joyent	3.406s
ok  	launchpad.net/juju-core/provider/local	15.239s
ok  	launchpad.net/juju-core/provider/maas	11.009s
ok  	launchpad.net/juju-core/provider/manual	1.277s
ok  	launchpad.net/juju-core/provider/openstack	29.399s
ok  	launchpad.net/juju-core/replicaset	77.124s
ok  	launchpad.net/juju-core/rpc	0.078s
ok  	launchpad.net/juju-core/rpc/jsoncodec	0.027s
?   	launchpad.net/juju-core/rpc/rpcreflect	[no test files]
ok  	launchpad.net/juju-core/schema	0.015s
ok  	launchpad.net/juju-core/state	84.285s
ok  	launchpad.net/juju-core/state/api	1.627s
ok  	launchpad.net/juju-core/state/api/agent	1.742s
?   	launchpad.net/juju-core/state/api/base	[no test files]
ok  	launchpad.net/juju-core/state/api/charmrevisionupdater	1.341s
?   	launchpad.net/juju-core/state/api/common	[no test files]
ok  	launchpad.net/juju-core/state/api/deployer	6.434s
ok  	launchpad.net/juju-core/state/api/environment	1.648s
ok  	launchpad.net/juju-core/state/api/firewaller	9.623s
ok  	launchpad.net/juju-core/state/api/keymanager	3.470s
ok  	launchpad.net/juju-core/state/api/keyupdater	2.169s
ok  	launchpad.net/juju-core/state/api/logger	1.857s
ok  	launchpad.net/juju-core/state/api/machiner	4.281s
ok  	launchpad.net/juju-core/state/api/params	0.031s
ok  	launchpad.net/juju-core/state/api/provisioner	8.914s
ok  	launchpad.net/juju-core/state/api/rsyslog	1.696s
?   	launchpad.net/juju-core/state/api/testing	[no test files]
ok  	launchpad.net/juju-core/state/api/uniter	25.763s
ok  	launchpad.net/juju-core/state/api/upgrader	8.267s
ok  	launchpad.net/juju-core/state/api/usermanager	1.819s
ok  	launchpad.net/juju-core/state/api/watcher	2.825s
ok  	launchpad.net/juju-core/state/apiserver	11.772s
ok  	launchpad.net/juju-core/state/apiserver/agent	2.591s
ok  	launchpad.net/juju-core/state/apiserver/charmrevisionupdater	2.290s
?   	launchpad.net/juju-core/state/apiserver/charmrevisionupdater/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/client	42.236s
ok  	launchpad.net/juju-core/state/apiserver/common	2.287s
?   	launchpad.net/juju-core/state/apiserver/common/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/deployer	4.381s
ok  	launchpad.net/juju-core/state/apiserver/environment	1.367s
ok  	launchpad.net/juju-core/state/apiserver/firewaller	5.502s
ok  	launchpad.net/juju-core/state/apiserver/keymanager	4.651s
?   	launchpad.net/juju-core/state/apiserver/keymanager/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/keyupdater	2.794s
ok  	launchpad.net/juju-core/state/apiserver/logger	3.066s
ok  	launchpad.net/juju-core/state/apiserver/machine	2.581s
ok  	launchpad.net/juju-core/state/apiserver/provisioner	10.281s
ok  	launchpad.net/juju-core/state/apiserver/rsyslog	2.478s
?   	launchpad.net/juju-core/state/apiserver/testing	[no test files]
ok  	launchpad.net/juju-core/state/apiserver/uniter	17.986s
ok  	launchpad.net/juju-core/state/apiserver/upgrader	9.336s
ok  	launchpad.net/juju-core/state/apiserver/usermanager	1.886s
ok  	launchpad.net/juju-core/state/multiwatcher	0.632s
ok  	launchpad.net/juju-core/state/presence	6.385s
ok  	launchpad.net/juju-core/state/statecmd	1.579s
?   	launchpad.net/juju-core/state/testing	[no test files]
ok  	launchpad.net/juju-core/state/watcher	5.141s

----------------------------------------------------------------------
FAIL: store_test.go:52: StoreSuite.SetUpTest

store_test.go:53:
    s.MgoSuite.SetUpTest(c)
mgo_test.go:54:
    c.Assert(err, gc.IsNil)
... value *errors.errorString = &errors.errorString{s:"no reachable servers"} ("no reachable servers")

----------------------------------------------------------------------
PANIC: server_test.go:556: StoreSuite.TestBlitzKey

... Panic: Fixture has panicked (see related PANIC)
OOPS: 2 passed, 1 FAILED, 34 MISSED
--- FAIL: Test (10.54 seconds)
FAIL
FAIL	launchpad.net/juju-core/store	10.752s
ok  	launchpad.net/juju-core/testing	1.273s
ok  	launchpad.net/juju-core/testing/testbase	0.019s
ok  	launchpad.net/juju-core/thirdparty/pbkdf2	0.122s
ok  	launchpad.net/juju-core/tools	0.023s
ok  	launchpad.net/juju-core/upgrades	6.552s
ok  	launchpad.net/juju-core/upstart	1.051s
ok  	launchpad.net/juju-core/utils	2.083s
ok  	launchpad.net/juju-core/utils/exec	0.045s
ok  	launchpad.net/juju-core/utils/fslock	0.925s
ok  	launchpad.net/juju-core/utils/parallel	0.957s
ok  	launchpad.net/juju-core/utils/set	0.017s
ok  	launchpad.net/juju-core/utils/shell	0.031s
ok  	launchpad.net/juju-core/utils/ssh	20.615s
?   	launchpad.net/juju-core/utils/ssh/testing	[no test files]
ok  	launchpad.net/juju-core/utils/tailer	0.940s
ok  	launchpad.net/juju-core/utils/voyeur	0.014s
ok  	launchpad.net/juju-core/utils/zip	0.090s
ok  	launchpad.net/juju-core/version	0.053s
ok  	launchpad.net/juju-core/worker	16.883s
ok  	launchpad.net/juju-core/worker/authenticationworker	2.764s
ok  	launchpad.net/juju-core/worker/charmrevisionworker	1.878s
ok  	launchpad.net/juju-core/worker/cleaner	1.125s
ok  	launchpad.net/juju-core/worker/deployer	8.192s
ok  	launchpad.net/juju-core/worker/firewaller	8.276s
ok  	launchpad.net/juju-core/worker/instancepoller	1.490s
ok  	launchpad.net/juju-core/worker/localstorage	0.050s
ok  	launchpad.net/juju-core/worker/logger	1.329s
ok  	launchpad.net/juju-core/worker/machineenvironmentworker	7.252s
ok  	launchpad.net/juju-core/worker/machiner	7.542s
ok  	launchpad.net/juju-core/worker/minunitsworker	1.287s
ok  	launchpad.net/juju-core/worker/peergrouper	1.520s
ok  	launchpad.net/juju-core/worker/provisioner	37.568s
ok  	launchpad.net/juju-core/worker/resumer	1.354s
ok  	launchpad.net/juju-core/worker/rsyslog	3.515s
ok  	launchpad.net/juju-core/worker/terminationworker	0.051s
ok  	launchpad.net/juju-core/worker/uniter	103.873s
ok  	launchpad.net/juju-core/worker/uniter/charm	2.499s
ok  	launchpad.net/juju-core/worker/uniter/debug	0.080s
ok  	launchpad.net/juju-core/worker/uniter/hook	0.022s
ok  	launchpad.net/juju-core/worker/uniter/jujuc	0.411s
ok  	launchpad.net/juju-core/worker/uniter/relation	1.289s
ok  	launchpad.net/juju-core/worker/upgrader	3.047s

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Aaron Bentley

Dave Cheney

Dimiter Naydenov

Eric Snow

John A Meinel

Martin Packman

Nate Finch

Raphaël Badin

Tim Penhey

to status/vote changes:

rowez

1	=== modified file 'cmd/juju/status_test.go'
2	--- cmd/juju/status_test.go 2014-01-24 14:52:58 +0000
3	+++ cmd/juju/status_test.go 2014-03-25 16:12:36 +0000
4	@@ -1626,7 +1626,7 @@
5	func (as addService) step(c gc.C, ctx context) {
6	ch, ok := ctx.charms[as.charm]
7	c.Assert(ok, gc.Equals, true)
8	- _, err := ctx.st.AddService(as.name, "user-admin", ch)
9	+ _, err := ctx.st.AddService(as.name, "user-admin", ch, nil, nil)
10	c.Assert(err, gc.IsNil)
11	}
12
13
14	=== modified file 'environs/jujutest/livetests.go'
15	--- environs/jujutest/livetests.go 2014-03-17 18:46:17 +0000
16	+++ environs/jujutest/livetests.go 2014-03-25 16:12:36 +0000
17	@@ -452,7 +452,7 @@
18	url := coretesting.Charms.ClonedURL(repoDir, mtools0.Version.Series, "dummy")
19	sch, err := conn.PutCharm(url, &charm.LocalRepository{Path: repoDir}, false)
20	c.Assert(err, gc.IsNil)
21	- svc, err := conn.State.AddService("dummy", "user-admin", sch)
22	+ svc, err := conn.State.AddService("dummy", "user-admin", sch, nil, nil)
23	c.Assert(err, gc.IsNil)
24	units, err := juju.AddUnits(conn.State, svc, 1, "")
25	c.Assert(err, gc.IsNil)
26
27	=== modified file 'juju/conn_test.go'
28	--- juju/conn_test.go 2014-03-20 22:35:39 +0000
29	+++ juju/conn_test.go 2014-03-25 16:12:36 +0000
30	@@ -402,7 +402,7 @@
31	curl := coretesting.Charms.ClonedURL(s.repo.Path, "quantal", "riak")
32	sch, err := s.conn.PutCharm(curl, s.repo, false)
33	c.Assert(err, gc.IsNil)
34	- svc, err := s.conn.State.AddService("testriak", "user-admin", sch)
35	+ svc, err := s.conn.State.AddService("testriak", "user-admin", sch, nil, nil)
36	c.Assert(err, gc.IsNil)
37	units, err := juju.AddUnits(s.conn.State, svc, 2, "")
38	c.Assert(err, gc.IsNil)
39
40	=== modified file 'juju/deploy.go'
41	--- juju/deploy.go 2013-12-19 21:17:26 +0000
42	+++ juju/deploy.go 2014-03-25 16:12:36 +0000
43	@@ -49,7 +49,8 @@
44	}
45	// TODO(fwereade): transactional State.AddService including settings, constraints
46	// (minimumUnitCount, initialMachineIds?).
47	- service, err := st.AddService(args.ServiceName, "user-admin", args.Charm)
48	+ // TODO(gz): pass through real includeNetworks and excludeNetworks vals
49	+ service, err := st.AddService(args.ServiceName, "user-admin", args.Charm, nil, nil)
50	if err != nil {
51	return nil, err
52	}
53
54	=== modified file 'juju/testing/conn.go'
55	--- juju/testing/conn.go 2014-03-07 22:45:37 +0000
56	+++ juju/testing/conn.go 2014-03-25 16:12:36 +0000
57	@@ -293,8 +293,12 @@
58	}
59
60	func (s JujuConnSuite) AddTestingService(c gc.C, name string, ch state.Charm) state.Service {
61	+ return s.AddTestingServiceWithNetworks(c, name, ch, nil, nil)
62	+}
63	+
64	+func (s JujuConnSuite) AddTestingServiceWithNetworks(c gc.C, name string, ch state.Charm, includeNetworks, excludeNetworks []string) state.Service {
65	c.Assert(s.State, gc.NotNil)
66	- service, err := s.State.AddService(name, "user-admin", ch)
67	+ service, err := s.State.AddService(name, "user-admin", ch, includeNetworks, excludeNetworks)
68	c.Assert(err, gc.IsNil)
69	return service
70	}
71
72	=== modified file 'state/apiserver/charmrevisionupdater/testing/suite.go'
73	--- state/apiserver/charmrevisionupdater/testing/suite.go 2014-01-17 00:06:37 +0000
74	+++ state/apiserver/charmrevisionupdater/testing/suite.go 2014-03-25 16:12:36 +0000
75	@@ -88,10 +88,10 @@
76	}
77
78	// AddService adds a service for the specified charm to state.
79	-func (s CharmSuite) AddService(c gc.C, charmName, serviceName string) {
80	+func (s CharmSuite) AddService(c gc.C, charmName, serviceName string, includeNetworks, excludeNetworks []string) {
81	ch, ok := s.charms[charmName]
82	c.Assert(ok, gc.Equals, true)
83	- _, err := s.State.AddService(serviceName, "user-admin", ch)
84	+ _, err := s.State.AddService(serviceName, "user-admin", ch, includeNetworks, excludeNetworks)
85	c.Assert(err, gc.IsNil)
86	}
87
88	@@ -127,12 +127,12 @@
89
90	// mysql is out of date
91	s.AddCharmWithRevision(c, "mysql", 22)
92	- s.AddService(c, "mysql", "mysql")
93	+ s.AddService(c, "mysql", "mysql", nil, nil)
94	s.AddUnit(c, "mysql", "1")
95
96	// wordpress is up to date
97	s.AddCharmWithRevision(c, "wordpress", 26)
98	- s.AddService(c, "wordpress", "wordpress")
99	+ s.AddService(c, "wordpress", "wordpress", nil, nil)
100	s.AddUnit(c, "wordpress", "2")
101	s.AddUnit(c, "wordpress", "2")
102	// wordpress/0 has a version, wordpress/1 is unknown
103	@@ -140,6 +140,6 @@
104
105	// varnish is a charm that does not have a version in the mock store.
106	s.AddCharmWithRevision(c, "varnish", 5)
107	- s.AddService(c, "varnish", "varnish")
108	+ s.AddService(c, "varnish", "varnish", nil, nil)
109	s.AddUnit(c, "varnish", "3")
110	}
111
112	=== modified file 'state/apiserver/client/run_test.go'
113	--- state/apiserver/client/run_test.go 2014-03-13 07:54:56 +0000
114	+++ state/apiserver/client/run_test.go 2014-03-25 16:12:36 +0000
115	@@ -76,16 +76,16 @@
116
117	func (s runSuite) TestGetAllUnitNames(c gc.C) {
118	charm := s.AddTestingCharm(c, "dummy")
119	- magic, err := s.State.AddService("magic", "user-admin", charm)
120	+ magic, err := s.State.AddService("magic", "user-admin", charm, nil, nil)
121	s.addUnit(c, magic)
122	s.addUnit(c, magic)
123
124	- notAssigned, err := s.State.AddService("not-assigned", "user-admin", charm)
125	+ notAssigned, err := s.State.AddService("not-assigned", "user-admin", charm, nil, nil)
126	c.Assert(err, gc.IsNil)
127	_, err = notAssigned.AddUnit()
128	c.Assert(err, gc.IsNil)
129
130	- _, err = s.State.AddService("no-units", "user-admin", charm)
131	+ _, err = s.State.AddService("no-units", "user-admin", charm, nil, nil)
132	c.Assert(err, gc.IsNil)
133
134	for i, test := range []struct {
135	@@ -241,7 +241,7 @@
136	s.addMachineWithAddress(c, "10.3.2.1")
137
138	charm := s.AddTestingCharm(c, "dummy")
139	- magic, err := s.State.AddService("magic", "user-admin", charm)
140	+ magic, err := s.State.AddService("magic", "user-admin", charm, nil, nil)
141	s.addUnit(c, magic)
142	s.addUnit(c, magic)
143
144
145	=== modified file 'state/compat_test.go'
146	--- state/compat_test.go 2014-03-25 09:25:04 +0000
147	+++ state/compat_test.go 2014-03-25 16:12:36 +0000
148	@@ -72,7 +72,7 @@
149	_, err := s.state.AddUser(AdminUser, "pass")
150	c.Assert(err, gc.IsNil)
151	charm := addCharm(c, s.state, "quantal", testing.Charms.Dir("mysql"))
152	- service, err := s.state.AddService("mysql", "user-admin", charm)
153	+ service, err := s.state.AddService("mysql", "user-admin", charm, nil, nil)
154	c.Assert(err, gc.IsNil)
155	// In 1.17.7+ all services have associated document in the
156	// networks collection. We remove it here to test backwards
157
158	=== modified file 'state/conn_test.go'
159	--- state/conn_test.go 2014-03-17 06:05:54 +0000
160	+++ state/conn_test.go 2014-03-25 16:12:36 +0000
161	@@ -79,6 +79,10 @@
162	return state.AddTestingService(c, s.State, name, ch)
163	}
164
165	+func (s ConnSuite) AddTestingServiceWithNetworks(c gc.C, name string, ch state.Charm, includeNetworks, excludeNetworks []string) state.Service {
166	+ return state.AddTestingServiceWithNetworks(c, s.State, name, ch, includeNetworks, excludeNetworks)
167	+}
168	+
169	func (s ConnSuite) AddSeriesCharm(c gc.C, name, series string) *state.Charm {
170	return state.AddCustomCharm(c, s.State, name, "", "", series, -1)
171	}
172
173	=== modified file 'state/export_test.go'
174	--- state/export_test.go 2014-03-19 23:07:33 +0000
175	+++ state/export_test.go 2014-03-25 16:12:36 +0000
176	@@ -142,7 +142,11 @@
177	}
178
179	func AddTestingService(c gc.C, st State, name string, ch Charm) Service {
180	- service, err := st.AddService(name, "user-admin", ch)
181	+ return AddTestingServiceWithNetworks(c, st, name, ch, nil, nil)
182	+}
183	+
184	+func AddTestingServiceWithNetworks(c gc.C, st State, name string, ch Charm, includeNetworks, excludeNetworks []string) Service {
185	+ service, err := st.AddService(name, "user-admin", ch, includeNetworks, excludeNetworks)
186	c.Assert(err, gc.IsNil)
187	return service
188	}
189
190	=== modified file 'state/service_test.go'
191	--- state/service_test.go 2014-03-25 09:15:00 +0000
192	+++ state/service_test.go 2014-03-25 16:12:36 +0000
193	@@ -1438,3 +1438,13 @@
194	c.Check(include, gc.HasLen, 0)
195	c.Check(exclude, gc.HasLen, 0)
196	}
197	+
198	+func (s ServiceSuite) TestNetworksOnService(c gc.C) {
199	+ includeNetworks := []string{"yes", "on"}
200	+ excludeNetworks := []string{"no", "off"}
201	+ service := s.AddTestingServiceWithNetworks(c, "withnets", s.charm, includeNetworks, excludeNetworks)
202	+ haveIncludeNetworks, haveExcludeNetworks, err := service.Networks()
203	+ c.Assert(err, gc.IsNil)
204	+ c.Check(haveIncludeNetworks, gc.DeepEquals, includeNetworks)
205	+ c.Check(haveExcludeNetworks, gc.DeepEquals, excludeNetworks)
206	+}
207
208	=== modified file 'state/state.go'
209	--- state/state.go 2014-03-24 10:22:17 +0000
210	+++ state/state.go 2014-03-25 16:12:36 +0000
211	@@ -907,7 +907,7 @@
212	// AddService creates a new service, running the supplied charm, with the
213	// supplied name (which must be unique). If the charm defines peer relations,
214	// they will be created automatically.
215	-func (st State) AddService(name, ownerTag string, ch Charm) (service *Service, err error) {
216	+func (st State) AddService(name, ownerTag string, ch Charm, includeNetworks, excludeNetworks []string) (service *Service, err error) {
217	defer utils.ErrorContextf(&err, "cannot add service %q", name)
218	kind, ownerId, err := names.ParseTag(ownerTag, names.UserTagKind)
219	if err != nil \|\| kind != names.UserTagKind {
220	@@ -951,7 +951,7 @@
221	ops := []txn.Op{
222	env.assertAliveOp(),
223	createConstraintsOp(st, svc.globalKey(), constraints.Value{}),
224	- createNetworksOp(st, svc.globalKey(), []string{}, []string{}),
225	+ createNetworksOp(st, svc.globalKey(), includeNetworks, excludeNetworks),
226	createSettingsOp(st, svc.settingsKey(), nil),
227	{
228	C: st.users.Name,
229
230	=== modified file 'state/state_test.go'
231	--- state/state_test.go 2014-03-20 01:23:05 +0000
232	+++ state/state_test.go 2014-03-25 16:12:36 +0000
233	@@ -964,19 +964,19 @@
234
235	func (s StateSuite) TestAddService(c gc.C) {
236	charm := s.AddTestingCharm(c, "dummy")
237	- _, err := s.State.AddService("haha/borken", "user-admin", charm)
238	+ _, err := s.State.AddService("haha/borken", "user-admin", charm, nil, nil)
239	c.Assert(err, gc.ErrorMatches, `cannot add service "haha/borken": invalid name`)
240	_, err = s.State.Service("haha/borken")
241	c.Assert(err, gc.ErrorMatches, `"haha/borken" is not a valid service name`)
242
243	// set that a nil charm is handled correctly
244	- _, err = s.State.AddService("umadbro", "user-admin", nil)
245	+ _, err = s.State.AddService("umadbro", "user-admin", nil, nil, nil)
246	c.Assert(err, gc.ErrorMatches, `cannot add service "umadbro": charm is nil`)
247
248	- wordpress, err := s.State.AddService("wordpress", "user-admin", charm)
249	+ wordpress, err := s.State.AddService("wordpress", "user-admin", charm, nil, nil)
250	c.Assert(err, gc.IsNil)
251	c.Assert(wordpress.Name(), gc.Equals, "wordpress")
252	- mysql, err := s.State.AddService("mysql", "user-admin", charm)
253	+ mysql, err := s.State.AddService("mysql", "user-admin", charm, nil, nil)
254	c.Assert(err, gc.IsNil)
255	c.Assert(mysql.Name(), gc.Equals, "mysql")
256
257	@@ -1003,7 +1003,7 @@
258	c.Assert(err, gc.IsNil)
259	err = env.Destroy()
260	c.Assert(err, gc.IsNil)
261	- _, err = s.State.AddService("s1", "user-admin", charm)
262	+ _, err = s.State.AddService("s1", "user-admin", charm, nil, nil)
263	c.Assert(err, gc.ErrorMatches, `cannot add service "s1": environment is no longer alive`)
264	}
265
266	@@ -1018,7 +1018,7 @@
267	c.Assert(env.Life(), gc.Equals, state.Alive)
268	c.Assert(env.Destroy(), gc.IsNil)
269	}).Check()
270	- _, err = s.State.AddService("s1", "user-admin", charm)
271	+ _, err = s.State.AddService("s1", "user-admin", charm, nil, nil)
272	c.Assert(err, gc.ErrorMatches, `cannot add service "s1": environment is no longer alive`)
273	}
274
275	@@ -1030,19 +1030,19 @@
276
277	func (s StateSuite) TestAddServiceNoTag(c gc.C) {
278	charm := s.AddTestingCharm(c, "dummy")
279	- _, err := s.State.AddService("wordpress", state.AdminUser, charm)
280	+ _, err := s.State.AddService("wordpress", state.AdminUser, charm, nil, nil)
281	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": Invalid ownertag admin")
282	}
283
284	func (s StateSuite) TestAddServiceNotUserTag(c gc.C) {
285	charm := s.AddTestingCharm(c, "dummy")
286	- _, err := s.State.AddService("wordpress", "machine-3", charm)
287	+ _, err := s.State.AddService("wordpress", "machine-3", charm, nil, nil)
288	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": Invalid ownertag machine-3")
289	}
290
291	func (s StateSuite) TestAddServiceNonExistentUser(c gc.C) {
292	charm := s.AddTestingCharm(c, "dummy")
293	- _, err := s.State.AddService("wordpress", "user-notAuser", charm)
294	+ _, err := s.State.AddService("wordpress", "user-notAuser", charm, nil, nil)
295	c.Assert(err, gc.ErrorMatches, "cannot add service \"wordpress\": user notAuser doesn't exist")
296	}
297
298	@@ -1053,13 +1053,13 @@
299	c.Assert(len(services), gc.Equals, 0)
300
301	// Check that after adding services the result is ok.
302	- _, err = s.State.AddService("wordpress", "user-admin", charm)
303	+ _, err = s.State.AddService("wordpress", "user-admin", charm, nil, nil)
304	c.Assert(err, gc.IsNil)
305	services, err = s.State.AllServices()
306	c.Assert(err, gc.IsNil)
307	c.Assert(len(services), gc.Equals, 1)
308
309	- _, err = s.State.AddService("mysql", "user-admin", charm)
310	+ _, err = s.State.AddService("mysql", "user-admin", charm, nil, nil)
311	c.Assert(err, gc.IsNil)
312	services, err = s.State.AllServices()
313	c.Assert(err, gc.IsNil)
314	@@ -2524,7 +2524,7 @@
315	// Add a service and 4 units: one with a different version, one
316	// with an empty version, one with the current version, and one
317	// with the new version.
318	- service, err := s.State.AddService("wordpress", "user-admin", s.AddTestingCharm(c, "wordpress"))
319	+ service, err := s.State.AddService("wordpress", "user-admin", s.AddTestingCharm(c, "wordpress"), nil, nil)
320	c.Assert(err, gc.IsNil)
321	unit0, err := service.AddUnit()
322	c.Assert(err, gc.IsNil)
323	@@ -2574,7 +2574,7 @@
324	// Add a machine and a unit with the current version.
325	machine, err := s.State.AddMachine("series", state.JobHostUnits)
326	c.Assert(err, gc.IsNil)
327	- service, err := s.State.AddService("wordpress", "user-admin", s.AddTestingCharm(c, "wordpress"))
328	+ service, err := s.State.AddService("wordpress", "user-admin", s.AddTestingCharm(c, "wordpress"), nil, nil)
329	c.Assert(err, gc.IsNil)
330	unit, err := service.AddUnit()
331	c.Assert(err, gc.IsNil)