/juju

Implement Storage for MAAS 2 #5070

Closed
wants to merge 13 commits into
from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@babbageclunk @jujubot
@babbageclunk
Member

babbageclunk commented Apr 11, 2016

Rename maasStorage to maas1Storage and add maas2Storage built on top of the gomaasapi Files interfaces.

I shared the implementation of RemoveAll between the two storage versions since it was written completely in terms of storage.Storage operations.

(Review request: http://reviews.vapour.ws/r/4513/)

babbageclunk added some commits Apr 7, 2016

@babbageclunk
Implement Storage for MAAS 2 
Renamed maasStorage to maas1Storage and added maas2Storage as a new
storage.Storage on top of the gomaasapi Files interfaces.
64aacd4
@babbageclunk
Merge remote-tracking branch 'upstream/maas2' into maas2-storage
7c49714
@babbageclunk
Update gomaasapi dependency and fix merge errors
2941dc4
@babbageclunk
Add fakeFile to fake controller 
Scaffolding for tests for maas2Storage.
c5c139f
@babbageclunk
Simplified test construction 
We almost always want to inject a fakeController into the environment,
so pass it in to suite.makeEnviron.
0c62e8b
@babbageclunk
Move maas2 environ testing stuff into maas2_test 
So I can use it in maas2storage_test.
03482b0
@babbageclunk
Tests for Get, List and URL 
Next up: Put, Remove and RemoveAll.
1242f8d
@babbageclunk
Simplify tests 
Don't get the controller out with awkward casting, hang on to the
original reference.
31136d9
@babbageclunk
Test for Put
6bd23fd
@babbageclunk
Merge remote-tracking branch 'upstream/master' into maas2-storage
e601795
@babbageclunk
Tests for Remove and RemoveAll
78edaa4
@babbageclunk
Merge remote-tracking branch 'upstream/master' into maas2-storage 
Fixed some conflicts where voidspace had changed functions that I had
moved.
50f6290
@babbageclunk
Review change 
Raise a nice clear error rather than panicking if the test setup is wrong.
ecec314
@babbageclunk
Member

babbageclunk commented Apr 11, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Apr 11, 2016

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

jujubot commented Apr 11, 2016

Build failed: Does not match ['fixes-1568312']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/7304

@babbageclunk babbageclunk referenced this pull request Apr 12, 2016

Merged

Implement Storage for MAAS 2 #5093

@babbageclunk
Member

babbageclunk commented Apr 12, 2016

While Juju master is blocked landing this against the next branch instead. #5093

@babbageclunk babbageclunk closed this Apr 12, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment