Merge lp://qastaging/~e0ne/nova/associate-address-fix into lp://qastaging/~hudson-openstack/nova/trunk

While you're fixing the code, you should probably move the call to context.get_admin_context() outside of the loop. No need to run it several times.

> While you're fixing the code, you should probably move the call to
> context.get_admin_context() outside of the loop. No need to run it several
> times.

Thanks for review. It's a good point to move move the call to context.get_admin_context() outside of the loop. I'm newbie in this project so I tried to do less changes in the code.

I've moved tho call to context.get_admin_context() outside of the loo

lgtm

Code changed to use netaddr instead of IPy. This patch needs to be updated

also you will need to add a name and email to Authors and also a mailmap mapping
e0ne@e0ne-vm to the email address.

> also you will need to add a name and email to Authors and also a mailmap
> mapping
> e0ne@e0ne-vm to the email address.

Done

> Code changed to use netaddr instead of IPy. This patch needs to be updated
Code was updated

This looks good.

Added Masanori Itoh as another reviewer, so that we confirm this fixes the bug for him

Otherwise looks ok to me.

Looks good.

Attempt to merge into lp:nova failed due to conflicts:

text conflict in .mailmap
text conflict in bin/nova-manage

> Attempt to merge into lp:nova failed due to conflicts:
>
> text conflict in .mailmap
> text conflict in bin/nova-manage

Conflicts are resolved.

unfortunately you made the fixes as:
ikolodyazhny@ikolodyazhny-laptop

you either need to add that address to .mailmap or redo the merge with a known email