Fix pyroute2 import issue

Also use zed python jobs instead of xena

Change-Id: I3e8cdf0046ec561922d88e3e2f24254aa76b9f74

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 "

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'}}

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

zuul.d/project.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-xena-jobs
+      - openstack-python3-zed-jobs
       - openstack-cover-jobs