Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1558028/?format=api
{ "id": 1558028, "url": "http://patchwork.ozlabs.org/api/patches/1558028/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/20211122112256.2011194-12-amorenoz@redhat.com/", "project": { "id": 47, "url": "http://patchwork.ozlabs.org/api/projects/47/?format=api", "name": "Open vSwitch", "link_name": "openvswitch", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "git@github.com:openvswitch/ovs.git", "webscm_url": "https://github.com/openvswitch/ovs", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20211122112256.2011194-12-amorenoz@redhat.com>", "list_archive_url": null, "date": "2021-11-22T11:22:49", "name": "[ovs-dev,v1,11/18] tests: wrap ovs-ofctl calls to test python parser", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "578fb9735964a65b431f0c9c07fbdba1d27efc98", "submitter": { "id": 77477, "url": "http://patchwork.ozlabs.org/api/people/77477/?format=api", "name": "Adrian Moreno", "email": "amorenoz@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openvswitch/patch/20211122112256.2011194-12-amorenoz@redhat.com/mbox/", "series": [ { "id": 273222, "url": "http://patchwork.ozlabs.org/api/series/273222/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/list/?series=273222", "date": "2021-11-22T11:22:39", "name": "python: add flow parsing library", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/273222/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1558028/comments/", "check": "fail", "checks": "http://patchwork.ozlabs.org/api/patches/1558028/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "ovs-dev@lists.linuxfoundation.org" ], "Authentication-Results": [ "bilbo.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=KiVGbrBZ;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>)", "smtp3.osuosl.org (amavisd-new);\n dkim=pass (1024-bit key) header.d=redhat.com", "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=amorenoz@redhat.com" ], "Received": [ "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4HyQ0P09qZz9sRR\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 22 Nov 2021 22:24:36 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp2.osuosl.org (Postfix) with ESMTP id BC4FA4053B;\n\tMon, 22 Nov 2021 11:24:33 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n\tby localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id P8CDbtsIH8qX; Mon, 22 Nov 2021 11:24:31 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp2.osuosl.org (Postfix) with ESMTPS id AC8AA403B3;\n\tMon, 22 Nov 2021 11:24:29 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id 77395C001E;\n\tMon, 22 Nov 2021 11:24:29 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 0563BC001E\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:24:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id F3E1C60A5B\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:44 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id cz1JR9PEil8J for <dev@openvswitch.org>;\n Mon, 22 Nov 2021 11:23:43 +0000 (UTC)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp3.osuosl.org (Postfix) with ESMTPS id 9E51060A53\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:43 +0000 (UTC)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-395-heww36d8P4y6NCySADoRAg-1; Mon, 22 Nov 2021 06:23:36 -0500", "from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com\n [10.5.11.13])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BB2B710168C0\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:35 +0000 (UTC)", "from amorenoz.users.ipa.redhat.com (unknown [10.2.16.196])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 124EF60862;\n Mon, 22 Nov 2021 11:23:33 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.8.0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1637580222;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=2gX+JnYpSgkQcCknqeRC6OLpIE8H/SOJyzH/zAa6a8A=;\n b=KiVGbrBZBMUPx3VzPIX9HFz0nvnDylgeg8PNakjXnwr8uJ9IYIDH3Yp1hu9fKlpOsShsos\n s9Da1hvS9Omr760ihmavbcvBY+vtxdydo5ReW5xtgWgZdPjnV+6xWRurjW0chQU/VcN+EJ\n /QPPTAj0CgbuSRPGcz7XEbSZ4Cjn8o0=", "X-MC-Unique": "heww36d8P4y6NCySADoRAg-1", "From": "Adrian Moreno <amorenoz@redhat.com>", "To": "dev@openvswitch.org", "Date": "Mon, 22 Nov 2021 12:22:49 +0100", "Message-Id": "<20211122112256.2011194-12-amorenoz@redhat.com>", "In-Reply-To": "<20211122112256.2011194-1-amorenoz@redhat.com>", "References": "<20211122112256.2011194-1-amorenoz@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.13", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Subject": "[ovs-dev] [PATCH v1 11/18] tests: wrap ovs-ofctl calls to test\n\tpython parser", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "Some ovs-ofctl commands are used to parse or dump openflow flows,\nspecially in ofp-actions.at\n\nUse a wrapper around ovs-ofctl, called ovs-test-ofparse.py that, apart\nfrom calling ovs-ofctl, also parses its output (or input, depending on\nthe command) to make sure the python flow parsing library can also parse\nthe flows.\n\nSigned-off-by: Adrian Moreno <amorenoz@redhat.com>\n---\n tests/automake.mk | 4 +-\n tests/ofp-actions.at | 46 ++++++++---------\n tests/ovs-test-ofparse.py | 103 ++++++++++++++++++++++++++++++++++++++\n 3 files changed, 129 insertions(+), 24 deletions(-)\n create mode 100755 tests/ovs-test-ofparse.py", "diff": "diff --git a/tests/automake.mk b/tests/automake.mk\nindex 43731d097..5dc805ef4 100644\n--- a/tests/automake.mk\n+++ b/tests/automake.mk\n@@ -20,7 +20,9 @@ EXTRA_DIST += \\\n \ttests/atlocal.in \\\n \t$(srcdir)/package.m4 \\\n \t$(srcdir)/tests/testsuite \\\n-\t$(srcdir)/tests/testsuite.patch\n+\t$(srcdir)/tests/testsuite.patch \\\n+\t$(srcdir)/tests/ovs-test-ofparse.py\n+\n \n COMMON_MACROS_AT = \\\n \ttests/ovsdb-macros.at \\\ndiff --git a/tests/ofp-actions.at b/tests/ofp-actions.at\nindex ef4898abb..0b79742be 100644\n--- a/tests/ofp-actions.at\n+++ b/tests/ofp-actions.at\n@@ -327,7 +327,7 @@ AT_CAPTURE_FILE([input.txt])\n AT_CAPTURE_FILE([expout])\n AT_CAPTURE_FILE([experr])\n AT_CHECK(\n- [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow10 < input.txt],\n+ [ovs-test-ofparse.py '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow10 < input.txt],\n [0], [expout], [experr])\n AT_CLEANUP\n \n@@ -500,7 +500,7 @@ AT_CAPTURE_FILE([input.txt])\n AT_CAPTURE_FILE([expout])\n AT_CAPTURE_FILE([experr])\n AT_CHECK(\n- [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow11 < input.txt],\n+ [ovs-test-ofparse.py '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow11 < input.txt],\n [0], [expout], [experr])\n AT_CLEANUP\n \n@@ -735,7 +735,7 @@ AT_CAPTURE_FILE([input.txt])\n AT_CAPTURE_FILE([expout])\n AT_CAPTURE_FILE([experr])\n AT_CHECK(\n- [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow12 < input.txt],\n+ [ovs-test-ofparse.py '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow12 < input.txt],\n [0], [expout], [experr])\n AT_CLEANUP\n \n@@ -788,7 +788,7 @@ AT_CAPTURE_FILE([input.txt])\n AT_CAPTURE_FILE([expout])\n AT_CAPTURE_FILE([experr])\n AT_CHECK(\n- [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt],\n+ [ovs-test-ofparse.py '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt],\n [0], [expout], [experr])\n AT_CLEANUP\n \n@@ -817,16 +817,16 @@ AT_CAPTURE_FILE([input.txt])\n AT_CAPTURE_FILE([expout])\n AT_CAPTURE_FILE([experr])\n AT_CHECK(\n- [ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt],\n+ [ovs-test-ofparse.py '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt],\n [0], [expout], [experr])\n AT_CLEANUP\n \n AT_SETUP([ofp-actions - inconsistent MPLS actions])\n OVS_VSWITCHD_START\n dnl OK: Use fin_timeout action on TCP flow\n-AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'])\n dnl Bad: Use fin_timeout action on TCP flow that has been converted to MPLS\n-AT_CHECK([ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'],\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'],\n [1], [], [dnl\n ovs-ofctl: none of the usable flow formats (OpenFlow10,NXM) is among the allowed flow formats (OpenFlow11)\n ])\n@@ -840,8 +840,8 @@ dnl In OpenFlow 1.3, set_field always sets all the bits in the field,\n dnl but when we translate to NXAST_LOAD we need to only set the bits that\n dnl actually exist (e.g. mpls_label only has 20 bits) otherwise OVS rejects\n dnl the \"load\" action as invalid. Check that we do this correctly.\n-AT_CHECK([ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\\>mpls_label])\n-AT_CHECK([ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\\>mpls_label])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n NXST_FLOW reply:\n mpls actions=load:0xa->OXM_OF_MPLS_LABEL[[]]\n ])\n@@ -853,12 +853,12 @@ AT_KEYWORDS([ofp-actions])\n OVS_VSWITCHD_START\n dnl OpenFlow 1.0 has an \"enqueue\" action. For OpenFlow 1.1+, we translate\n dnl it to a series of actions that accomplish the same thing.\n-AT_CHECK([ovs-ofctl -O OpenFlow10 add-flow br0 'actions=enqueue(123,456)'])\n-AT_CHECK([ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 add-flow br0 'actions=enqueue(123,456)'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n NXST_FLOW reply:\n actions=enqueue:123:456\n ])\n-AT_CHECK([ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow13 dump-flows br0 | ofctl_strip], [0], [dnl\n OFPST_FLOW reply (OF1.3):\n reset_counts actions=set_queue:456,output:123,pop_queue\n ])\n@@ -870,12 +870,12 @@ AT_KEYWORDS([ofp-actions])\n OVS_VSWITCHD_START\n dnl OpenFlow 1.1+ have a mod_nw_ttl action. For OpenFlow 1.0, we translate\n dnl it to an Open vSwitch extension.\n-AT_CHECK([ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ttl:123'])\n-AT_CHECK([ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ttl:123'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n NXST_FLOW reply:\n ip actions=load:0x7b->NXM_NX_IP_TTL[[]]\n ])\n-AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n OFPST_FLOW reply (OF1.1):\n ip actions=mod_nw_ttl:123\n ])\n@@ -889,16 +889,16 @@ OVS_VSWITCHD_START\n dnl OpenFlow 1.1, but no other version, has a \"mod_nw_ecn\" action.\n dnl Check that we translate it properly for OF1.0 and OF1.2.\n dnl (OF1.3+ should be the same as OF1.2.)\n-AT_CHECK([ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ecn:2'])\n-AT_CHECK([ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ecn:2'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 dump-flows br0 | ofctl_strip], [0], [dnl\n NXST_FLOW reply:\n ip actions=load:0x2->NXM_NX_IP_ECN[[]]\n ])\n-AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n OFPST_FLOW reply (OF1.1):\n ip actions=mod_nw_ecn:2\n ])\n-AT_CHECK([ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow12 dump-flows br0 | ofctl_strip], [0], [dnl\n OFPST_FLOW reply (OF1.2):\n ip actions=set_field:2->nw_ecn\n ])\n@@ -911,8 +911,8 @@ dnl that anything that comes in as reg_load gets translated back to reg_load\n dnl on output. Perhaps this is somewhat inconsistent but it's what OVS\n dnl has done for multiple versions.\n AT_CHECK([ovs-ofctl del-flows br0])\n-AT_CHECK([ovs-ofctl -O OpenFlow12 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n-AT_CHECK([ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow12 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 dump-flows br0 | ofctl_strip], [0], [dnl\n OFPST_FLOW reply (OF1.1):\n ip actions=mod_nw_ecn:2\n ])\n@@ -920,9 +920,9 @@ OFPST_FLOW reply (OF1.1):\n dnl Check that OF1.2+ set_field to set ECN is translated for earlier OF\n dnl versions.\n AT_CHECK([ovs-ofctl del-flows br0])\n-AT_CHECK([ovs-ofctl -O OpenFlow10 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow10 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n AT_CHECK([ovs-ofctl del-flows br0])\n-AT_CHECK([ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n+AT_CHECK([ovs-test-ofparse.py -O OpenFlow11 add-flow br0 'ip,actions=set_field:2->ip_ecn'])\n \n OVS_VSWITCHD_STOP\n AT_CLEANUP\ndiff --git a/tests/ovs-test-ofparse.py b/tests/ovs-test-ofparse.py\nnew file mode 100755\nindex 000000000..89a0f3cf5\n--- /dev/null\n+++ b/tests/ovs-test-ofparse.py\n@@ -0,0 +1,103 @@\n+#!/usr/bin/env python3\n+# Copyright (c) 2021 Red Hat, Inc.\n+#\n+# Licensed under the Apache License, Version 2.0 (the \"License\");\n+# you may not use this file except in compliance with the License.\n+# You may obtain a copy of the License at:\n+#\n+# http://www.apache.org/licenses/LICENSE-2.0\n+#\n+# Unless required by applicable law or agreed to in writing, software\n+# distributed under the License is distributed on an \"AS IS\" BASIS,\n+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+# See the License for the specific language governing permissions and\n+# limitations under the License.\n+\n+# Breaks lines read from stdin into groups using blank lines as\n+# group separators, then sorts lines within the groups for\n+# reproducibility.\n+\n+\n+# ovs-test-ofparse is just a wrapper around ovs-ofctl\n+# that also runs the python flow parsing utility to check that flows are\n+# parseable\n+\n+import subprocess\n+import sys\n+import re\n+\n+from ovs.flows.ofp import OFPFlowFactory\n+\n+diff_regexp = re.compile(r\"\\d{2}: (\\d{2}|\\(none\\)) -> (\\d{2}|\\(none\\))$\")\n+\n+\n+def run_ofctl(with_stdin):\n+ cmd = sys.argv\n+ cmd[0] = \"ovs-ofctl\"\n+ if with_stdin:\n+ p = subprocess.Popen(\n+ cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE\n+ )\n+ input_data = sys.stdin.read()\n+ out, err = p.communicate(input_data.encode(\"utf-8\"))\n+\n+ print(out.decode(\"utf-8\"), file=sys.stdout, end=\"\")\n+ print(err.decode(\"utf-8\"), file=sys.stderr, end=\"\")\n+ return p.returncode, out, err\n+ else:\n+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n+ out, err = p.communicate()\n+\n+ print(out.decode(\"utf-8\"), file=sys.stdout, end=\"\")\n+ print(err.decode(\"utf-8\"), file=sys.stderr, end=\"\")\n+ return p.returncode, out, err\n+\n+\n+def main():\n+ flows = list()\n+ return_code = 0\n+\n+ if \"parse-actions\" in sys.argv:\n+ return_code, out, err = run_ofctl(True)\n+\n+ out_lines = out.decode(\"utf-8\").split(\"\\n\")\n+ for line in out_lines:\n+ if not (\n+ \"bad\" in line # skip \"bad action at...\"\n+ or line.strip() == \"\" # skip empty lines\n+ or diff_regexp.match(line) # skip differences\n+ ):\n+ flows.append(line)\n+\n+ elif \"add-flow\" in sys.argv:\n+ return_code, out, err = run_ofctl(False)\n+ flows.append(sys.argv[-1])\n+\n+ elif \"dump-flows\" in sys.argv:\n+ return_code, out, err = run_ofctl(False)\n+ out_lines = out.decode(\"utf-8\").split(\"\\n\")\n+\n+ for line in out_lines:\n+ if not (\n+ \"reply\" in line # skip NXST_FLOW reply:\n+ or line.strip() == \"\" # skip empty lines\n+ ):\n+ flows.append(line)\n+ else:\n+ print(\"Unsupported command: {}\".format(sys.argv))\n+ sys.exit(1)\n+\n+ if return_code == 0:\n+ factory = OFPFlowFactory()\n+ for flow in flows:\n+ try:\n+ _ = factory.from_string(flow)\n+ except Exception as e:\n+ print(e)\n+ return 1\n+\n+ return return_code\n+\n+\n+if __name__ == \"__main__\":\n+ sys.exit(main())\n", "prefixes": [ "ovs-dev", "v1", "11/18" ] }