From 8d442657363dc54a236b41cd651849ac42a9bf47 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 24 Feb 2021 16:54:42 +0100 Subject: [PATCH] Remove try block from privileged ip_lib module It was marked that this try..except.. block can be removed when we will be using pyroute2 >= 0.5.13. Now we have 0.5.13 in the lower-constraints already so it's time to remove it. Change-Id: Ic15361e34a2a9c371954d2f0851d230b8f9feb1f --- neutron/privileged/agent/linux/ip_lib.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/neutron/privileged/agent/linux/ip_lib.py b/neutron/privileged/agent/linux/ip_lib.py index 0b5b2fbf097..bb5404db55f 100644 --- a/neutron/privileged/agent/linux/ip_lib.py +++ b/neutron/privileged/agent/linux/ip_lib.py @@ -241,12 +241,7 @@ def _translate_ip_device_exception(e, device=None, namespace=None): def get_link_id(device, namespace, raise_exception=True): with get_iproute(namespace) as ip: - # TODO(ralonsoh): remove try block when the mininimum pyroute2 version - # is >= 0.5.13 - try: - link_id = ip.link_lookup(ifname=device) - except NetlinkError: - link_id = None + link_id = ip.link_lookup(ifname=device) if not link_id or len(link_id) < 1: if raise_exception: raise NetworkInterfaceNotFound(device=device, namespace=namespace)