Merge into trunk : service-life : Code : juju-core

Status:

Merged

Merged at revision:

1165

Proposed branch:

lp://staging/~makyo/juju-core/service-life

Merge into:

lp://staging/~juju/juju-core/trunk

Diff against target:

160 lines (+10/-53)

5 files modified

state/api/params/params.go (+1/-7)
state/api/params/params_test.go (+2/-1)
state/megawatcher.go (+1/-0)
state/megawatcher_internal_test.go (+6/-1)
state/statecmd/resolved_test.go.THIS (+0/-44)

To merge this branch:

bzr merge lp://staging/~makyo/juju-core/service-life

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-04-16	Pending
Review via email: mp+159255@code.staging.launchpad.net

Description of the change

Add Life to Service API information

This is a branch from Francesco Banconi, submitted on his behalf. This branch adds Life information to Service API calls for the GUI to consume and use for making decisions regarding destroying services. This branch was QA'd by members of #juju-gui earlier today, as well.

https://codereview.appspot.com/8811043/

Revision history for this message

Madison Scott-Clary (makyo) wrote on 2013-04-16:

#

Download full text (6.5 KiB)

Reviewers: mp+159255_code.launchpad.net,

Message:
Please take a look.

Description:
Add Life to Service API information

This is a branch from Francesco Banconi, submitted on his behalf. This
branch adds Life information to Service API calls for the GUI to consume
and use for making decisions regarding destroying services. This branch
was QA'd by members of #juju-gui earlier today, as well.

https://code.launchpad.net/~makyo/juju-core/service-life/+merge/159255

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M state/api/params/params.go
   M state/api/params/params_test.go
   M state/megawatcher.go
   M state/megawatcher_internal_test.go
   D state/statecmd/resolved_test.go.THIS

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: <email address hidden>
+New revision: <email address hidden>

Index: state/megawatcher.go
=== modified file 'state/megawatcher.go'
--- state/megawatcher.go 2013-04-16 14:57:08 +0000
+++ state/megawatcher.go 2013-04-16 16:31:53 +0000
@@ -113,6 +113,7 @@
    Name: svc.Name,
    Exposed: svc.Exposed,
    CharmURL: svc.CharmURL.String(),
+ Life: svc.Life.String(),
   }
   oldInfo := store.Get(info.EntityId())
   needConfig := false

Index: state/megawatcher_internal_test.go
=== modified file 'state/megawatcher_internal_test.go'
--- state/megawatcher_internal_test.go 2013-04-15 22:34:10 +0000
+++ state/megawatcher_internal_test.go 2013-04-16 16:47:59 +0000
@@ -80,6 +80,7 @@
    Name: "wordpress",
    Exposed: true,
    CharmURL: serviceCharmURL(wordpress).String(),
+ Life: Alive.String(),
    Constraints: constraints.MustParse("mem=100M"),
    Config: map[string]interface{}{"blog-title": "boring"},
   })
@@ -96,6 +97,7 @@
   add(&params.ServiceInfo{
    Name: "logging",
    CharmURL: serviceCharmURL(logging).String(),
+ Life: Alive.String(),
    Config: map[string]interface{}{},
   })

@@ -405,6 +407,7 @@
      Name: "wordpress",
      Exposed: true,
      CharmURL: "local:series/series-wordpress-3",
+ Life: Alive.String(),
      Config: map[string]interface{}{},
     },
    },
@@ -430,6 +433,7 @@
     &params.ServiceInfo{
      Name: "wordpress",
      CharmURL: "local:series/series-wordpress-3",
+ Life: Alive.String(),
      Constraints: constraints.MustParse("mem=99M"),
      Config: map[string]interface{}{"blog-title": "boring"},
     },
@@ -439,7 +443,7 @@
    add: []params.EntityInfo{&params.ServiceInfo{
     Name: "wordpress",
     // Note: CharmURL has a different revision number from
- // the wordpress revision in the testing repo.
+ // the wordpress revision in the testing repo.
     CharmURL: "local:series/series-wordpress-2",
     Config: map[string]interface{}{"foo": "bar"},
    }},
