tests: shell: expand get command test with open intervals

Extend the existing test to cover get commands with open internals.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/shell/testcases/sets/0034get_element_0 b/tests/shell/testcases/sets/0034get_element_0
index 32375b9f50c2cfe0a9cd4bcfcd416fb3872fa464..a25769604685e70270dac7ae24dc27491aff33f3 100755 (executable)
--- a/tests/shell/testcases/sets/0034get_element_0
+++ b/tests/shell/testcases/sets/0034get_element_0
@@ -16,7 +16,7 @@ check() { # (set, elems, expected)
 
 RULESET="add table ip t
 add set ip t s { type inet_service; flags interval; }
-add element ip t s { 10, 20-30, 40, 50-60 }
+add element ip t s { 10, 20-30, 40, 50-60, 60000-65535 }
 add set ip t ips { type ipv4_addr; flags interval; }
 add element ip t ips { 10.0.0.1, 10.0.0.5-10.0.0.8 }
 add element ip t ips { 10.0.0.128/25, 10.0.1.0/24, 10.0.2.3-10.0.2.12 }
@@ -36,6 +36,16 @@ check s 15-18 ""
 # multiple single elements, ranges smaller than present
 check s "10, 40" "10, 40"
 check s "22-24, 26-28" "20-30, 20-30"
+check s "60000-65535" "60000-65535"
+check s "60000-65534" "60000-65535"
+check s "60001-65535" "60000-65535"
+check s "60001-65534" "60000-65535"
+check s "22-24, 60000-65535" "20-30, 60000-65535"
+check s "22-24, 60000-65534" "20-30, 60000-65535"
+check s "22-24, 60001-65535" "20-30, 60000-65535"
+check s "22-24, 60001-65534" "20-30, 60000-65535"
+check s "60001-65534, 10" "60000-65535, 10"
+check s "20, 60001-65535, 10" "20-30, 60000-65535, 10"
 check s 21-29 20-30
 
 # mixed single elements and ranges

diff --git a/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft b/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
index bfc0e4a0f5886ec4db7a82e477e267dfb756eec1..64c7dc0c6555b701a50aafbfcfec213508e264ce 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0034get_element_0.json-nft
@@ -38,6 +38,12 @@
               50,
               60
             ]
+          },
+          {
+            "range": [
+              60000,
+              65535
+            ]
           }
         ]
       }

diff --git a/tests/shell/testcases/sets/dumps/0034get_element_0.nft b/tests/shell/testcases/sets/dumps/0034get_element_0.nft
index 1c1dd9779a8ac23e8d307c3215a1bb7d55bbd055..889640389cd99d64ba97442a9fe6972674126133 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0034get_element_0.nft
+++ b/tests/shell/testcases/sets/dumps/0034get_element_0.nft
@@ -2,7 +2,7 @@ table ip t {
        set s {
                type inet_service
                flags interval
-               elements = { 10, 20-30, 40, 50-60 }
+               elements = { 10, 20-30, 40, 50-60, 60000-65535 }
        }
 
        set ips {