Merge pull request #9 from faucetsdn/os-ken-2.11.2

Import os-ken 2.11.2 source

Author: gizmoguy

.zuul.yaml

@@ -12,3 +12,7 @@
     gate:
       jobs:
         - neutron-ovs-tempest-dvr
+    periodic-weekly:
+      jobs:
+        - openstack-tox-py311
+        - openstack-tox-py312

doc/requirements.txt

@@ -1,4 +1,4 @@
-sphinx>=2.0.0,!=2.1.0 # BSD
+sphinx>2.2.0 # BSD
 openstackdocstheme>=2.2.1 # Apache-2.0
 # releasenotes
 reno>=3.1.0 # Apache-2.0

os_ken/app/ofctl/service.py

@@ -21,8 +21,9 @@
 from os_ken.base import app_manager
 
 from os_ken.controller import ofp_event
-from os_ken.controller.handler import CONFIG_DISPATCHER, MAIN_DISPATCHER,\
-    DEAD_DISPATCHER
+from os_ken.controller.handler import CONFIG_DISPATCHER
+from os_ken.controller.handler import DEAD_DISPATCHER
+from os_ken.controller.handler import MAIN_DISPATCHER
 from os_ken.controller.handler import set_ev_cls
 
 from . import event

os_ken/controller/controller.py

@@ -166,9 +166,8 @@ def stop_client_loop(self, addr):
 
     def server_loop(self, ofp_tcp_listen_port, ofp_ssl_listen_port):
         if CONF.ctl_privkey is not None and CONF.ctl_cert is not None:
-            p = 'PROTOCOL_TLS'
+            ssl_args = {'ssl_ctx': ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)}
 
-            ssl_args = {'ssl_ctx': ssl.SSLContext(getattr(ssl, p))}
             # Restrict non-safe versions
             ssl_args['ssl_ctx'].options |= ssl.OP_NO_SSLv3 | ssl.OP_NO_SSLv2
 

os_ken/controller/ofp_handler.py

@@ -29,8 +29,9 @@
 from os_ken.controller import ofp_event
 from os_ken.controller.controller import OpenFlowController
 from os_ken.controller.handler import set_ev_handler
-from os_ken.controller.handler import HANDSHAKE_DISPATCHER, CONFIG_DISPATCHER,\
-    MAIN_DISPATCHER
+from os_ken.controller.handler import CONFIG_DISPATCHER
+from os_ken.controller.handler import HANDSHAKE_DISPATCHER
+from os_ken.controller.handler import MAIN_DISPATCHER
 from os_ken.ofproto import ofproto_parser
 
 

os_ken/lib/hub.py

@@ -51,13 +51,6 @@
 
     def patch(thread=True):
         eventlet.monkey_patch(thread=thread)
-        if thread:
-            # Monkey patch the original current_thread to use the up-to-date _active
-            # global variable. See https://bugs.launchpad.net/bugs/1863021 and
-            # https://github.com/eventlet/eventlet/issues/592
-            import __original_module_threading as orig_threading  # noqa
-            import threading  # noqa
-            orig_threading.current_thread.__globals__['_active'] = threading._active
 
     def spawn(*args, **kwargs):
         raise_error = kwargs.pop('raise_error', False)
