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.

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

Import storage review fixes #7646

Merged
merged 2 commits into from Jul 18, 2017
Merged

Conversation

axw
Copy link
Contributor

@axw 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 2 commits July 18, 2017 09:37
Also, move validation logic into a separate function.
Rename ImportStorage to Import, to be less
stuttery; introduce an adapter in the CLI
code. Add a test for the new API client
method.
Copy link
Contributor

@babbageclunk babbageclunk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@axw
Copy link
Contributor Author

axw commented Jul 18, 2017

$$merge$$

@jujubot
Copy link
Collaborator

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
jujubot added a commit that referenced this pull request Jul 18, 2017
…fixes

Revert "Import storage review fixes"

Reverts #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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants