From ad87834bda01d7dd6d1d2f1beb6190888d69b5b2 Mon Sep 17 00:00:00 2001
From: Luis Tomas Bolivar <ltomasbo@redhat.com>
Date: Fri, 8 Jul 2022 15:28:20 +0200
Subject: [PATCH] Fix pyroute2 import issue

Also use zed python jobs instead of xena

Change-Id: I3e8cdf0046ec561922d88e3e2f24254aa76b9f74
---
 ovn_bgp_agent/privileged/linux_net.py                 | 3 ++-
 ovn_bgp_agent/tests/unit/privileged/test_linux_net.py | 4 ++--
 test-requirements.txt                                 | 1 +
 zuul.d/project.yaml                                   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ovn_bgp_agent/privileged/linux_net.py b/ovn_bgp_agent/privileged/linux_net.py
index 15110458..a4a7564f 100644
--- a/ovn_bgp_agent/privileged/linux_net.py
+++ b/ovn_bgp_agent/privileged/linux_net.py
@@ -16,6 +16,7 @@ import ipaddress
 import os
 import pyroute2
 
+from pyroute2 import netlink as pyroute_netlink
 from pyroute2.netlink.rtnl import ndmsg
 from socket import AF_INET6
 
@@ -207,7 +208,7 @@ def delete_ip_rules(ip_rules):
                     r.remove()
             except KeyError:
                 LOG.debug("Rule {} already deleted".format(rule))
-            except pyroute2.netlink.exceptions.NetlinkError:
+            except pyroute_netlink.exceptions.NetlinkError:
                 # FIXME: There is a issue with NDB and ip rules deletion:
                 # https://github.com/svinota/pyroute2/issues/771
                 LOG.debug("This should not happen, skipping: NetlinkError "
diff --git a/ovn_bgp_agent/tests/unit/privileged/test_linux_net.py b/ovn_bgp_agent/tests/unit/privileged/test_linux_net.py
index 90ffbf1a..562b80e6 100644
--- a/ovn_bgp_agent/tests/unit/privileged/test_linux_net.py
+++ b/ovn_bgp_agent/tests/unit/privileged/test_linux_net.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import imp
-import pyroute2
+from pyroute2 import netlink as pyroute_netlink
 from socket import AF_INET6
 from unittest import mock
 
@@ -245,7 +245,7 @@ class TestPrivilegedLinuxNet(test_base.TestCase):
         rule0 = mock.MagicMock()
         self.fake_ndb.rules.__getitem__.side_effect = (
             KeyError('Limbo'),
-            pyroute2.netlink.exceptions.NetlinkError(123))
+            pyroute_netlink.exceptions.NetlinkError(123))
 
         ip_rules = {'10/128': {'table': 7, 'family': 'fake'},
                     '6/128': {'table': 10, 'family': 'fake'}}
diff --git a/test-requirements.txt b/test-requirements.txt
index f09cf7fd..dbf4eea1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,5 +7,6 @@ hacking>=3.0,<3.1 # Apache-2.0
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
+pyroute2>=0.6.4;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
 stestr>=1.0.0 # Apache-2.0
 testtools>=1.4.0 # MIT
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3986fcaf..44dd9760 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - openstack-cover-jobs