From e86ae39489f1c17405d557f9204747594af29e6a Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 20 Jun 2017 16:25:54 -0400 Subject: openvswitch: switch to depending on python3 As far as I can tell openvswitch has been updated to work with python3 as well as with python(2). Switch to depend on python3 and use python3 for associated scripts. For the most part openvswitch will bind at runtime to either py2 or py3 regardless of these changes, with these changes we just do a better job of setting up the dependencies to facilitate py3 bindings. The openvswitch autotests results are mostly identical before and after this switch (failures move from python3 to python(2) test cases as expected, with some exceptions see below). When running the autotests/ptest with python(2) vs python3 we see a slightly higher failure rate (334 failures vs. 284 failures). I do not believe this higher fail rate reflects actual errors in the runtime, rather the tests are not adapted to python3. At any rate like the rest of openvswitch it is fairly straightforward to hack the logic for autotests to be run using py2 as long as it is available in the image, so these changes don't prevent falling back to py2 for autotests. This should facilitate any debugging we need to do based on us switching to favor py3. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- ...n-switch-remaining-scripts-to-use-python3.patch | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch (limited to 'recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch') diff --git a/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch new file mode 100644 index 00000000..a02b2a40 --- /dev/null +++ b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch @@ -0,0 +1,113 @@ +From 176528ca3a8b76c9d0bb71b1e56eeebccc655c71 Mon Sep 17 00:00:00 2001 +From: Mark Asselstine +Date: Wed, 3 May 2017 10:39:12 -0400 +Subject: [PATCH] python: switch remaining scripts to use python3 + +Work to remove the main openvswitch package's dependency on python 2. + +Signed-off-by: Mark Asselstine +--- + ofproto/ipfix-gen-entities | 2 +- + tests/test-l7.py | 2 +- + utilities/checkpatch.py | 2 +- + utilities/ovs-dev.py | 2 +- + utilities/ovs-pipegen.py | 2 +- + vtep/ovs-vtep | 2 +- + xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 2 +- + xenserver/opt_xensource_libexec_interface-reconfigure | 2 +- + xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities +index 0be7199..d2cce42 100755 +--- a/ofproto/ipfix-gen-entities ++++ b/ofproto/ipfix-gen-entities +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # Copyright (C) 2012 Nicira, Inc. + # +diff --git a/tests/test-l7.py b/tests/test-l7.py +index d7854a1..f09defb 100755 +--- a/tests/test-l7.py ++++ b/tests/test-l7.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Copyright (c) 2015, 2016 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py +index 26eb5c3..2e1932b 100755 +--- a/utilities/checkpatch.py ++++ b/utilities/checkpatch.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Copyright (c) 2016 Red Hat, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py +index 9ce0f04..839e13e 100755 +--- a/utilities/ovs-dev.py ++++ b/utilities/ovs-dev.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Copyright (c) 2013, 2014, 2015, 2016 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py +index 4bf240f..2a8f13e 100755 +--- a/utilities/ovs-pipegen.py ++++ b/utilities/ovs-pipegen.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # Copyright (c) 2013, 2014, 2015 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep +index fd652d4..19d63f9 100755 +--- a/vtep/ovs-vtep ++++ b/vtep/ovs-vtep +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # Copyright (C) 2013 Nicira, Inc. All Rights Reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +index e7404e3..5edad76 100755 +--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update ++++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # xapi plugin script to update the cache of configuration items in the + # ovs-vswitchd configuration that are managed in the xapi database when +diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure +index ea4a742..c6745ee 100755 +--- a/xenserver/opt_xensource_libexec_interface-reconfigure ++++ b/xenserver/opt_xensource_libexec_interface-reconfigure +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # Copyright (c) 2008,2009 Citrix Systems, Inc. + # +diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +index a776c00..d5ff8af 100755 +--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync ++++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); +-- +2.7.4 + -- cgit v1.2.3-54-g00ecf