@@ -460,6 +464,7 @@
     &params.ServiceInfo{
      Name: "wordpress",
      CharmURL: "local:series/series-wordpress...

Reviewers: mp+159255_code.launchpad.net,

Message:
Please take a look.

Description:
Add Life to Service API information

This is a branch from Francesco Banconi, submitted on his behalf.  This
branch adds Life information to Service API calls for the GUI to consume
and use for making decisions regarding destroying services.  This branch
was QA'd by members of #juju-gui earlier today, as well.

https://code.launchpad.net/~makyo/juju-core/service-life/+merge/159255

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M state/api/params/params.go
   M state/api/params/params_test.go
   M state/megawatcher.go
   M state/megawatcher_internal_test.go
   D state/statecmd/resolved_test.go.THIS

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: kapil.foss@gmail.com-20130416165220-vo3emytn09emkqg7
+New revision: matthew.scott@canonical.com-20130416234406-h82af3eipr0m3crm

Index: state/megawatcher.go
=== modified file 'state/megawatcher.go'
--- state/megawatcher.go	2013-04-16 14:57:08 +0000
+++ state/megawatcher.go	2013-04-16 16:31:53 +0000
@@ -113,6 +113,7 @@
  		Name:     svc.Name,
  		Exposed:  svc.Exposed,
  		CharmURL: svc.CharmURL.String(),
+		Life:     svc.Life.String(),
  	}
  	oldInfo := store.Get(info.EntityId())
  	needConfig := false

Index: state/megawatcher_internal_test.go
=== modified file 'state/megawatcher_internal_test.go'
--- state/megawatcher_internal_test.go	2013-04-15 22:34:10 +0000
+++ state/megawatcher_internal_test.go	2013-04-16 16:47:59 +0000
@@ -80,6 +80,7 @@
  		Name:        "wordpress",
  		Exposed:     true,
  		CharmURL:    serviceCharmURL(wordpress).String(),
+		Life:        Alive.String(),
  		Constraints: constraints.MustParse("mem=100M"),
  		Config:      map[string]interface{}{"blog-title": "boring"},
  	})
@@ -96,6 +97,7 @@
  	add(&params.ServiceInfo{
  		Name:     "logging",
  		CharmURL: serviceCharmURL(logging).String(),
+		Life:     Alive.String(),
  		Config:   map[string]interface{}{},
  	})

@@ -405,6 +407,7 @@
  				Name:     "wordpress",
  				Exposed:  true,
  				CharmURL: "local:series/series-wordpress-3",
+				Life:     Alive.String(),
  				Config:   map[string]interface{}{},
  			},
  		},
@@ -430,6 +433,7 @@
  			&params.ServiceInfo{
  				Name:        "wordpress",
  				CharmURL:    "local:series/series-wordpress-3",
+				Life:        Alive.String(),
  				Constraints: constraints.MustParse("mem=99M"),
  				Config:      map[string]interface{}{"blog-title": "boring"},
  			},
@@ -439,7 +443,7 @@
  		add: []params.EntityInfo{&params.ServiceInfo{
  			Name: "wordpress",
  			// Note: CharmURL has a different revision number from
-			// the wordpress revision in the testing repo.	
+			// the wordpress revision in the testing repo.
  			CharmURL: "local:series/series-wordpress-2",
  			Config:   map[string]interface{}{"foo": "bar"},
  		}},
@@ -460,6 +464,7 @@
  			&params.ServiceInfo{
  				Name:     "wordpress",
  				CharmURL: "local:series/series-wordpress-3",
+				Life:     Alive.String(),
  				Config:   map[string]interface{}{"blog-title": "boring"},
  			},
  		},

