]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Only validate local_ip if using tunneling
authorJohn Schwarz <jschwarz@redhat.com>
Thu, 20 Aug 2015 14:05:02 +0000 (17:05 +0300)
committerJohn Schwarz <jschwarz@redhat.com>
Thu, 20 Aug 2015 15:09:53 +0000 (18:09 +0300)
commitb6fd5b9613203819d24a452df982a76c5e7d1daf
tree17816d43929b3023b8022b30638f4c8ed8f17b2d
parent194489b0f4885a2909333446a815896ea4d60320
Only validate local_ip if using tunneling

Change I4b4527c28d0738890e33b343c9e17941e780bc24 introduced a new
validation to make sure that local_ip holds a valid IP that is present
in one of the interfaces on the machine. However, this test is not
relevant if tunneling is not enabled, since the value is ignored anyway.

This patch changes validate_local_ip to not check local_ip in case
tunneling is not enabled (if no value was put in the 'tunnel_types'
option).

Change-Id: I07119341076573a4226b5ad998bdff09c021ae30
Closes-Bug: #1487053
Related-Bug: #1408603
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py