Import os-ken 2.8.1 source.

.zuul.yaml

@@ -6,8 +6,9 @@
       - check-requirements
     check:
       jobs:
-        - tempest-integrated-networking
-        - neutron-tempest-plugin-dynamic-routing
+        - neutron-ovs-tempest-dvr
+        - neutron-tempest-plugin-dynamic-routing:
+            voting: false
     gate:
       jobs:
-        - tempest-integrated-networking
+        - neutron-ovs-tempest-dvr

doc/source/test-vrrp.rst

@@ -104,7 +104,7 @@ And then run OSKen-VRRP::
 
 Here's the helper executable, os_ken-vrrp::
 
-    #!/usr/bin/env python
+    #!/usr/bin/env python3
     #
     # Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
     # Copyright (C) 2013 Isaku Yamahata <yamahata at valinux co jp>

os_ken/cmd/manager.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2011, 2012 Nippon Telegraph and Telephone Corporation.
 # Copyright (C) 2011 Isaku Yamahata <yamahata at valinux co jp>

os_ken/cmd/of_config_cli.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
 # Copyright (C) 2013 YAMAMOTO Takashi <yamamoto at valinux co jp>

os_ken/cmd/ofa_neutron_agent.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (C) 2014 VA Linux Systems Japan K.K.
 # All Rights Reserved.

os_ken/cmd/rpc_cli.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
 # Copyright (C) 2013 YAMAMOTO Takashi <yamamoto at valinux co jp>

os_ken/tests/integrated/common/docker_base.py

@@ -140,12 +140,12 @@ def sudo(self, cmd, capture=True, try_times=1, interval=1):
 
 
 class DockerImage(object):
-    def __init__(self, baseimage='ubuntu:16.04'):
+    def __init__(self, baseimage='ubuntu:20.04'):
         self.baseimage = baseimage
         self.cmd = Command()
 
     def get_images(self):
-        out = self.cmd.sudo('sudo docker images')
+        out = self.cmd.sudo('docker images')
         images = []
         for line in out.splitlines()[1:]:
             images.append(line.split()[0])
@@ -171,7 +171,7 @@ def create_quagga(self, tagname='quagga', image=None, check_exist=False):
         pkges = ' '.join([
             'telnet',
             'tcpdump',
-            'quagga',
+            'quagga-bgpd',
         ])
         if image:
             use_image = image
@@ -181,7 +181,13 @@ def create_quagga(self, tagname='quagga', image=None, check_exist=False):
         c << 'FROM %s' % use_image
         c << 'RUN apt-get update'
         c << 'RUN apt-get install -qy --no-install-recommends %s' % pkges
-        c << 'CMD /usr/lib/quagga/bgpd'
+        c << 'RUN echo "#!/bin/sh" > /bgpd'
+        c << 'RUN echo mkdir -p /run/quagga >> /bgpd'
+        c << 'RUN echo chmod 755 /run/quagga >> /bgpd'
+        c << 'RUN echo chown quagga:quagga /run/quagga >> /bgpd'
+        c << 'RUN echo exec /usr/sbin/bgpd >> /bgpd'
+        c << 'RUN chmod +x /bgpd'
+        c << 'CMD /bgpd'
 
         self.cmd.sudo('rm -rf %s' % workdir)
         self.cmd.execute('mkdir -p %s' % workdir)
@@ -213,8 +219,8 @@ def create_os_ken(self, tagname='os_ken', image=None, check_exist=False):
             # might fail if the current directory contains the symlink to
             # Docker host file systems.
             '&& rm -rf *.egg-info/ build/ dist/ .tox/ *.log'
-            '&& pip install -r tools/pip-requires -r tools/optional-requires',
-            '&& python setup.py install',
+            '&& pip install -r requirements.txt -r test-requirements.txt',
+            '&& pip install .',
         ])
         c << install
 

os_ken/tests/integrated/run_tests_with_ovs12.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");