|WARNING| pw134881-134883 [PATCH] [3/3] buildtools/dpdk-cmdline-gen: add explicit IPv4 and v6 types

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/134881

_apply patch failure_

Submitter: Bruce Richardson <bruce.richardson at intel.com>
Date: Tuesday, December 05 2023 14:51:09 
Applied on: CommitID:a526461b0764de52b09b073df84f9e87ec120c93
Apply patch set 134881-134883 failed:

Checking patch buildtools/dpdk-cmdline-gen.py...
error: while searching for:
            result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
            initializers.append(
                f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
                f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});"
            )
        elif t_type.startswith("(") and t_type.endswith(")"):
            result_struct.append(f"\tcmdline_fixed_string_t {t_name};")

error: patch failed: buildtools/dpdk-cmdline-gen.py:79
Applying patch buildtools/dpdk-cmdline-gen.py with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/buildtools/dpdk-cmdline-gen.py b/buildtools/dpdk-cmdline-gen.py	(rejected hunks)
@@ -79,7 +79,7 @@ def process_command(lineno, tokens, comment):
             result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
             initializers.append(
                 f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
-                f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});"
+                f"\tTOKEN_IPADDR_INITIALIZER(struct cmd_{name}_result, {t_name});"
             )
         elif t_type.startswith("(") and t_type.endswith(")"):
             result_struct.append(f"\tcmdline_fixed_string_t {t_name};")
Checking patch buildtools/dpdk-cmdline-gen.py...
error: while searching for:
                f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
                f"\tTOKEN_IPADDR_INITIALIZER(struct cmd_{name}_result, {t_name});"
            )
        elif t_type.startswith("(") and t_type.endswith(")"):
            result_struct.append(f"\tcmdline_fixed_string_t {t_name};")
            t_val = f'"{t_type[1:-1].replace(",","#")}"'

error: patch failed: buildtools/dpdk-cmdline-gen.py:81
Checking patch doc/guides/prog_guide/cmdline.rst...
Applying patch buildtools/dpdk-cmdline-gen.py with 1 reject...
Rejected hunk #1.
Applied patch doc/guides/prog_guide/cmdline.rst cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/buildtools/dpdk-cmdline-gen.py b/buildtools/dpdk-cmdline-gen.py	(rejected hunks)
@@ -81,6 +81,18 @@ def process_command(lineno, tokens, comment):
                 f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
                 f"\tTOKEN_IPADDR_INITIALIZER(struct cmd_{name}_result, {t_name});"
             )
+        elif t_type in ["IPV4", "IPv4", "IPV4_ADDR"]:
+            result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
+            initializers.append(
+                f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
+                f"\tTOKEN_IPV4_INITIALIZER(struct cmd_{name}_result, {t_name});"
+            )
+        elif t_type in ["IPV6", "IPv6", "IPV6_ADDR"]:
+            result_struct.append(f"\tcmdline_ipaddr_t {t_name};")
+            initializers.append(
+                f"static cmdline_parse_token_ipaddr_t cmd_{name}_{t_name}_tok =\n"
+                f"\tTOKEN_IPV6_INITIALIZER(struct cmd_{name}_result, {t_name});"
+            )
         elif t_type.startswith("(") and t_type.endswith(")"):
             result_struct.append(f"\tcmdline_fixed_string_t {t_name};")
             t_val = f'"{t_type[1:-1].replace(",","#")}"'

https://lab.dpdk.org/results/dashboard/patchsets/28535/

UNH-IOL DPDK Community Lab