Merge pull request #3 from faucetsdn/os-ken-2.6.0

Import os-ken 2.6.0 source.

.gitignore

@@ -24,7 +24,6 @@ cover/
 .coverage*
 !.coveragerc
 .tox
-nosetests.xml
 .testrepository
 .stestr
 .venv

.zuul.yaml

@@ -1,7 +1,6 @@
 - project:
     templates:
-      - openstack-lower-constraints-jobs
-      - openstack-python3-yoga-jobs
+      - openstack-python3-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - check-requirements

debian/changelog

@@ -1,3 +1,47 @@
+python-os-ken (2.5.0-0ubuntu3) kinetic; urgency=medium
+
+  * d/py3dist-overrides: Add ncclient to ensure dh_python3 does not
+    add python3-ncclient to Depends.
+
+ -- Corey Bryant <[email protected]>  Tue, 13 Sep 2022 12:14:07 -0400
+
+python-os-ken (2.5.0-0ubuntu2) kinetic; urgency=medium
+
+  * d/control: Move python3-ncclient to Suggests until in main.
+
+ -- Corey Bryant <[email protected]>  Tue, 13 Sep 2022 12:02:45 -0400
+
+python-os-ken (2.5.0-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release for OpenStack Zed.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/rules: Switch to stestr inline with upsream.
+
+ -- Corey Bryant <[email protected]>  Thu, 08 Sep 2022 19:44:39 -0400
+
+python-os-ken (2.4.0-0ubuntu1) kinetic; urgency=medium
+
+  * New upstream release for OpenStack Zed.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Switch to debhelper compat 13.
+  * d/control: Update standards version to 4.6.1.
+
+ -- Corey Bryant <[email protected]>  Tue, 31 May 2022 15:24:15 -0400
+
+python-os-ken (2.3.1-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release for OpenStack Yoga.
+
+ -- Corey Bryant <[email protected]>  Wed, 02 Mar 2022 14:28:04 -0500
+
+python-os-ken (2.3.0-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release for OpenStack Yoga.
+  * d/control: Align (Build-)Depends with upstream.
+  * d/control: Bump debhelper compat to 13.
+
+ -- Corey Bryant <[email protected]>  Wed, 01 Dec 2021 15:29:06 -0500
+
 python-os-ken (2.1.0-0ubuntu1) impish; urgency=medium
 
   * New upstream release for OpenStack Xena.

debian/control

@@ -12,7 +12,7 @@ Build-Depends:
  python3-sphinx (>= 2.0.0),
 Build-Depends-Indep:
  python3-coverage,
- python3-eventlet (>= 0.22.0),
+ python3-eventlet (>= 0.25.1),
  python3-hacking,
  python3-mock (>= 2.0.0),
  python3-msgpack (>= 1.0.0),
@@ -22,27 +22,29 @@ Build-Depends-Indep:
  python3-openvswitch (>= 2.8.0),
  python3-oslo.config (>= 1:5.1.0),
  python3-oslotest (>= 1:3.2.0),
+ python3-packaging (>= 20.3),
  python3-pycodestyle (>= 2.0.0),
  python3-routes (>= 2.3.1),
  python3-six (>= 1.10.0),
  python3-stestr (>= 1.0.0),
  python3-subunit (>= 1.0.0),
+ python3-testscenarios (>= 0.4),
  python3-testtools (>= 2.2.0),
  python3-tinyrpc (>= 0.6),
  python3-webob (>= 1:1.8.2),
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1
 Homepage: https://docs.openstack.org/os-ken/latest/
-Vcs-Browser: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-os-ken
 Vcs-Git: https://git.launchpad.net/~ubuntu-openstack-dev/ubuntu/+source/python-os-ken
 
 Package: python3-os-ken
 Architecture: all
 Depends:
- python3-eventlet (>= 0.22.0),
+ python3-eventlet (>= 0.25.1),
  python3-msgpack (>= 1.0.0),
  python3-netaddr (>= 0.7.18),
  python3-openvswitch (>= 2.8.0),
  python3-oslo.config (>= 1:5.1.0),
+ python3-packaging (>= 20.3),
  python3-pbr (>= 2.0.0),
  python3-routes (>= 2.3.1),
  python3-six (>= 1.10.0),

debian/rules

@@ -12,9 +12,7 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	for i in $(PYTHON3S) ; do \
-		http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 PYTHONPATH=. python$$i os_ken/tests/run_tests.py ; \
-	done
+	pkgos-dh_auto_test --no-py2
 endif
 
 override_dh_python3:

doc/source/conf.py

@@ -37,8 +37,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'os-ken'
-copyright = u'2018, OpenStack Developers'
+project = 'os-ken'
+copyright = '2018, OpenStack Developers'
 
 # openstackdocstheme options
 openstackdocs_repo_name = 'openstack/os-ken'
@@ -77,8 +77,8 @@
 latex_documents = [
     ('index',
      'doc-%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Developers', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Developers', 'manual'),
 ]
 
 latex_use_xindy = False

os_ken/flags.py

@@ -17,7 +17,7 @@
 global flags
 """
 
-from distutils.version import LooseVersion
+from packaging import version
 
 from os_ken import cfg
 
@@ -86,13 +86,6 @@
 # should be None.
 DEFAULT_ZSERV_FRR_VERSION = '0.0'
 
-# Hack: In oslo_config.cfg.Opt, ConfigType might access __class__ attribute
-# for equal comparison, but on Python 2, LooseVersion does not have __class__
-# attribute and it causes AttributeError. So here inject __class__ attribute
-# into LooseVersion class.
-if not hasattr(LooseVersion, '__class__'):
-    LooseVersion.__class__ = LooseVersion
-
 CONF.register_cli_opts([
     cfg.StrOpt(
         'server-host', default=DEFAULT_ZSERV_HOST,
@@ -124,6 +117,6 @@
         help='Initial Router ID used by Zebra protocol service '
              '(default: %s)' % DEFAULT_ZSERV_ROUTER_ID),
     cfg.Opt(
-        'frr-version', LooseVersion, default=DEFAULT_ZSERV_FRR_VERSION,
+        'frr-version', version.Version, default=DEFAULT_ZSERV_FRR_VERSION,
         help='FRRouting version when integrated with FRRouting (e.g., 3.0)'),
 ], group='zapi')

os_ken/lib/bfdlib.py

@@ -37,8 +37,6 @@
 import time
 import random
 
-import six
-
 from os_ken.base import app_manager
 from os_ken.controller import event
 from os_ken.controller import ofp_event
@@ -231,7 +229,7 @@ def recv(self, bfd_pkt):
         BFD packet receiver.
         """
         LOG.debug("[BFD][%s][RECV] BFD Control received: %s",
-                  hex(self._local_discr), six.binary_type(bfd_pkt))
+                  hex(self._local_discr), bytes(bfd_pkt))
         self._remote_discr = bfd_pkt.my_discr
         self._remote_state = bfd_pkt.state
         self._remote_demand_mode = bfd_pkt.flags & bfd.BFD_FLAG_DEMAND

os_ken/lib/mac.py

@@ -14,14 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 from os_ken.lib import addrconv
-
-if six.PY3:
-    _ord = int
-else:
-    _ord = ord
+import struct
 
 # string representation
 HADDR_PATTERN = r'([0-9a-f]{2}:){5}[0-9a-f]{2}'
@@ -35,7 +29,7 @@
 
 
 def is_multicast(addr):
-    return bool(_ord(addr[0]) & 0x01)
+    return bool(int(addr[0]) & 0x01)
 
 
 def haddr_to_str(addr):
@@ -68,5 +62,5 @@ def haddr_to_bin(string):
 
 
 def haddr_bitand(addr, mask):
-    return b''.join(six.int2byte(_ord(a) & _ord(m)) for (a, m)
+    return b''.join(struct.Struct(">B").pack(int(a) & int(m)) for (a, m)
                     in zip(addr, mask))