Index: state/statecmd/resolved_test.go.THIS
=== removed file 'state/statecmd/resolved_test.go.THIS'
--- state/statecmd/resolved_test.go.THIS	2013-04-12 17:11:50 +0000
+++ state/statecmd/resolved_test.go.THIS	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-package statecmd_test
-
-import (
-	. "launchpad.net/gocheck"
-	"launchpad.net/juju-core/juju/testing"
-	"launchpad.net/juju-core/state/api/params"
-	"launchpad.net/juju-core/state/statecmd"
-)
-
-type ResolvedSuite struct {
-	testing.JujuConnSuite
-}
-
-var _ = Suite(&ResolvedSuite{})
-
-func (s *ResolvedSuite) TestMarkResolved(c *C) {
-	sch := s.AddTestingCharm(c, "riak")
-	svc, err := s.Conn.State.AddService("testriak", sch)
-	c.Assert(err, IsNil)
-	us, err := s.Conn.AddUnits(svc, 1, "")
-	c.Assert(err, IsNil)
-	u := us[0]
-
-	err = statecmd.MarkResolved(u, false)
-	c.Assert(err, ErrorMatches, `unit "testriak/0" is not in an error state`)
-	err = statecmd.MarkResolved(u, true)
-	c.Assert(err, ErrorMatches, `unit "testriak/0" is not in an error state`)
-
-	err = u.SetStatus(params.UnitError, "gaaah")
-	c.Assert(err, IsNil)
-	err = statecmd.MarkResolved(u, false)
-	c.Assert(err, IsNil)
-	err = statecmd.MarkResolved(u, true)
-	c.Assert(err, ErrorMatches, `cannot set resolved mode for  
unit "testriak/0": already resolved`)
-	c.Assert(u.Resolved(), Equals, params.ResolvedNoHooks)
-
-	err = u.ClearResolved()
-	c.Assert(err, IsNil)
-	err = statecmd.MarkResolved(u, true)
-	c.Assert(err, IsNil)
-	err = statecmd.MarkResolved(u, false)
-	c.Assert(err, ErrorMatches, `cannot set resolved mode for  
unit "testriak/0": already resolved`)
-	c.Assert(u.Resolved(), Equals, params.ResolvedRetryHooks)
-}

Index: state/api/params/params.go
=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2013-04-15 22:40:57 +0000
+++ state/api/params/params.go	2013-04-16 16:31:53 +0000
@@ -80,13 +80,6 @@
  	Retry    bool
  }

-// ResolvedResults holds results of the Resolved call.
-type ResolvedResults struct {
-	Service  string
-	Charm    string
-	Settings map[string]interface{}
-}
-
  // AddServiceUnitsResults holds the names of the units added by the
  // AddServiceUnits call.
  type AddServiceUnitsResults struct {
@@ -325,6 +318,7 @@
  	Name        string `bson:"_id"`
  	Exposed     bool
  	CharmURL    string
+	Life        string
  	Constraints constraints.Value
  	Config      map[string]interface{}
  }

Index: state/api/params/params_test.go
=== modified file 'state/api/params/params_test.go'
--- state/api/params/params_test.go	2013-04-15 22:40:57 +0000
+++ state/api/params/params_test.go	2013-04-16 16:31:53 +0000
@@ -42,6 +42,7 @@
  			Name:        "Benji",
  			Exposed:     true,
  			CharmURL:    "cs:series/name",
+			Life:        "dying",
  			Constraints: constraints.MustParse("arch=arm mem=1024M"),
  			Config: map[string]interface{}{
  				"hello": "goodbye",
@@ -49,7 +50,7 @@
  			},
  		},
  	},
-	json:  
`["service","change",{"CharmURL": "cs:series/name","Name":"Benji","Exposed":true,"Constraints":{"arch":"arm", "mem":  
1024},"Config": {"hello":"goodbye","foo":false}}]`,
+	json:  
`["service","change",{"CharmURL": "cs:series/name","Name":"Benji","Exposed":true,"Life":"dying","Constraints":{"arch":"arm", "mem":  
1024},"Config": {"hello":"goodbye","foo":false}}]`,
  }, {
  	about: "UnitInfo Delta",
  	value: params.Delta{

Revision history for this message

Madison Scott-Clary (makyo) wrote on 2013-04-17:

#

LGTM from #juju-gui on QA

https://codereview.appspot.com/8811043/

Revision history for this message

Tim Penhey (thumper) wrote on 2013-04-17:

#

LGTM - looks good to me.

https://codereview.appspot.com/8811043/

Revision history for this message

Madison Scott-Clary (makyo) wrote on 2013-04-17:

#

*** Submitted:

Add Life to Service API information

This is a branch from Francesco Banconi, submitted on his behalf. This
branch adds Life information to Service API calls for the GUI to consume
and use for making decisions regarding destroying services. This branch
was QA'd by members of #juju-gui earlier today, as well.

R=dfc, thumper
CC=
https://codereview.appspot.com/8811043

https://codereview.appspot.com/8811043/

juju-core

Merge lp://staging/~makyo/juju-core/service-life into lp://staging/~juju/juju-core/trunk

Commit message

Description of the change

Preview Diff

Subscribers