Merge lp://qastaging/~hopem/charm-helpers/fix-lp1425999 into lp://qastaging/charm-helpers

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 327
Proposed branch: lp://qastaging/~hopem/charm-helpers/fix-lp1425999
Merge into: lp://qastaging/charm-helpers
Diff against target: 168 lines (+65/-15)
2 files modified
charmhelpers/contrib/database/mysql.py (+17/-12)
tests/contrib/database/test_mysql.py (+48/-3)
To merge this branch: bzr merge lp://qastaging/~hopem/charm-helpers/fix-lp1425999
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Review via email: mp+251158@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello Edward.

I found out that there is a few other places on which similar host<->ip logic
is being used. I just re-factored/moved this to the contrib.network.ip module, which
in my opinion is a better place for having this.

The proposal: https://code.launchpad.net/~niedbalski/charm-helpers/ip-host-translation/+merge/251189

I would suggest to review that and integrate your code according to the inline comment.

review: Needs Fixing
325. By Edward Hope-Morley

sync trunk

326. By Edward Hope-Morley

switch to ip.get_host_ip()

Revision history for this message
Edward Hope-Morley (hopem) wrote :

@jorge Fixed.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Hello Ed,

I fixed a few lint errors:

charmhelpers/contrib/database/mysql.py:3:1: F401 'socket' imported but unused
charmhelpers/contrib/database/mysql.py:17:1: F401 'WARNING' imported but unused
tests/contrib/database/test_mysql.py:72:66: W291 trailing whitespace

Merged.

Revision history for this message
Jorge Niedbalski (niedbalski) :
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