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.
Reviewed: https:/ /review. openstack. org/257904 /git.openstack. org/cgit/ openstack/ heat/commit/ ?id=ab3c5254349 3ec2aa7e1d9f8d1 89a62034f342b7
Committed: https:/
Submitter: Jenkins
Branch: stable/liberty
commit ab3c52543493ec2 aa7e1d9f8d189a6 2034f342b7
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 I289a88c1a9c335 1df976424504bc1 4a5ec878573
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: engine/ resources/ openstack/ neutron/ port.py
heat/
Also modified heat/tests/ neutron/ test_neutron_ port.py to make tests pass.
(cherry picked from commit 3a82e0cd59f8d4b b9308969109dead 0d7887c2f3) 1df976424504bc1 4a5ec878573)
(combined with review I289a88c1a9c335
Partial-Bug: #1514680 9703d30b7e42fd7 99cfb57e975
Change-Id: I0889ff8fc277dc