@@ -137,24 +130,20 @@ def __init__(self, listen_info, handle=None, backlog=None,
 
             if ssl_args:
                 ssl_args.setdefault('server_side', True)
-                if 'ssl_ctx' in ssl_args:
-                    ctx = ssl_args.pop('ssl_ctx')
-                    ctx.load_cert_chain(ssl_args.pop('certfile'),
-                                        ssl_args.pop('keyfile'))
-                    if 'cert_reqs' in ssl_args:
-                        ctx.verify_mode = ssl_args.pop('cert_reqs')
-                    if 'ca_certs' in ssl_args:
-                        ctx.load_verify_locations(ssl_args.pop('ca_certs'))
-
-                    def wrap_and_handle_ctx(sock, addr):
-                        handle(ctx.wrap_socket(sock, **ssl_args), addr)
-
-                    self.handle = wrap_and_handle_ctx
-                else:
-                    def wrap_and_handle_ssl(sock, addr):
-                        handle(ssl.wrap_socket(sock, **ssl_args), addr)
-
-                    self.handle = wrap_and_handle_ssl
+                if 'ssl_ctx' not in ssl_args:
+                    raise RuntimeError("no SSLContext ssl_ctx in ssl_args")
+                ctx = ssl_args.pop('ssl_ctx')
+                ctx.load_cert_chain(ssl_args.pop('certfile'),
+                                    ssl_args.pop('keyfile'))
+                if 'cert_reqs' in ssl_args:
+                    ctx.verify_mode = ssl_args.pop('cert_reqs')
+                if 'ca_certs' in ssl_args:
+                    ctx.load_verify_locations(ssl_args.pop('ca_certs'))
+
+                def wrap_and_handle_ctx(sock, addr):
+                    handle(ctx.wrap_socket(sock, **ssl_args), addr)
+
+                self.handle = wrap_and_handle_ctx
             else:
                 self.handle = handle
 
@@ -182,7 +171,14 @@ def connect(self):
                 return None
 
             if self.ssl_args:
-                client = ssl.wrap_socket(client, **self.ssl_args)
+                ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+                ctx.load_cert_chain(self.ssl_args.pop('certfile'),
+                                    self.ssl_args.pop('keyfile'))
+                if 'cert_reqs' in self.ssl_args:
+                    ctx.verify_mode = self.ssl_args.pop('cert_reqs')
+                if 'ca_certs' in self.ssl_args:
+                    ctx.load_verify_location(self.ssl_args.pop('ca_certs'))
+                client = ctx.wrap_socket(client, **self.ssl_args)
 
             return client
 

os_ken/lib/packet/tcp.py

@@ -115,8 +115,8 @@ def get_payload_type(src_port, dst_port):
         from os_ken.ofproto.ofproto_common import OFP_TCP_PORT, OFP_SSL_PORT_OLD
         if bgp.TCP_SERVER_PORT in [src_port, dst_port]:
             return bgp.BGPMessage
-        elif(src_port in [OFP_TCP_PORT, OFP_SSL_PORT_OLD] or
-             dst_port in [OFP_TCP_PORT, OFP_SSL_PORT_OLD]):
+        elif (src_port in [OFP_TCP_PORT, OFP_SSL_PORT_OLD] or
+              dst_port in [OFP_TCP_PORT, OFP_SSL_PORT_OLD]):
             return openflow.openflow
         elif src_port == zebra.ZEBRA_PORT:
             return zebra._ZebraMessageFromZebra

os_ken/lib/packet/vrrp.py

@@ -159,7 +159,7 @@ def vrrp_to_version_type(version, type_):
 
 
 def is_ipv6(ip_address):
-    assert type(ip_address) == str
+    assert isinstance(ip_address, str)
     try:
         addrconv.ipv4.text_to_bin(ip_address)
     except:
@@ -595,11 +595,11 @@ def parser(cls, buf):
     @staticmethod
     def serialize_static(vrrp_, prev):
         if isinstance(prev, ipv4.ipv4):
-            assert type(vrrp_.ip_addresses[0]) == str
+            assert isinstance(vrrp_.ip_addresses[0], str)
             conv = addrconv.ipv4.text_to_bin
             ip_address_pack_raw = vrrpv3._IPV4_ADDRESS_PACK_STR_RAW
         elif isinstance(prev, ipv6.ipv6):
-            assert type(vrrp_.ip_addresses[0]) == str
+            assert isinstance(vrrp_.ip_addresses[0], str)
             conv = addrconv.ipv6.text_to_bin
             ip_address_pack_raw = vrrpv3._IPV6_ADDRESS_PACK_STR_RAW
         else:

os_ken/lib/stplib.py

@@ -865,7 +865,7 @@ def _change_status(self, new_state, thread_switch=True):
         if new_state is not PORT_STATE_DISABLE:
             self.ofctl.set_port_status(self.ofport, new_state)
 
-        if(new_state is PORT_STATE_FORWARD
+        if (new_state is PORT_STATE_FORWARD
            or (self.state is PORT_STATE_FORWARD
                and (new_state is PORT_STATE_DISABLE
                     or new_state is PORT_STATE_BLOCK))):

os_ken/lib/stringify.py

@@ -370,7 +370,7 @@ def obj_python_attrs(msg_):
     # ofp parser implementations.
     if hasattr(msg_, '_fields'):
         for k in msg_._fields:
-            yield(k, getattr(msg_, k))
+            yield (k, getattr(msg_, k))
         return
     base = getattr(msg_, '_base_attributes', [])
     opt = getattr(msg_, '_opt_attributes', [])