Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JUJU-180] Correct affected unit reporting in upgrade-series #13492

Merged
merged 2 commits into from
Nov 12, 2021
Merged

[JUJU-180] Correct affected unit reporting in upgrade-series #13492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4062fde
Fixes loop scoping in upgrade-series command so that we report only
manadart Nov 11, 2021
b192313
Adds test to ensure upgrade-series prompt only indicates subordinates on
manadart Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/juju/machine/upgradeseries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,13 @@ func (c *upgradeSeriesCommand) retrieveUnits() ([]string, error) {
var units []string
for _, application := range fullStatus.Applications {
for name, unit := range application.Units {
if unit.Machine == machineID {
units = append(units, name)
if unit.Machine != machineID {
continue
}
units = append(units, name)
for subName, subordinate := range unit.Subordinates {
if subordinate.Machine != "" && subordinate.Machine != machineID {
return nil, errors.Errorf("subordinate %q machine has unexpected instance id %s", subName, machineID)
return nil, errors.Errorf("subordinate %q machine has unexpected machine id %s", subName, machineID)
}
units = append(units, subName)
}
Expand Down
23 changes: 21 additions & 2 deletions cmd/juju/machine/upgradeseries_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,18 @@ func (s *UpgradeSeriesSuite) SetUpTest(c *gc.C) {
Applications: map[string]params.ApplicationStatus{
"foo": {
Units: map[string]params.UnitStatus{
"foo/1": {Machine: "1"},
"foo/2": {Machine: "2/lxd/0"},
"foo/1": {
Machine: "1",
Subordinates: map[string]params.UnitStatus{
"sub/1": {},
},
},
"foo/2": {
Machine: "2/lxd/0",
Subordinates: map[string]params.UnitStatus{
"sub/2": {},
},
},
},
},
},
Expand Down Expand Up @@ -218,6 +228,15 @@ func (s *UpgradeSeriesSuite) TestPrepareCommandShouldPromptUserForConfirmation(c
c.Assert(ctx.Stdout.(*bytes.Buffer).String(), jc.HasSuffix, "Continue [y/N]?")
}

func (s *UpgradeSeriesSuite) TestPrepareCommandShouldIndicateOnlySubordinatesOnMachine(c *gc.C) {
ctx, err := s.runUpgradeSeriesCommandWithConfirmation(c, "y", machineArg, machine.PrepareCommand, seriesArg)
c.Assert(err, jc.ErrorIsNil)

out := ctx.Stdout.(*bytes.Buffer).String()
c.Check(strings.Contains(out, "sub/1"), jc.IsTrue)
c.Check(strings.Contains(out, "sub/2"), jc.IsFalse)
}

func (s *UpgradeSeriesSuite) TestPrepareCommandShouldAcceptYesFlagAndNotPrompt(c *gc.C) {
ctx, err := s.runUpgradeSeriesCommandWithConfirmation(c, "n", machineArg, machine.PrepareCommand, seriesArg, "-y")
c.Assert(err, jc.ErrorIsNil)
Expand Down