Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1558021/?format=api
{ "id": 1558021, "url": "http://patchwork.ozlabs.org/api/patches/1558021/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openvswitch/patch/20211122112256.2011194-5-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-5-amorenoz@redhat.com>", "list_archive_url": null, "date": "2021-11-22T11:22:42", "name": "[ovs-dev,v1,04/18] build-aux: split extract-ofp-fields", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "9c29a13dd58ad29a0a50dc60abca7b737c2d68b9", "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-5-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/1558021/comments/", "check": "fail", "checks": "http://patchwork.ozlabs.org/api/patches/1558021/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=a2U80O/y;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>)", "smtp1.osuosl.org (amavisd-new);\n dkim=fail (1024-bit key) reason=\"fail (body has been altered)\"\n header.d=redhat.com", "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=amorenoz@redhat.com" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\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 4HyPzB2h83z9sX3\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 22 Nov 2021 22:23:34 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id BF76E40443;\n\tMon, 22 Nov 2021 11:23:31 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n\tby localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id zfZOUfMbcvVn; Mon, 22 Nov 2021 11:23:29 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp4.osuosl.org (Postfix) with ESMTPS id 1A6EC40447;\n\tMon, 22 Nov 2021 11:23:28 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id C571EC0037;\n\tMon, 22 Nov 2021 11:23:27 +0000 (UTC)", "from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 3D6EBC0037\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id 040F480F03\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:22 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id 0_EGBY9dhLXH for <dev@openvswitch.org>;\n Mon, 22 Nov 2021 11:23:19 +0000 (UTC)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 9764580F5E\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:19 +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-369-VkwZYUEYOLyzHFqvo-MiWA-1; Mon, 22 Nov 2021 06:23:14 -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 980D11006AA4\n for <dev@openvswitch.org>; Mon, 22 Nov 2021 11:23:13 +0000 (UTC)", "from amorenoz.users.ipa.redhat.com (unknown [10.2.16.196])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 8285360862;\n Mon, 22 Nov 2021 11:23:07 +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=1637580198;\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=fTfXAOfvNodVZ+W63kl8bCPbCTm3ftX6JtGrNidgrek=;\n b=a2U80O/ytPOh1DRxj0bn4JspETIAcuDv3afeFdPUhw9mgdFTJDAJ+5SVaAMm+jinmZToH4\n gy6GT1DPop4cdPqJpaoZq7grcNtbj/zgwgb9PH7tzS5KQvjhnbnwruvSlMVvtxDT8pn7Vm\n RzJdDcmL/kNH37MvhxaSfa/AbUEW+mQ=", "X-MC-Unique": "VkwZYUEYOLyzHFqvo-MiWA-1", "From": "Adrian Moreno <amorenoz@redhat.com>", "To": "dev@openvswitch.org", "Date": "Mon, 22 Nov 2021 12:22:42 +0100", "Message-Id": "<20211122112256.2011194-5-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 04/18] build-aux: split extract-ofp-fields", "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": "In order to be able to reuse the core extaction logic, split the command\nin two parts. The core extraction logic is moved to python/build while\nthe command that writes the different files out of the extracted field\ninfo is kept in build-aux\n\nSigned-off-by: Adrian Moreno <amorenoz@redhat.com>\n---\n build-aux/extract-ofp-fields | 393 +----------------------------\n python/automake.mk | 3 +-\n python/build/extract_ofp_fields.py | 386 ++++++++++++++++++++++++++++\n 3 files changed, 397 insertions(+), 385 deletions(-)\n create mode 100644 python/build/extract_ofp_fields.py", "diff": "diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields\nindex 8766995d9..725718336 100755\n--- a/build-aux/extract-ofp-fields\n+++ b/build-aux/extract-ofp-fields\n@@ -7,78 +7,16 @@ import re\n import xml.dom.minidom\n import build.nroff\n \n-line = \"\"\n-\n-# Maps from user-friendly version number to its protocol encoding.\n-VERSION = {\"1.0\": 0x01,\n- \"1.1\": 0x02,\n- \"1.2\": 0x03,\n- \"1.3\": 0x04,\n- \"1.4\": 0x05,\n- \"1.5\": 0x06}\n-VERSION_REVERSE = dict((v,k) for k, v in VERSION.items())\n+from build.extract_ofp_fields import (\n+ extract_ofp_fields,\n+ PREREQS,\n+ OXM_CLASSES,\n+ VERSION,\n+ fatal,\n+ n_errors\n+)\n \n-TYPES = {\"u8\": (1, False),\n- \"be16\": (2, False),\n- \"be32\": (4, False),\n- \"MAC\": (6, False),\n- \"be64\": (8, False),\n- \"be128\": (16, False),\n- \"tunnelMD\": (124, True)}\n-\n-FORMATTING = {\"decimal\": (\"MFS_DECIMAL\", 1, 8),\n- \"hexadecimal\": (\"MFS_HEXADECIMAL\", 1, 127),\n- \"ct state\": (\"MFS_CT_STATE\", 4, 4),\n- \"Ethernet\": (\"MFS_ETHERNET\", 6, 6),\n- \"IPv4\": (\"MFS_IPV4\", 4, 4),\n- \"IPv6\": (\"MFS_IPV6\", 16, 16),\n- \"OpenFlow 1.0 port\": (\"MFS_OFP_PORT\", 2, 2),\n- \"OpenFlow 1.1+ port\": (\"MFS_OFP_PORT_OXM\", 4, 4),\n- \"frag\": (\"MFS_FRAG\", 1, 1),\n- \"tunnel flags\": (\"MFS_TNL_FLAGS\", 2, 2),\n- \"TCP flags\": (\"MFS_TCP_FLAGS\", 2, 2),\n- \"packet type\": (\"MFS_PACKET_TYPE\", 4, 4)}\n-\n-PREREQS = {\"none\": \"MFP_NONE\",\n- \"Ethernet\": \"MFP_ETHERNET\",\n- \"ARP\": \"MFP_ARP\",\n- \"VLAN VID\": \"MFP_VLAN_VID\",\n- \"IPv4\": \"MFP_IPV4\",\n- \"IPv6\": \"MFP_IPV6\",\n- \"IPv4/IPv6\": \"MFP_IP_ANY\",\n- \"NSH\": \"MFP_NSH\",\n- \"CT\": \"MFP_CT_VALID\",\n- \"MPLS\": \"MFP_MPLS\",\n- \"TCP\": \"MFP_TCP\",\n- \"UDP\": \"MFP_UDP\",\n- \"SCTP\": \"MFP_SCTP\",\n- \"ICMPv4\": \"MFP_ICMPV4\",\n- \"ICMPv6\": \"MFP_ICMPV6\",\n- \"ND\": \"MFP_ND\",\n- \"ND solicit\": \"MFP_ND_SOLICIT\",\n- \"ND advert\": \"MFP_ND_ADVERT\"}\n-\n-# Maps a name prefix into an (experimenter ID, class) pair, so:\n-#\n-# - Standard OXM classes are written as (0, <oxm_class>)\n-#\n-# - Experimenter OXM classes are written as (<oxm_vender>, 0xffff)\n-#\n-# If a name matches more than one prefix, the longest one is used.\n-OXM_CLASSES = {\"NXM_OF_\": (0, 0x0000, 'extension'),\n- \"NXM_NX_\": (0, 0x0001, 'extension'),\n- \"NXOXM_NSH_\": (0x005ad650, 0xffff, 'extension'),\n- \"OXM_OF_\": (0, 0x8000, 'standard'),\n- \"OXM_OF_PKT_REG\": (0, 0x8001, 'standard'),\n- \"ONFOXM_ET_\": (0x4f4e4600, 0xffff, 'standard'),\n- \"ERICOXM_OF_\": (0, 0x1000, 'extension'),\n-\n- # This is the experimenter OXM class for Nicira, which is the\n- # one that OVS would be using instead of NXM_OF_ and NXM_NX_\n- # if OVS didn't have those grandfathered in. It is currently\n- # used only to test support for experimenter OXM, since there\n- # are barely any real uses of experimenter OXM in the wild.\n- \"NXOXM_ET_\": (0x00002320, 0xffff, 'extension')}\n+VERSION_REVERSE = dict((v,k) for k, v in VERSION.items())\n \n def oxm_name_to_class(name):\n prefix = ''\n@@ -95,39 +33,6 @@ def is_standard_oxm(name):\n return oxm_class_type == 'standard'\n \n \n-def decode_version_range(range):\n- if range in VERSION:\n- return (VERSION[range], VERSION[range])\n- elif range.endswith('+'):\n- return (VERSION[range[:-1]], max(VERSION.values()))\n- else:\n- a, b = re.match(r'^([^-]+)-([^-]+)$', range).groups()\n- return (VERSION[a], VERSION[b])\n-\n-\n-def get_line():\n- global line\n- global line_number\n- line = input_file.readline()\n- line_number += 1\n- if line == \"\":\n- fatal(\"unexpected end of input\")\n-\n-\n-n_errors = 0\n-\n-\n-def error(msg):\n- global n_errors\n- sys.stderr.write(\"%s:%d: %s\\n\" % (file_name, line_number, msg))\n- n_errors += 1\n-\n-\n-def fatal(msg):\n- error(msg)\n- sys.exit(1)\n-\n-\n def usage():\n argv0 = os.path.basename(sys.argv[0])\n print('''\\\n@@ -141,172 +46,6 @@ file to #include.\\\n sys.exit(0)\n \n \n-def make_sizeof(s):\n- m = re.match(r'(.*) up to (.*)', s)\n- if m:\n- struct, member = m.groups()\n- return \"offsetof(%s, %s)\" % (struct, member)\n- else:\n- return \"sizeof(%s)\" % s\n-\n-\n-def parse_oxms(s, prefix, n_bytes):\n- if s == 'none':\n- return ()\n-\n- return tuple(parse_oxm(s2.strip(), prefix, n_bytes) for s2 in s.split(','))\n-\n-\n-match_types = dict()\n-\n-\n-def parse_oxm(s, prefix, n_bytes):\n- global match_types\n-\n- m = re.match('([A-Z0-9_]+)\\(([0-9]+)\\) since(?: OF(1\\.[0-9]+) and)? v([12]\\.[0-9]+)$', s)\n- if not m:\n- fatal(\"%s: syntax error parsing %s\" % (s, prefix))\n-\n- name, oxm_type, of_version, ovs_version = m.groups()\n-\n- class_ = oxm_name_to_class(name)\n- if class_ is None:\n- fatal(\"unknown OXM class for %s\" % name)\n- oxm_vendor, oxm_class, oxm_class_type = class_\n-\n- if class_ in match_types:\n- if oxm_type in match_types[class_]:\n- fatal(\"duplicate match type for %s (conflicts with %s)\" %\n- (name, match_types[class_][oxm_type]))\n- else:\n- match_types[class_] = dict()\n- match_types[class_][oxm_type] = name\n-\n- # Normally the oxm_length is the size of the field, but for experimenter\n- # OXMs oxm_length also includes the 4-byte experimenter ID.\n- oxm_length = n_bytes\n- if oxm_class == 0xffff:\n- oxm_length += 4\n-\n- header = (oxm_vendor, oxm_class, int(oxm_type), oxm_length)\n-\n- if of_version:\n- if oxm_class_type == 'extension':\n- fatal(\"%s: OXM extension can't have OpenFlow version\" % name)\n- if of_version not in VERSION:\n- fatal(\"%s: unknown OpenFlow version %s\" % (name, of_version))\n- of_version_nr = VERSION[of_version]\n- if of_version_nr < VERSION['1.2']:\n- fatal(\"%s: claimed version %s predates OXM\" % (name, of_version))\n- else:\n- if oxm_class_type == 'standard':\n- fatal(\"%s: missing OpenFlow version number\" % name)\n- of_version_nr = 0\n-\n- return (header, name, of_version_nr, ovs_version)\n-\n-\n-def parse_field(mff, comment):\n- f = {'mff': mff}\n-\n- # First line of comment is the field name.\n- m = re.match(r'\"([^\"]+)\"(?:\\s+\\(aka \"([^\"]+)\"\\))?(?:\\s+\\(.*\\))?\\.', comment[0])\n- if not m:\n- fatal(\"%s lacks field name\" % mff)\n- f['name'], f['extra_name'] = m.groups()\n-\n- # Find the last blank line the comment. The field definitions\n- # start after that.\n- blank = None\n- for i in range(len(comment)):\n- if not comment[i]:\n- blank = i\n- if not blank:\n- fatal(\"%s: missing blank line in comment\" % mff)\n-\n- d = {}\n- for key in (\"Type\", \"Maskable\", \"Formatting\", \"Prerequisites\",\n- \"Access\", \"Prefix lookup member\",\n- \"OXM\", \"NXM\", \"OF1.0\", \"OF1.1\"):\n- d[key] = None\n- for fline in comment[blank + 1:]:\n- m = re.match(r'([^:]+):\\s+(.*)\\.$', fline)\n- if not m:\n- fatal(\"%s: syntax error parsing key-value pair as part of %s\"\n- % (fline, mff))\n- key, value = m.groups()\n- if key not in d:\n- fatal(\"%s: unknown key\" % key)\n- elif key == 'Code point':\n- d[key] += [value]\n- elif d[key] is not None:\n- fatal(\"%s: duplicate key\" % key)\n- d[key] = value\n- for key, value in d.items():\n- if not value and key not in (\"OF1.0\", \"OF1.1\",\n- \"Prefix lookup member\", \"Notes\"):\n- fatal(\"%s: missing %s\" % (mff, key))\n-\n- m = re.match(r'([a-zA-Z0-9]+)(?: \\(low ([0-9]+) bits\\))?$', d['Type'])\n- if not m:\n- fatal(\"%s: syntax error in type\" % mff)\n- type_ = m.group(1)\n- if type_ not in TYPES:\n- fatal(\"%s: unknown type %s\" % (mff, d['Type']))\n-\n- f['n_bytes'] = TYPES[type_][0]\n- if m.group(2):\n- f['n_bits'] = int(m.group(2))\n- if f['n_bits'] > f['n_bytes'] * 8:\n- fatal(\"%s: more bits (%d) than field size (%d)\"\n- % (mff, f['n_bits'], 8 * f['n_bytes']))\n- else:\n- f['n_bits'] = 8 * f['n_bytes']\n- f['variable'] = TYPES[type_][1]\n-\n- if d['Maskable'] == 'no':\n- f['mask'] = 'MFM_NONE'\n- elif d['Maskable'] == 'bitwise':\n- f['mask'] = 'MFM_FULLY'\n- else:\n- fatal(\"%s: unknown maskable %s\" % (mff, d['Maskable']))\n-\n- fmt = FORMATTING.get(d['Formatting'])\n- if not fmt:\n- fatal(\"%s: unknown format %s\" % (mff, d['Formatting']))\n- f['formatting'] = d['Formatting']\n- if f['n_bytes'] < fmt[1] or f['n_bytes'] > fmt[2]:\n- fatal(\"%s: %d-byte field can't be formatted as %s\"\n- % (mff, f['n_bytes'], d['Formatting']))\n- f['string'] = fmt[0]\n-\n- f['prereqs'] = d['Prerequisites']\n- if f['prereqs'] not in PREREQS:\n- fatal(\"%s: unknown prerequisites %s\" % (mff, d['Prerequisites']))\n-\n- if d['Access'] == 'read-only':\n- f['writable'] = False\n- elif d['Access'] == 'read/write':\n- f['writable'] = True\n- else:\n- fatal(\"%s: unknown access %s\" % (mff, d['Access']))\n-\n- f['OF1.0'] = d['OF1.0']\n- if not d['OF1.0'] in (None, 'exact match', 'CIDR mask'):\n- fatal(\"%s: unknown OF1.0 match type %s\" % (mff, d['OF1.0']))\n-\n- f['OF1.1'] = d['OF1.1']\n- if not d['OF1.1'] in (None, 'exact match', 'bitwise mask'):\n- fatal(\"%s: unknown OF1.1 match type %s\" % (mff, d['OF1.1']))\n-\n- f['OXM'] = (parse_oxms(d['OXM'], 'OXM', f['n_bytes']) +\n- parse_oxms(d['NXM'], 'NXM', f['n_bytes']))\n-\n- f['prefix'] = d[\"Prefix lookup member\"]\n-\n- return f\n-\n-\n def protocols_to_c(protocols):\n if protocols == set(['of10', 'of11', 'oxm']):\n return 'OFPUTIL_P_ANY'\n@@ -417,120 +156,6 @@ def make_nx_match(meta_flow_h):\n for oline in output:\n print(oline)\n \n-\n-def extract_ofp_fields(fn):\n- global file_name\n- global input_file\n- global line_number\n- global line\n-\n- file_name = fn\n- input_file = open(file_name)\n- line_number = 0\n-\n- fields = []\n-\n- while True:\n- get_line()\n- if re.match('enum.*mf_field_id', line):\n- break\n-\n- while True:\n- get_line()\n- first_line_number = line_number\n- here = '%s:%d' % (file_name, line_number)\n- if (line.startswith('/*')\n- or line.startswith(' *')\n- or line.startswith('#')\n- or not line\n- or line.isspace()):\n- continue\n- elif re.match('}', line) or re.match('\\s+MFF_N_IDS', line):\n- break\n-\n- # Parse the comment preceding an MFF_ constant into 'comment',\n- # one line to an array element.\n- line = line.strip()\n- if not line.startswith('/*'):\n- fatal(\"unexpected syntax between fields\")\n- line = line[1:]\n- comment = []\n- end = False\n- while not end:\n- line = line.strip()\n- if line.startswith('*/'):\n- get_line()\n- break\n- if not line.startswith('*'):\n- fatal(\"unexpected syntax within field\")\n-\n- line = line[1:]\n- if line.startswith(' '):\n- line = line[1:]\n- if line.startswith(' ') and comment:\n- continuation = True\n- line = line.lstrip()\n- else:\n- continuation = False\n-\n- if line.endswith('*/'):\n- line = line[:-2].rstrip()\n- end = True\n- else:\n- end = False\n-\n- if continuation:\n- comment[-1] += \" \" + line\n- else:\n- comment += [line]\n- get_line()\n-\n- # Drop blank lines at each end of comment.\n- while comment and not comment[0]:\n- comment = comment[1:]\n- while comment and not comment[-1]:\n- comment = comment[:-1]\n-\n- # Parse the MFF_ constant(s).\n- mffs = []\n- while True:\n- m = re.match('\\s+(MFF_[A-Z0-9_]+),?\\s?$', line)\n- if not m:\n- break\n- mffs += [m.group(1)]\n- get_line()\n- if not mffs:\n- fatal(\"unexpected syntax looking for MFF_ constants\")\n-\n- if len(mffs) > 1 or '<N>' in comment[0]:\n- for mff in mffs:\n- # Extract trailing integer.\n- m = re.match('.*[^0-9]([0-9]+)$', mff)\n- if not m:\n- fatal(\"%s lacks numeric suffix in register group\" % mff)\n- n = m.group(1)\n-\n- # Search-and-replace <N> within the comment,\n- # and drop lines that have <x> for x != n.\n- instance = []\n- for x in comment:\n- y = x.replace('<N>', n)\n- if re.search('<[0-9]+>', y):\n- if ('<%s>' % n) not in y:\n- continue\n- y = re.sub('<[0-9]+>', '', y)\n- instance += [y.strip()]\n- fields += [parse_field(mff, instance)]\n- else:\n- fields += [parse_field(mffs[0], comment)]\n- continue\n-\n- input_file.close()\n-\n- if n_errors:\n- sys.exit(1)\n-\n- return fields\n \f\n ## ------------------------ ##\n ## Documentation Generation ##\ndiff --git a/python/automake.mk b/python/automake.mk\nindex a3265292d..b869eb355 100644\n--- a/python/automake.mk\n+++ b/python/automake.mk\n@@ -52,7 +52,8 @@ ovs_pyfiles = \\\n EXTRA_DIST += \\\n \tpython/build/__init__.py \\\n \tpython/build/nroff.py \\\n-\tpython/build/soutil.py\n+\tpython/build/soutil.py \\\n+\tpython/build/extract_ofp_fields.py\n \n # PyPI support.\n EXTRA_DIST += \\\ndiff --git a/python/build/extract_ofp_fields.py b/python/build/extract_ofp_fields.py\nnew file mode 100644\nindex 000000000..f6938b6dd\n--- /dev/null\n+++ b/python/build/extract_ofp_fields.py\n@@ -0,0 +1,386 @@\n+import getopt\n+import sys\n+import os.path\n+import re\n+import xml.dom.minidom\n+import build.nroff\n+\n+line = \"\"\n+\n+# Maps from user-friendly version number to its protocol encoding.\n+VERSION = {\"1.0\": 0x01,\n+ \"1.1\": 0x02,\n+ \"1.2\": 0x03,\n+ \"1.3\": 0x04,\n+ \"1.4\": 0x05,\n+ \"1.5\": 0x06}\n+VERSION_REVERSE = dict((v,k) for k, v in VERSION.items())\n+\n+TYPES = {\"u8\": (1, False),\n+ \"be16\": (2, False),\n+ \"be32\": (4, False),\n+ \"MAC\": (6, False),\n+ \"be64\": (8, False),\n+ \"be128\": (16, False),\n+ \"tunnelMD\": (124, True)}\n+\n+FORMATTING = {\"decimal\": (\"MFS_DECIMAL\", 1, 8),\n+ \"hexadecimal\": (\"MFS_HEXADECIMAL\", 1, 127),\n+ \"ct state\": (\"MFS_CT_STATE\", 4, 4),\n+ \"Ethernet\": (\"MFS_ETHERNET\", 6, 6),\n+ \"IPv4\": (\"MFS_IPV4\", 4, 4),\n+ \"IPv6\": (\"MFS_IPV6\", 16, 16),\n+ \"OpenFlow 1.0 port\": (\"MFS_OFP_PORT\", 2, 2),\n+ \"OpenFlow 1.1+ port\": (\"MFS_OFP_PORT_OXM\", 4, 4),\n+ \"frag\": (\"MFS_FRAG\", 1, 1),\n+ \"tunnel flags\": (\"MFS_TNL_FLAGS\", 2, 2),\n+ \"TCP flags\": (\"MFS_TCP_FLAGS\", 2, 2),\n+ \"packet type\": (\"MFS_PACKET_TYPE\", 4, 4)}\n+\n+PREREQS = {\"none\": \"MFP_NONE\",\n+ \"Ethernet\": \"MFP_ETHERNET\",\n+ \"ARP\": \"MFP_ARP\",\n+ \"VLAN VID\": \"MFP_VLAN_VID\",\n+ \"IPv4\": \"MFP_IPV4\",\n+ \"IPv6\": \"MFP_IPV6\",\n+ \"IPv4/IPv6\": \"MFP_IP_ANY\",\n+ \"NSH\": \"MFP_NSH\",\n+ \"CT\": \"MFP_CT_VALID\",\n+ \"MPLS\": \"MFP_MPLS\",\n+ \"TCP\": \"MFP_TCP\",\n+ \"UDP\": \"MFP_UDP\",\n+ \"SCTP\": \"MFP_SCTP\",\n+ \"ICMPv4\": \"MFP_ICMPV4\",\n+ \"ICMPv6\": \"MFP_ICMPV6\",\n+ \"ND\": \"MFP_ND\",\n+ \"ND solicit\": \"MFP_ND_SOLICIT\",\n+ \"ND advert\": \"MFP_ND_ADVERT\"}\n+\n+# Maps a name prefix into an (experimenter ID, class) pair, so:\n+#\n+# - Standard OXM classes are written as (0, <oxm_class>)\n+#\n+# - Experimenter OXM classes are written as (<oxm_vender>, 0xffff)\n+#\n+# If a name matches more than one prefix, the longest one is used.\n+OXM_CLASSES = {\"NXM_OF_\": (0, 0x0000, 'extension'),\n+ \"NXM_NX_\": (0, 0x0001, 'extension'),\n+ \"NXOXM_NSH_\": (0x005ad650, 0xffff, 'extension'),\n+ \"OXM_OF_\": (0, 0x8000, 'standard'),\n+ \"OXM_OF_PKT_REG\": (0, 0x8001, 'standard'),\n+ \"ONFOXM_ET_\": (0x4f4e4600, 0xffff, 'standard'),\n+ \"ERICOXM_OF_\": (0, 0x1000, 'extension'),\n+\n+ # This is the experimenter OXM class for Nicira, which is the\n+ # one that OVS would be using instead of NXM_OF_ and NXM_NX_\n+ # if OVS didn't have those grandfathered in. It is currently\n+ # used only to test support for experimenter OXM, since there\n+ # are barely any real uses of experimenter OXM in the wild.\n+ \"NXOXM_ET_\": (0x00002320, 0xffff, 'extension')}\n+\n+def oxm_name_to_class(name):\n+ prefix = ''\n+ class_ = None\n+ for p, c in OXM_CLASSES.items():\n+ if name.startswith(p) and len(p) > len(prefix):\n+ prefix = p\n+ class_ = c\n+ return class_\n+\n+\n+def is_standard_oxm(name):\n+ oxm_vendor, oxm_class, oxm_class_type = oxm_name_to_class(name)\n+ return oxm_class_type == 'standard'\n+\n+\n+def get_line():\n+ global line\n+ global line_number\n+ line = input_file.readline()\n+ line_number += 1\n+ if line == \"\":\n+ fatal(\"unexpected end of input\")\n+\n+\n+n_errors = 0\n+\n+\n+def error(msg):\n+ global n_errors\n+ sys.stderr.write(\"%s:%d: %s\\n\" % (file_name, line_number, msg))\n+ n_errors += 1\n+\n+\n+def fatal(msg):\n+ error(msg)\n+ sys.exit(1)\n+\n+def parse_oxms(s, prefix, n_bytes):\n+ if s == 'none':\n+ return ()\n+\n+ return tuple(parse_oxm(s2.strip(), prefix, n_bytes) for s2 in s.split(','))\n+\n+\n+match_types = dict()\n+\n+\n+def parse_oxm(s, prefix, n_bytes):\n+ global match_types\n+\n+ m = re.match('([A-Z0-9_]+)\\(([0-9]+)\\) since(?: OF(1\\.[0-9]+) and)? v([12]\\.[0-9]+)$', s)\n+ if not m:\n+ fatal(\"%s: syntax error parsing %s\" % (s, prefix))\n+\n+ name, oxm_type, of_version, ovs_version = m.groups()\n+\n+ class_ = oxm_name_to_class(name)\n+ if class_ is None:\n+ fatal(\"unknown OXM class for %s\" % name)\n+ oxm_vendor, oxm_class, oxm_class_type = class_\n+\n+ if class_ in match_types:\n+ if oxm_type in match_types[class_]:\n+ fatal(\"duplicate match type for %s (conflicts with %s)\" %\n+ (name, match_types[class_][oxm_type]))\n+ else:\n+ match_types[class_] = dict()\n+ match_types[class_][oxm_type] = name\n+\n+ # Normally the oxm_length is the size of the field, but for experimenter\n+ # OXMs oxm_length also includes the 4-byte experimenter ID.\n+ oxm_length = n_bytes\n+ if oxm_class == 0xffff:\n+ oxm_length += 4\n+\n+ header = (oxm_vendor, oxm_class, int(oxm_type), oxm_length)\n+\n+ if of_version:\n+ if oxm_class_type == 'extension':\n+ fatal(\"%s: OXM extension can't have OpenFlow version\" % name)\n+ if of_version not in VERSION:\n+ fatal(\"%s: unknown OpenFlow version %s\" % (name, of_version))\n+ of_version_nr = VERSION[of_version]\n+ if of_version_nr < VERSION['1.2']:\n+ fatal(\"%s: claimed version %s predates OXM\" % (name, of_version))\n+ else:\n+ if oxm_class_type == 'standard':\n+ fatal(\"%s: missing OpenFlow version number\" % name)\n+ of_version_nr = 0\n+\n+ return (header, name, of_version_nr, ovs_version)\n+\n+\n+def parse_field(mff, comment):\n+ f = {'mff': mff}\n+\n+ # First line of comment is the field name.\n+ m = re.match(r'\"([^\"]+)\"(?:\\s+\\(aka \"([^\"]+)\"\\))?(?:\\s+\\(.*\\))?\\.', comment[0])\n+ if not m:\n+ fatal(\"%s lacks field name\" % mff)\n+ f['name'], f['extra_name'] = m.groups()\n+\n+ # Find the last blank line the comment. The field definitions\n+ # start after that.\n+ blank = None\n+ for i in range(len(comment)):\n+ if not comment[i]:\n+ blank = i\n+ if not blank:\n+ fatal(\"%s: missing blank line in comment\" % mff)\n+\n+ d = {}\n+ for key in (\"Type\", \"Maskable\", \"Formatting\", \"Prerequisites\",\n+ \"Access\", \"Prefix lookup member\",\n+ \"OXM\", \"NXM\", \"OF1.0\", \"OF1.1\"):\n+ d[key] = None\n+ for fline in comment[blank + 1:]:\n+ m = re.match(r'([^:]+):\\s+(.*)\\.$', fline)\n+ if not m:\n+ fatal(\"%s: syntax error parsing key-value pair as part of %s\"\n+ % (fline, mff))\n+ key, value = m.groups()\n+ if key not in d:\n+ fatal(\"%s: unknown key\" % key)\n+ elif key == 'Code point':\n+ d[key] += [value]\n+ elif d[key] is not None:\n+ fatal(\"%s: duplicate key\" % key)\n+ d[key] = value\n+ for key, value in d.items():\n+ if not value and key not in (\"OF1.0\", \"OF1.1\",\n+ \"Prefix lookup member\", \"Notes\"):\n+ fatal(\"%s: missing %s\" % (mff, key))\n+\n+ m = re.match(r'([a-zA-Z0-9]+)(?: \\(low ([0-9]+) bits\\))?$', d['Type'])\n+ if not m:\n+ fatal(\"%s: syntax error in type\" % mff)\n+ type_ = m.group(1)\n+ if type_ not in TYPES:\n+ fatal(\"%s: unknown type %s\" % (mff, d['Type']))\n+\n+ f['n_bytes'] = TYPES[type_][0]\n+ if m.group(2):\n+ f['n_bits'] = int(m.group(2))\n+ if f['n_bits'] > f['n_bytes'] * 8:\n+ fatal(\"%s: more bits (%d) than field size (%d)\"\n+ % (mff, f['n_bits'], 8 * f['n_bytes']))\n+ else:\n+ f['n_bits'] = 8 * f['n_bytes']\n+ f['variable'] = TYPES[type_][1]\n+\n+ if d['Maskable'] == 'no':\n+ f['mask'] = 'MFM_NONE'\n+ elif d['Maskable'] == 'bitwise':\n+ f['mask'] = 'MFM_FULLY'\n+ else:\n+ fatal(\"%s: unknown maskable %s\" % (mff, d['Maskable']))\n+\n+ fmt = FORMATTING.get(d['Formatting'])\n+ if not fmt:\n+ fatal(\"%s: unknown format %s\" % (mff, d['Formatting']))\n+ f['formatting'] = d['Formatting']\n+ if f['n_bytes'] < fmt[1] or f['n_bytes'] > fmt[2]:\n+ fatal(\"%s: %d-byte field can't be formatted as %s\"\n+ % (mff, f['n_bytes'], d['Formatting']))\n+ f['string'] = fmt[0]\n+\n+ f['prereqs'] = d['Prerequisites']\n+ if f['prereqs'] not in PREREQS:\n+ fatal(\"%s: unknown prerequisites %s\" % (mff, d['Prerequisites']))\n+\n+ if d['Access'] == 'read-only':\n+ f['writable'] = False\n+ elif d['Access'] == 'read/write':\n+ f['writable'] = True\n+ else:\n+ fatal(\"%s: unknown access %s\" % (mff, d['Access']))\n+\n+ f['OF1.0'] = d['OF1.0']\n+ if not d['OF1.0'] in (None, 'exact match', 'CIDR mask'):\n+ fatal(\"%s: unknown OF1.0 match type %s\" % (mff, d['OF1.0']))\n+\n+ f['OF1.1'] = d['OF1.1']\n+ if not d['OF1.1'] in (None, 'exact match', 'bitwise mask'):\n+ fatal(\"%s: unknown OF1.1 match type %s\" % (mff, d['OF1.1']))\n+\n+ f['OXM'] = (parse_oxms(d['OXM'], 'OXM', f['n_bytes']) +\n+ parse_oxms(d['NXM'], 'NXM', f['n_bytes']))\n+\n+ f['prefix'] = d[\"Prefix lookup member\"]\n+\n+ return f\n+\n+def extract_ofp_fields(fn):\n+ global file_name\n+ global input_file\n+ global line_number\n+ global line\n+\n+ file_name = fn\n+ input_file = open(file_name)\n+ line_number = 0\n+\n+ fields = []\n+\n+ while True:\n+ get_line()\n+ if re.match('enum.*mf_field_id', line):\n+ break\n+\n+ while True:\n+ get_line()\n+ first_line_number = line_number\n+ here = '%s:%d' % (file_name, line_number)\n+ if (line.startswith('/*')\n+ or line.startswith(' *')\n+ or line.startswith('#')\n+ or not line\n+ or line.isspace()):\n+ continue\n+ elif re.match('}', line) or re.match('\\s+MFF_N_IDS', line):\n+ break\n+\n+ # Parse the comment preceding an MFF_ constant into 'comment',\n+ # one line to an array element.\n+ line = line.strip()\n+ if not line.startswith('/*'):\n+ fatal(\"unexpected syntax between fields\")\n+ line = line[1:]\n+ comment = []\n+ end = False\n+ while not end:\n+ line = line.strip()\n+ if line.startswith('*/'):\n+ get_line()\n+ break\n+ if not line.startswith('*'):\n+ fatal(\"unexpected syntax within field\")\n+\n+ line = line[1:]\n+ if line.startswith(' '):\n+ line = line[1:]\n+ if line.startswith(' ') and comment:\n+ continuation = True\n+ line = line.lstrip()\n+ else:\n+ continuation = False\n+\n+ if line.endswith('*/'):\n+ line = line[:-2].rstrip()\n+ end = True\n+ else:\n+ end = False\n+\n+ if continuation:\n+ comment[-1] += \" \" + line\n+ else:\n+ comment += [line]\n+ get_line()\n+\n+ # Drop blank lines at each end of comment.\n+ while comment and not comment[0]:\n+ comment = comment[1:]\n+ while comment and not comment[-1]:\n+ comment = comment[:-1]\n+\n+ # Parse the MFF_ constant(s).\n+ mffs = []\n+ while True:\n+ m = re.match('\\s+(MFF_[A-Z0-9_]+),?\\s?$', line)\n+ if not m:\n+ break\n+ mffs += [m.group(1)]\n+ get_line()\n+ if not mffs:\n+ fatal(\"unexpected syntax looking for MFF_ constants\")\n+\n+ if len(mffs) > 1 or '<N>' in comment[0]:\n+ for mff in mffs:\n+ # Extract trailing integer.\n+ m = re.match('.*[^0-9]([0-9]+)$', mff)\n+ if not m:\n+ fatal(\"%s lacks numeric suffix in register group\" % mff)\n+ n = m.group(1)\n+\n+ # Search-and-replace <N> within the comment,\n+ # and drop lines that have <x> for x != n.\n+ instance = []\n+ for x in comment:\n+ y = x.replace('<N>', n)\n+ if re.search('<[0-9]+>', y):\n+ if ('<%s>' % n) not in y:\n+ continue\n+ y = re.sub('<[0-9]+>', '', y)\n+ instance += [y.strip()]\n+ fields += [parse_field(mff, instance)]\n+ else:\n+ fields += [parse_field(mffs[0], comment)]\n+ continue\n+\n+ input_file.close()\n+\n+ if n_errors:\n+ sys.exit(1)\n+\n+ return fields\n", "prefixes": [ "ovs-dev", "v1", "04/18" ] }