/juju

MAAS Provider: Spaces and updated Subnets method #3834

Closed
wants to merge 96 commits into
from

Conversation

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

voidspace commented Nov 26, 2015

This PR adds Spaces to the networking environ interface with an implementation for MAAS. It also updates the Subnets method to use the new API, including space information, where available (MAAS 1.9+).

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

Michael Foord and others added some commits Nov 11, 2015

Implement SupportsSpaces for maas 1.9
e5102a7
Test
5ae27d7
Extended test
59581f4
Rename capability
f96b51a
Add server url back
83fd8cf
@jujubot
Merge pull request #3710 from voidspace/maas-spaces-supports-spaces 
Implement SupportsSpaces

If we're running on a version of MAAS with the "network-deployment-ubuntu" capability then we support spaces on MAAS.

(Review request: http://reviews.vapour.ws/r/3116/)
a4c7b84
Properly check result of calling SupportsSpaces
e82fbcc
Remove unneeded logging
f44f53a
@jujubot
Merge pull request #3719 from voidspace/maas-spaces-supports-spaces-2 
apiserver correctly checks the result of calling SupportsSpaces

Correct a bug in the apiserver to correctly check the result of calling SupportsSpaces.

(Review request: http://reviews.vapour.ws/r/3125/)
f0a1fc3
Skeleton method
93400db
Make function a method
d3247ff
Merge remote-tracking branch 'upstream/maas-spaces' into maas-spaces-… 
…new-subnets
8bc5f18
Code factoring
f33a15f
Build subnets
ceae9d2
Type correction
e52f466
Match subnets and nodes
e07e7ef
Skeleton function to deduce allocatable bounds from subnet
176cb30
Calculate the allocatable portion of the subnet
99c87e4
Populate allocatable bounds of subnets
42a721e
Tweak bounds
14425be
Add logging
b47a77c
Translate maas space names to Juju names, add SpaceProviderId to Subn… 
…etInfo, correctly filter by subnet id in the new subnet code
4c58cb3
Basic skeleton of provider Spaces method
3e178b7
Use node api to get subnet info
2278dbd
Correction
29873ff
More corrections
3221501
Implemented spaces constraints and initial interface bindings handlin… 
…g for node selection
e392d55
Keep JSONObject instead of fetching map
dc27f2c
Changes after review
fa14b62
Fixed imports ordering
01ddaeb
@jujubot
Merge pull request #3759 from dimitern/maas-spaces-new-constraints 
Added support for spaces constraints and interface bindings for node selection

Refactored code around selectNode / acquireNode / convertConstraints and
moved it in a separate file, and same for the related tests.

Now "networks" and "not_networks" arguments are formatted to include
positive or negative spaces (using the new syntax - "space:<name>").
Initial support for handling interface bindings is also in place, but
it's only unit tested for now.

Live tested on MAAS, in addition to the unit tests:
```
$ juju bootstrap
$ juju space create public-api
$ juju space create compute-external
$ juju add-machine --constraints spaces=public-api
$ juju add-machine --constraints spaces=^compute-external
```

Both of the above worked as expected, provided the spaces were created
on MAAS and (for the time being, manually) on Juju.

(Review request: http://reviews.vapour.ws/r/3167/)
d3e273c
Better implementation of fetching subnets filtered by node and subnet id
eca66e7
Implementation of Spaces for maas provider
2731837
Type change
d65ec0d
Merge remote-tracking branch 'upstream/maas-spaces' into maas-spaces-… 
…list-spaces
f3a6581
Comment updates
8270cd6
Add skeleton spaces method to dummy environ
1de2016
Skeleton method
f547cc7
Make function a method
5d8251e
Code factoring
81b9134
Build subnets
9e84707
Type correction
2c08e29
Match subnets and nodes
24a0518
Skeleton function to deduce allocatable bounds from subnet
8e30ebf
Calculate the allocatable portion of the subnet
440d569
Populate allocatable bounds of subnets
a6e012f
Tweak bounds
9d454c8
Add logging
f17ba50
Translate maas space names to Juju names, add SpaceProviderId to Subn… 
…etInfo, correctly filter by subnet id in the new subnet code
31956be
Basic skeleton of provider Spaces method
b130c66
Use node api to get subnet info
48530eb
Correction
4fb6302
More corrections
62e13f2
Keep JSONObject instead of fetching map
bd10ddf
Better implementation of fetching subnets filtered by node and subnet id
0759afb
Implementation of Spaces for maas provider
64e4950
Type change
1515ee6
Comment updates
727b503
Add skeleton spaces method to dummy environ
5ad8d67
Merge remote-tracking branch 'origin/maas-spaces-list-spaces' into ma… 
…as-spaces-list-spaces
fd6a9a5
Skeleton test and bug fix
308d973
Minor test updates
adca700
Use the correct op for finding the dynamic range
2f94a98
Test Extension
8330dc8
Work around copying issue
69be71f
Test extension
7eeaf50
Remove unneeded code
30333f3
New test and bug fix
885b1c4
More bug fixes
962559f
Test extension
b32c070
Test fix
fef9796
Merge and test fix
faad1b5
Remove workaround
cda1211
Start working with ranges
7365f1b
Test tweak
d14d02c
Test extension
a761af4
Test fix
0470211
Test with fix for bug ituncovered
b1c7503
Test space name conversion
4328f2d
Test error condition
37baa61
Extra test
ebd6334
Updated for new api
a20a9c8
Test updates and fixes
a6a1392
Minor test update
971563a
Remove space name conversion
8ee1368
Test fixes
1926fac
Minor tweaks from review
094217a
More minor tweaks
37ef14c
More tweaks
72cc787
Simplify tests with a helper
3edda3c
Factor out common code
cd6a549
Improved error message
a9d5f1e
Minor tweaks
6fb0698
Extract helper
e63707e
TODO added
4d583c0
Update dependencies
3f45ca0

@voidspace voidspace closed this Nov 30, 2015

@voidspace voidspace deleted the voidspace:maas-spaces-list-spaces branch Oct 6, 2016

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