Comment 7 for bug 1514680

Reviewed: https://review.openstack.org/257904
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=ab3c52543493ec2aa7e1d9f8d189a62034f342b7
Submitter: Jenkins
Branch: stable/liberty

commit ab3c52543493ec2aa7e1d9f8d189a62034f342b7
Author: Steven Hardy <email address hidden>
Date: Mon Dec 14 22:15:38 2015 +0000

    Neutron port, tolerate switching network name/id

    It's valid to switch the network name for an ID referencing the
    same network, and vice-versa so allow that behavior when using the
    network property which can accept either name or ID.

    This has been squashed with I289a88c1a9c3351df976424504bc14a5ec878573
    to make backporting easier:

    Neutron port allow switching between network_id and network

    The network_id property is deprecated, so we should tolerate switching
    to the not-deprecated network property without replacing the port.

    Conflicts:
     heat/engine/resources/openstack/neutron/port.py

    Also modified heat/tests/neutron/test_neutron_port.py to make tests pass.

    (cherry picked from commit 3a82e0cd59f8d4bb9308969109dead0d7887c2f3)
    (combined with review I289a88c1a9c3351df976424504bc14a5ec878573)

    Partial-Bug: #1514680
    Change-Id: I0889ff8fc277dc9703d30b7e42fd799cfb57e975