Merge lp://staging/~sinzui/juju-ci-tools/xenial-network into lp://staging/juju-ci-tools

Proposed by Curtis Hovey
Status: Merged
Merged at revision: 1791
Proposed branch: lp://staging/~sinzui/juju-ci-tools/xenial-network
Merge into: lp://staging/juju-ci-tools
Diff against target: 40 lines (+19/-1)
2 files modified
assess_container_networking.py (+3/-1)
tests/test_assess_container_networking.py (+16/-0)
To merge this branch: bzr merge lp://staging/~sinzui/juju-ci-tools/xenial-network
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+312507@code.staging.launchpad.net

Description of the change

allow container networking tests of xenial

The container networking tests fail on xenial because the rules parse the device of the private IP fail. The rules assume the device is the last word in the output and we have a test for this case. But xenial's ip will include the next hop flag ("onlink") after the device. A better way to find the device is to look for the word after "dev", which clearly indicats which words is the device.

Container networking was broken by a bad lxd package The fix has arrived in xenial and we want to test it. I plan to keep the maas 1.9 test using trusty, the maas 2.x tests will switch to xenial.

To post a comment you must log in.
1789. By Curtis Hovey

Fix comment.

Revision history for this message
Martin Packman (gz) wrote :

Looks good, thanks for test with real input values. Do we maybe want to run it past Andy tomorrow in case we're missing other corner cases?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches