Wrong uuid passed by disable_isolated_metadata_proxy

[Shih-Hao Li]

In DhcpAgent, when enable_isolated_metadata_proxy() spawns a metadata proxy agent for a network, it will pass router_id instead of network_id if metadata network is enabled and a router port is connected to this network.

Later, MetadataDriver will register this uuid (i.e. router_id) with monitor for the new metadata proxy process.

But when disable_isolated_metadata_proxy() destroys a metadata proxy agent for a network, it always passes network_id as the uuid. Thus MetadataDriver can not find the matching process. So the corresponding metadata proxy agent can not be destroyed.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/257593
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=5bd76c52844ffcfb2bd0ce1753b5159ef510b323
Submitter: Jenkins
Branch: master

commit 5bd76c52844ffcfb2bd0ce1753b5159ef510b323
Author: Shih-Hao Li <email address hidden>
Date: Wed Dec 30 11:43:23 2015 -0800

    Fix uuid passing in disable_isolated_metadata_proxy

    In DhcpAgent, when enable_isolated_metadata_proxy() spawns
    a metadata proxy agent for a network, it will pass router_id
    instead of network_id if metadata network is enabled and
    a router port is connected to this network.

    Later, MetadataDriver will register this uuid (i.e. router_id)
    with monitor for the new metadata proxy process.

    But when disable_isolated_metadata_proxy() destroys a metadata
    proxy agent for a network, it always passes network_id as the uuid.
    Thus MetadataDriver can not find the matching process. So the
    corresponding metadata proxy agent can not be destroyed.

    Closes-bug: #1526084
    Change-Id: Icab94f4e09e95fa6729c458522a3fe50e850a4be