/juju

Import storage review fixes #7646

Merged
merged 2 commits into from Jul 18, 2017

Conversation

Reviewers

@babbageclunk babbageclunk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @jujubot @babbageclunk
@axw
Member

axw commented Jul 18, 2017

Description of change

Address review comments on #7644.

  • Rename State.ImportFilesystem to State.AddExistingFilesystem. Separate validation into another function.
  • Rename api/storage's Client.ImportStorage to Client.Import, and add unit tests.

QA steps

Non-functional change. Check it builds and tests pass.

Documentation changes

None.

Bug reference

None.

axw added some commits Jul 18, 2017

@axw
state: s/ImportFilesystem/AddExistingFilesystem/ 
Also, move validation logic into a separate function.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
5763ad3
@axw
api/storage: add test; s/ImportStorage/Import/ 
Rename ImportStorage to Import, to be less
stuttery; introduce an adapter in the CLI
code. Add a test for the new API client
method.
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
6f1f95d
@babbageclunk

babbageclunk approved these changes Jul 18, 2017
View changes

Thanks!

@axw
Member

axw commented Jul 18, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Jul 18, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@jujubot jujubot merged commit 697a10e into juju:develop Jul 18, 2017
1 check failed

1 check failed

github-check-merge-juju Ran tests against PR. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

@nskaggs nskaggs referenced this pull request Jul 18, 2017

Merged

Revert "Import storage review fixes" #7651

jujubot added a commit that referenced this pull request Jul 18, 2017

@jujubot
Merge pull request #7651 from juju/revert-7646-import-storage-review-… 
…fixes

Revert "Import storage review fixes"

Reverts juju/juju#7646. This PR has a broken unit test, preventing landing.

github.com/juju/juju/apiserver/facades/client/storage fails very often, though it didn't fail on landing.
edf17fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment