Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
state: Model migration for sla and meter status #7128
+72
−1
Conversation
|
!!build!! |
cmars
reviewed
Mar 20, 2017
Looks good so far... will need a rebase on #7120 fixes & dependencies updated to include juju/description#5.
| default: | ||
| - return errors.Errorf("invalid meter status %q", code) | ||
| + return MeterNotAvailable, errors.Errorf("invalid meter status %q", codeStr) |
cmars
Mar 20, 2017
Owner
I think I mentioned this in #7120... add a test (can be a mock) where this happens in the juju status cmd above.
| + c.Assert(err, jc.ErrorIsNil) | ||
| + newModel, newSt := s.importModel(c) | ||
| + | ||
| + c.Assert(newModel.SLALevel(), gc.Equals, "essential") |
howbazaar
Mar 20, 2017
Owner
How can this be passing when the juju/description code does not deserialize the SLA?
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
|
Build failed: Generating tarball failed |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
jujubot
merged commit fd05ac7
into
juju:rising-sun
Mar 23, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
mattyw commentedMar 20, 2017
•
Edited 1 time
-
mattyw
Mar 22, 2017
Also depends on juju/description#5
Description of change
Adds model migration for slas and meter status.
QA steps
Documentation changes
The SLA feature needs documenting. The model migration support is part of that feature, however it should be invisible to the user
Bug reference
n/a