diff options
author | Vasyl Saienko <vsaienko@mirantis.com> | 2017-09-18 11:03:20 +0300 |
---|---|---|
committer | Vasyl Saienko <vsaienko@mirantis.com> | 2017-09-20 07:00:11 +0000 |
commit | 6bc46cc8a2ff90c4e76f853b570a613243daa2a2 (patch) | |
tree | ca1f9e5952cf4a6fa136982149284ff08ff4f385 /ironic/drivers/modules/network | |
parent | e35f230e1a9374cebd6aa43761da2a49e7d5c204 (diff) | |
download | ironic-6bc46cc8a2ff90c4e76f853b570a613243daa2a2.tar.gz |
Drop neutron masking exception in vif_attach
This patch drops masking exceptions when try to get physnets for
ports in vif_attach as neutron is mandatory when using flat, neutron
network interfaces.
Api tests were reworked 5cb1720b6e1f2f799a3282828c317f1ef29b2189 to use
real neutron port.
Change-Id: Ic1138e6da790bfe6903d13b548c230187b119a3d
Diffstat (limited to 'ironic/drivers/modules/network')
-rw-r--r-- | ironic/drivers/modules/network/common.py | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/ironic/drivers/modules/network/common.py b/ironic/drivers/modules/network/common.py index 6b4350bc8..39d9453d6 100644 --- a/ironic/drivers/modules/network/common.py +++ b/ironic/drivers/modules/network/common.py @@ -527,20 +527,7 @@ class NeutronVIFPortIDMixin(VIFPortIDMixin): # they will not affect the VIF to port mapping. physnets = set() if any(port.physical_network is not None for port in task.ports): - try: - physnets = neutron.get_physnets_by_port_uuid(client, vif_id) - except (exception.InvalidParameterValue, exception.NetworkError): - # TODO(mgoddard): Remove this except clause and handle errors - # properly. We can do this once a strategy has been determined - # for handling the tempest VIF tests in an environment that - # may not support neutron. - # NOTE(sambetts): If a client error occurs this is because - # either neutron doesn't exist because we're running in - # standalone environment or we can't find a matching neutron - # port which means a user might be requesting a non-neutron - # port. Assume no physical network information exists in these - # cases. - pass + physnets = neutron.get_physnets_by_port_uuid(client, vif_id) if len(physnets) > 1: # NOTE(mgoddard): Neutron cannot currently handle hosts which |