Floating ip association and deletion not working in certain scenarios for Nuage plugin

[Sayaji Patil]

In certain scenarios explained below, floating ip association
and deletion does not work correctly

1) Create a neutron port and assign a floating ip to it. Now boot
     a vm using the neutron port. The vm boots correctly but
     the floating ip is not assigned to the vm.

2) Boot a vm and assign a floating ip to it. Now delete the
     floating ip. The floating ip is disassociated from the vm
     and deleted from neutron but is not deleted from Nuage
     VSD.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/110742

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/110742
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=62317a159ad98ef9ba5208f2fa7708a88692c46f
Submitter: Jenkins
Branch: master

commit 62317a159ad98ef9ba5208f2fa7708a88692c46f
Author: Sayaji <email address hidden>
Date: Wed Jul 30 11:06:59 2014 -0700

    Fix for floating ip association and deletion

    Added code to associate fip to a vm in VSD, if
    the fip was already associated with the vm port
    in Neutron. Also added code in fip deletion,
    to get the correct router id based on the check
    if the fip is associated to a Neutron port or
    not.
    Closes-Bug: #1350469
    Change-Id: I1aa24f420f656043086a4f501b15722216b843e9