all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-firewall 3/3] firewall: tests: regenerate snapshot
Date: Thu, 25 Sep 2025 18:12:47 +0200	[thread overview]
Message-ID: <20250925161250.436548-4-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20250925161250.436548-1-s.hanreich@proxmox.com>

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 .../integration_tests__firewall.snap          | 192 ++++++++++++------
 1 file changed, 128 insertions(+), 64 deletions(-)

diff --git a/proxmox-firewall/tests/snapshots/integration_tests__firewall.snap b/proxmox-firewall/tests/snapshots/integration_tests__firewall.snap
index 1a19ea7..94e69ca 100644
--- a/proxmox-firewall/tests/snapshots/integration_tests__firewall.snap
+++ b/proxmox-firewall/tests/snapshots/integration_tests__firewall.snap
@@ -265,7 +265,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -287,7 +288,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -326,7 +328,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -348,7 +351,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -387,7 +391,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -409,7 +414,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -448,7 +454,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -470,7 +477,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -509,7 +517,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -531,7 +540,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -570,7 +580,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -592,7 +603,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -631,7 +643,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -653,7 +666,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -709,7 +723,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -731,7 +746,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -787,7 +803,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -809,7 +826,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -848,7 +866,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -870,7 +889,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -909,7 +929,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -931,7 +952,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -970,7 +992,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -992,7 +1015,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1031,7 +1055,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1053,7 +1078,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1092,7 +1118,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1114,7 +1141,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1153,7 +1181,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1175,7 +1204,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1231,7 +1261,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1253,7 +1284,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1309,7 +1341,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1331,7 +1364,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1370,7 +1404,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1392,7 +1427,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1431,7 +1467,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1453,7 +1490,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1492,7 +1530,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1514,7 +1553,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1553,7 +1593,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1575,7 +1616,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1614,7 +1656,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1636,7 +1679,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1658,7 +1702,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1680,7 +1725,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1719,7 +1765,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -1741,7 +1788,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3860,7 +3908,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3882,7 +3931,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3921,7 +3971,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3943,7 +3994,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3965,7 +4017,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -3987,7 +4040,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4026,7 +4080,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4048,7 +4103,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4288,7 +4344,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4310,7 +4367,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4349,7 +4407,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -4371,7 +4430,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -5596,7 +5656,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -5618,7 +5679,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv4_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -5640,7 +5702,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
@@ -5662,7 +5725,8 @@ expression: "firewall.full_host_fw().expect(\"firewall can be generated\")"
           "type": "ipv6_addr",
           "flags": [
             "interval"
-          ]
+          ],
+          "auto-merge": true
         }
       }
     },
-- 
2.47.3


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


      parent reply	other threads:[~2025-09-25 16:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-25 16:12 [pve-devel] [PATCH proxmox-firewall 0/3] create ipsets with auto-merge option enabled Stefan Hanreich
2025-09-25 16:12 ` [pve-devel] [PATCH proxmox-firewall 1/3] nftables: add support for auto-merge set option Stefan Hanreich
2025-09-25 16:12 ` [pve-devel] [PATCH proxmox-firewall 2/3] firewall: set auto-merge flag for ipsets Stefan Hanreich
2025-09-25 16:12 ` Stefan Hanreich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250925161250.436548-4-s.hanreich@proxmox.com \
    --to=s.hanreich@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal