Merge ~paelzer/ubuntu/+source/openvswitch:fix-autopkgtest-hirsute into ~ubuntu-server-dev/ubuntu/+source/openvswitch:master

[Christian Ehrhardt ]

https://launchpad.net/ubuntu/+source/mininet/2.3.0-1build1
is finally python3 (only).
That means we have to modify our dependencies and our python calls.
With this fix applied autopkgtest of OVS vs mininet 2.3 succeed and would let the latter pass into Hirsute.

I had a simpler version before (just the dep and the call bumped to py3) which worked fine.
But I remembered that OVS is backported in multiple cases, which then would make the tests there fail.
So I made a switch based on the mininet version, that works out of the box in backports.

Old:
$ sudo ~/work/autopkgtest/autopkgtest/runner/autopkgtest --no-built-binaries --apt-upgrade --shell-fail openvswitch_2.15.0-0ubuntu3~ppa3.dsc -- qemu --ram-size=1536 --cpus 2 ~/work/autopkgtest-hirsute-amd64.img
I'd wish to say it worked, but python2 mininet in hirsute fails on something else nowadays.
"RTNETLINK answers: File existsrface pair (s1-eth1,h1-eth0):"
But it got the python2 mininet that is 2.2.2-5ubuntu1 started.

New:
$ sudo ~/work/autopkgtest/autopkgtest/runner/autopkgtest --no-built-binaries --apt-pocket=proposed=src:mininet --apt-upgrade --shell-fail openvswitch_2.15.0-0ubuntu3~ppa3.dsc -- qemu --ram-size=1536 --cpus 2 ~/work/autopkgtest-hirsute-amd64.img
....
autopkgtest [09:57:37]: @@@@@@@@@@@@@@@@@@@@ summary
vanilla PASS
dpdk PASS

[Christian Ehrhardt  (paelzer)]

Unrelated to this change, but also worth to be aware about
=> https://github.com/mininet/mininet/issues/1060 "iperf fails (hangs) in TCP tests"

diff --git a/debian/changelog b/debian/changelog
index 5461673..7e1f1f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvswitch (2.15.0-0ubuntu3) hirsute; urgency=medium
+
+  * d/t/{vanilla,dpdk}: mininet >=2.3 is python3
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 17 Mar 2021 08:02:10 +0100
+
 openvswitch (2.15.0-0ubuntu2) hirsute; urgency=medium
 
   * Fix recording of FQDN/hostname on startup (LP: #1915829):
diff --git a/debian/tests/dpdk b/debian/tests/dpdk
index ff408ad..23cdd8b 100755
--- a/debian/tests/dpdk
+++ b/debian/tests/dpdk
@@ -34,6 +34,12 @@ echo "OK"
 echo "stop conflicting openvswitch testcontroller"
 systemctl stop openvswitch-testcontroller || true
 
+if dpkg --compare-versions "$(dpkg-query --showformat '${Version}\n' --show mininet)" ge "2.3.0-1"; then
+    PYCMD="python3"
+else
+    PYCMD="python2"
+fi
+
 echo -n "running openflow tests using mininet"
-python2 `dirname $0`/openflow.py 2>&1
+${PYCMD} `dirname $0`/openflow.py 2>&1
 echo "OK"
diff --git a/debian/tests/vanilla b/debian/tests/vanilla
index 85943aa..a79c067 100755
--- a/debian/tests/vanilla
+++ b/debian/tests/vanilla
@@ -17,6 +17,12 @@ echo "OK"
 echo "stop conflicting openvswitch testcontroller"
 systemctl stop openvswitch-testcontroller || true
 
+if dpkg --compare-versions "$(dpkg-query --showformat '${Version}\n' --show mininet)" ge "2.3.0-1"; then
+    PYCMD="python3"
+else
+    PYCMD="python2"
+fi
+
 echo -n "running openflow tests using mininet"
-python2 `dirname $0`/openflow.py 2>&1
+${PYCMD} `dirname $0`/openflow.py 2>&1
 echo "OK"