/juju

Merge maas-spaces into master #4392

Merged
merged 370 commits into from Feb 11, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@dimitern @frobware @sinzui @cherylj @jujubot @dooferlad
@dimitern
Contributor

dimitern commented Feb 11, 2016

We had a Blessed build for both master and maas-spaces and last few CI runs seem to indicate similar reliability of both branches, I think it's time to merge now.

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

Michael Foord and others added some commits Dec 16, 2015

Add SupportsSpaceDiscovery to dummy provider
34e6a63
Skeleton test
9bda5f1
Test fix
b213cbc
Fix import ordering and add comment
9dc0f93
Add worker to list of singular workers
a57243d
@jujubot
Merge pull request #3976 from frobware/maas-spaces-multi-bridge-script 
maas: add a bridge to all active interfaces

Reworked the bridge script so that all active interfaces get bridged. An
'active' interface is one that has both an 'auto' stanza and whose
'iface' method is either 'dhcp' or 'static'.

To avoid any clashes a prefix ('juju-br-') is added to device names that
become bridges; this allows for 'juju-br-eth0' and 'juju-br-bond0'.
Sticking to the old format we would end up with 'juju-br0' for both
'eth0' and 'bond0'.

I'm landing this change so that the script itself can have some exposure
on the maas-spaces branch. A subsequent PR will follow that ensures LXC
configurations are updated to include network entries for each active
interface.

The script is aware of bonds, VLANs and aliases.

