Merge lp://qastaging/~niedbalski/charm-helpers/lp1671861 into lp://qastaging/charm-helpers

Proposed by Jorge Niedbalski
Status: Merged
Merged at revision: 713
Proposed branch: lp://qastaging/~niedbalski/charm-helpers/lp1671861
Merge into: lp://qastaging/charm-helpers
Diff against target: 106 lines (+47/-16)
2 files modified
charmhelpers/contrib/network/ip.py (+32/-16)
tests/contrib/network/test_ip.py (+15/-0)
To merge this branch: bzr merge lp://qastaging/~niedbalski/charm-helpers/lp1671861
Reviewer Review Type Date Requested Status
Felipe Reyes (community) Approve
Review via email: mp+319595@code.qastaging.launchpad.net

Description of the change

Fix required for solving LP: #1671861.

- Extends the get_address_in_network function
to use a prefix when the netmask comes in the 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff::/128' format.

- Link-local and loopback addresses are skipped
- Added tests to validate the change.

To post a comment you must log in.
714. By Jorge Niedbalski

Additional fix

715. By Jorge Niedbalski

Additional fixes to the _get_address_from_network function

Revision history for this message
Felipe Reyes (freyes) wrote :

the tests are OK, and the code looks code to me.

I tested the code against my local ipv6 address and does the right thing detecting them.

Revision history for this message
Felipe Reyes (freyes) :
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