(Review request: http://reviews.vapour.ws/r/3398/)
31f0ad2
maas: add bridge script using AddBootTextFile() 
Add the python-based bridge script to the node using AddBootTextFile().

This is written as /tmp/add-juju-bridge.py. The run commands that use
this script are bracketed by calls that check for its existence. Ala:

  trap 'rm -f /tmp/add-juju-bridge.py' EXIT

  if [ -f /tmp/add-juju-bridge.py ]; then
     /tmp/add-juju-bridge.py ...
  fi

And the script itself is deleted once it has run once as it is not
idempotent; the script is expected to run once against the
machine-generated /etc/network/interfaces from curtin and MAAS.

This change no longer requires that the python script be encapsulated as
a bash 'here doc' which removes issues with quoting and various other
characters such as embedded "\n". And because it is no longer a 'here
doc' the script is no longer echoed to the console when cloud-init runs
during node deployment.
8039a95
@jujubot
Merge pull request #3987 from voidspace/maas-spaces-networking-api3 
Discover spaces and subnets on bootstrap

Merge of WIP branch.

(Review request: http://reviews.vapour.ws/r/3409/)
3b22163
Address review comments
824c18b
Simplify repeated arg in fmt.Sprintf
2185345
@dooferlad
Tests and fixes
b596ff7
@jujubot
Merge pull request #3992 from frobware/maas-spaces-add-bridge-script-… 
…using-AddBootTextFile

maas: add bridge script using AddBootTextFile()

Add the python-based bridge script to the node using AddBootTextFile().

This is written as /tmp/add-juju-bridge.py. The run commands that use
this script are bracketed by calls that check for its existence. Ala:

  trap 'rm -f /tmp/add-juju-bridge.py' EXIT

  if [ -f /tmp/add-juju-bridge.py ]; then
     /tmp/add-juju-bridge.py ...
  fi

And the script itself is deleted once it has run once as it is not
idempotent; the script is expected to run once against the
machine-generated /etc/network/interfaces from curtin and MAAS.

This change no longer requires that the python script be encapsulated as
a bash 'here doc' which removes issues with quoting and various other
characters such as embedded "\n". And because it is no longer a 'here
doc' the script is no longer echoed to the console when cloud-init runs
during node deployment.

(Review request: http://reviews.vapour.ws/r/3414/)
010d9c1
@jujubot
Merge pull request #3993 from dooferlad/uniter-network-config 
Uniter network config

Add the NetworkConfig API call to the Uniter.

(Review request: http://reviews.vapour.ws/r/3415/)
b1e21e1
Check for existing subnets in worker
73e140c
Correct api method name
f98fc5d
Comment
6c2d5f1
Change log level
89e875e
@jujubot
Merge pull request #3997 from voidspace/maas-spaces-networking-api4 
Skips subnets we already know about

Fixes error when worker is restarted and attempts to re-create subnets that already exist.

(Review request: http://reviews.vapour.ws/r/3419/)
fe79af4
Added SpaceName to network.Address, fixed tests
92a05cd
maas: instance.Addresses() now includes spaces for each address, if a… 
…vailable
4b945d2
use default space to select API/mongo endpoint
f0b308a
Modified uniter NetworkConfig API to work properly
c1d2277
network-get minimal implementation done and barely tested
063160a
endpoint bindings now passed to StartInstance and used in maas
6a1ba20
Changes after review
9c693e0
Changes after second review
04cc631
Test ListSpaces
a9980c8
Test AddSubnets api
0124611
Test CreateSpaces
7b4befe
Added a TODO about SelectControllerAddress
ce1db03
@jujubot
Merge pull request #4037 from voidspace/maas-spaces-networking-api5 
Tests for discoverspaces api

Add tests for discoverspaces api.

(Review request: http://reviews.vapour.ws/r/3456/)
455452f
Added LKK card link to the last TODO
4601152
@jujubot
Merge pull request #4029 from dimitern/maas-spaces-network-get-min 
Minimal working implementation on network-get hook tool on MAAS

Tested with a couple of simple charms based on the ubuntu charm, but with
a few relations, which can be bound to spaces and later the addresses we
get from network-get within each relation are logged.

Key changes:
 * network.Address, params.Address, and state.address now have SpaceName added.
 * instance.Addresses() in MAAS parse the interface_set map and return the space
   each IP is bound to (according to the links of each interface).
 * state/API endpoints now are selected first from the default space, if possible,
   which solves the problems with non-deterministic address picking and sorting.
   As a fallback, the old approach with scopes + sorting is used.
 * StartInstance() now includes EndpointBindings map, populated by the provisioner
   with all bindings from all services which have units assigned to the machine we're
   about to provision. This also takes full advantage of the "interfaces=" argument
   in MAAS (acquireNode) for bindings.

Next step should be to do the multi-NIC containers in a simplified way.

(Review request: http://reviews.vapour.ws/r/3448/)
f21d00a
Initial test for networking common spaces code
8409536
Test extension
d3b0ce6
Further testing of SupportsSpaces
9b57d82
Add ProviderId test
b65c906
Year correction
6599f4e
Adding skeleton subnets tests
a8f044c
Merge remote-tracking branch 'upstream/maas-spaces' into maas-spaces-… 
…networking-api6
dad6d37
Adding formatting directive
c5e4bdd
Review comments
080e800
Merge branch 'maas-spaces-networking-api6' into maas-spaces-networkin… 
…g-api7
e3bae77
Test improvements
e905811
@jujubot
Merge pull request #4038 from voidspace/maas-spaces-networking-api6 
Tests for common spaces code

Add tests for apiserver/common/networkingcommon/spaces.

(Review request: http://reviews.vapour.ws/r/3457/)
40e2b03
Skip re-registering provider
1b5fb9c
Moar line wrapping
e39bccf
Merge remote-tracking branch 'upstream/maas-spaces' into maas-spaces-… 
…networking-api8
c1f4329
@jujubot
Merge pull request #4044 from voidspace/maas-spaces-networking-api7 
Test common subnets code

Add tests for apiserver/common/commonnetworking/subnets.

(Review request: http://reviews.vapour.ws/r/3463/)
bc59835
Added better parsing for interfaces and simple tests
12ad8a1
Moved legacy NetworkInterfaces() implementation details to interfaces.go
1cfe6db
Moved common helpers to providerSuite
eb7ad5e
Simplified a couple of places to use cached API capabilities
cd4abf5
Extra whitespace dropped
0ec2cd0
Moved legacy NetworkInterfaces()-related tests to interfaces_test.go
a785ee0
Implemented NetworkInterfaces() and a simple test for it, using the n… 
…ew API
3082395
Added NewAddressOnSpace and a test for it
98e6084
Added NewAddressesOnSpace as well, improved tests
85d6750
Added SpaceName at the end of the address string representation, if n… 
…on-empty
f2af612
Finished new API NetworkInterfaces() implementation and tests
c1bafc2

Michael Foord and others added some commits Feb 4, 2016

Function rename
3de726f
Test helper renamed
b120a2c
Comment moved
fd49f69
@jujubot
Merge pull request #4293 from voidspace/maas-spaces-no-networking-test 
Test space discovery on providers without NetworkingEnviron support

Test space discovery correctly closes the channel (completes) on providers without NetworkingEnviron support.

(Review request: http://reviews.vapour.ws/r/3735/)
3ca20e5
Only set the discovery channel once and protect access to it with a m… 
…utex
f216d90
Test discovery completes even if worker restarts
a4b9a95
Test refactoring
d3f0500
@jujubot
Merge pull request #4311 from voidspace/maas-spaces-discovery-mutex 
Make the space discovery worker safe to be restarted

Ensure there is only a single space discovery channel, so if the discovery worker is restarted the API is left unblocked.

(Review request: http://reviews.vapour.ws/r/3753/)
8fa48a3
Resolved conflicts from master merge
4725d89
Added back the only few lines lost in the merge from master
a994e91
Fixed bindings test after master merge
090123d
@jujubot
Merge pull request #4316 from dimitern/maas-spaces-merge-master-1cd7ac8c 
Merge master into maas-spaces
9b5fae7
Merged master at 7ce3bf9
5482aa6
Fixed a test after merge
c5cbc4c
@jujubot
Merge pull request #4327 from dimitern/maas-spaces-merge-master-7ce3bf9 
Merge master @ 7ce3bf9 into maas-spaces
f0184bb
Add ProviderId to network.Address
cb37ccb
Add minor tests for SpaceProviderId
3fc34f8
Added SpaceProviderId to String output
734b9fe
@jujubot
Merge pull request #4352 from voidspace/maas-spaces-address-provider-id 
Add SpaceProviderId to network.Address

Precursor to using space provider id instead of name in MAAS provider.

(Review request: http://reviews.vapour.ws/r/3796/)
d036eef
apiserver/provisioner: Simplified a couple of tests, extracted Provis… 
…ioningInfo code and tests in separate files
2976629
juju/testing: added AddTestingServiceWithBindings, dropped AddTesting… 
…ServiceWithNetworks
e874d88
apiserver/provisioner: Added minimal test for ProvisioningInfo with E… 
…ndpointBindings
3dca404
state: Changed bindings tests to accept empty spaces as valid and mis… 
…sing bindings as defaults
6e3ff05
state: All assumptions about endpoint bindings changed in tests
162979e
state: Endpoint bindings now handled as expected in tests
e04dab3
apiserver/provisioner: no more network.DefaultSpace for bindings
fb922d5
apiserver/service: no more network.DefaultSpace in tests for unspecif… 
…ied bindings
4edab94
juju: DeployService populates incompletely specified bindings
b6c3c3b
cmd/juju/service: Added tests for deploying charm with bindings (not … 
…just bundle)
4f6681f
api[server]/uniter: Use machine private address for unspecified endpo… 
…ints; added more tests
e641f72
apiserver/uniter: fixed a go vet issue
fae506d
service/windows: Fixed a go vet warning
095df83
apiserver/provisioner: Added bugs/LKK card links to a few TODOs
6b964c8
@jujubot
Merge pull request #4331 from dimitern/maas-spaces-optional-bindings 
Make service endpoint bindings optional and drop network.DefaultSpace dependency

RB link: http://reviews.vapour.ws/r/3773/
63dc698
Merge branch 'master' into maas-spaces-merge-master-2c11d4b
fe38916
@jujubot
Merge pull request #4367 from dimitern/maas-spaces-merge-master-2c11d4b 
Merge master @ 2c11d4b into maas-spaces
9305acc
state: Refactored and extended spaces tests to set expected behavior
d5ff47b
state: Space.ProviderId now unique per model (when set)
d7cd4c2
state: Fixed EnsureDead, Remove, and Refresh for spaces
100ed7f
state: Fixed an import in spaces and dropped a TODO in tests
88178e5
state: Refactored and simplified Subnet tests, while adding more case… 
…s for the expected behavior
0fd5b56
state: EnsureDead and Remove for subnets fixed to match test expectat… 
…ions
c994bc5
state: Fixed a few typos in spaces tests
08c5dcc
state: Moved NewStateForModelNamed to ConnSuite to allow its reuse
f06d9a1
state: Added cross-model tests for subnets, similar to those for spaces
65830a5
state: Subnet IDs and ProviderId now unique per model, like for spaces
ed2fd14
@jujubot
Merge pull request #4354 from dimitern/maas-spaces-state-fix-spaces-s… 
…ubnets

Allow state.Space and Subnet with duplicate ProviderIds across models

Needed to allow discoverspaces to work in models other than the
controller model.

Also includes some improvements to tests.

(Review request: http://reviews.vapour.ws/r/3798/)
4dba9fb
Merge branch 'master' into maas-spaces-merge-master-c215028
30a808f
@jujubot
Merge pull request #4386 from dimitern/maas-spaces-merge-master-c215028 
Merge master @ c215028 into maas-spaces

Hopefully for the last time..

(Review request: http://reviews.vapour.ws/r/3829/)
f4de48d
@dimitern
Contributor

dimitern commented Feb 11, 2016

I'll check back later tonight to see if there are any replies
@frobware
Contributor

frobware commented Feb 11, 2016

@dimiter - sinzui is preparing a PR, so check with him first.
@sinzui
Contributor

sinzui commented Feb 11, 2016

We can see this revision is blessed
http://reports.vapour.ws/releases/3597

There are no open bugs
https://bugs.launchpad.net/juju-core/maas-spaces
@cherylj

cherylj commented Feb 11, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Feb 11, 2016

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

jujubot commented Feb 11, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/6352
@cherylj

cherylj commented Feb 11, 2016

$$JFDI$$
@jujubot
Contributor

jujubot commented Feb 11, 2016

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

jujubot added a commit that referenced this pull request Feb 11, 2016

@jujubot
Merge pull request #4392 from juju/maas-spaces 
Merge maas-spaces into master

We had a Blessed build for both master and maas-spaces and last few CI runs seem to indicate similar reliability of both branches, I think it's time to merge now.

(Review request: http://reviews.vapour.ws/r/3834/)
4ccd006

@jujubot jujubot merged commit 4ccd006 into master Feb 11, 2016

@frobware frobware deleted the maas-spaces branch Feb 16, 2016

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