From 9638135a8ea91a157a68148fb1d84edec52c313b Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 22 Apr 2010 17:11:01 +0200 Subject: Nineth stage to ipset-5 Update tests. --- tests/ipmap.t | 78 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 22 deletions(-) (limited to 'tests/ipmap.t') diff --git a/tests/ipmap.t b/tests/ipmap.t index 239cef9..c639e0b 100644 --- a/tests/ipmap.t +++ b/tests/ipmap.t @@ -1,5 +1,5 @@ # Range: Try to create from an invalid range -2 ipset -N test ipmap --from 2.0.0.1 --to 2.1.0.1 +1 ipset -N test ipmap --from 2.0.0.1 --to 2.1.0.1 # Range: Create a set from a valid range 0 ipset -N test ipmap --from 2.0.0.1 --to 2.1.0.0 # Range: Add lower boundary @@ -10,26 +10,40 @@ 0 ipset -T test 2.0.0.1 # Range: Test upper boundary 0 ipset -T test 2.1.0.0 -# Range: Test value not added to the set +# Range: Test element not added to the set 1 ipset -T test 2.0.0.2 -# Range: Test value before lower boundary +# Range: Test element before lower boundary 1 ipset -T test 2.0.0.0 -# Range: Test value after upper boundary +# Range: Test element after upper boundary 1 ipset -T test 2.1.0.1 -# Range: Try to add value before lower boundary +# Range: Try to add element before lower boundary 1 ipset -A test 2.0.0.0 -# Range: Try to add value after upper boundary +# Range: Try to add element after upper boundary 1 ipset -A test 2.1.0.1 +# Range: Delete element not added to the set +1 ipset -D test 2.0.0.2 +# Range: Add element in the middle +0 ipset -A test 2.0.0.128 +# Range: Delete the same element +0 ipset -D test 2.0.0.128 +# Range: Add a range of elements +0 ipset -A test 2.0.0.128-2.0.0.131 # Range: List set 0 ipset -L test > .foo # Range: Check listing 0 diff .foo ipmap.t.list0 && rm .foo +# Range: Delete a range of elements +0 ipset -D test -x 2.0.0.128-2.0.0.132 +# Range: List set +0 ipset -L test > .foo +# Range: Check listing +0 diff .foo ipmap.t.list1 && rm .foo # Range: Flush test set 0 ipset -F test # Range: Delete test set 0 ipset -X test # Network: Try to create a set from an invalid network -2 ipset -N test ipmap --network 2.0.0.0/15 +1 ipset -N test ipmap --network 2.0.0.0/15 # Network: Create a set from a valid network 0 ipset -N test ipmap --network 2.0.0.0/16 # Network: Add lower boundary @@ -40,20 +54,26 @@ 0 ipset -T test 2.0.0.0 # Network: Test upper boundary 0 ipset -T test 2.0.255.255 -# Network: Test value not added to the set +# Network: Test element not added to the set 1 ipset -T test 2.0.0.1 -# Network: Test value before lower boundary +# Network: Test element before lower boundary 1 ipset -T test 1.255.255.255 -# Network: Test value after upper boundary +# Network: Test element after upper boundary 1 ipset -T test 2.1.0.0 -# Network: Try to add value before lower boundary +# Network: Try to add element before lower boundary 1 ipset -A test 1.255.255.255 -# Network: Try to add value after upper boundary +# Network: Try to add element after upper boundary 1 ipset -A test 2.1.0.0 +# Network: Delete element not added to the set +1 ipset -D test 2.0.0.2 +# Network: Add element in the middle +0 ipset -A test 2.0.0.128 +# Network: Delete the same element +0 ipset -D test 2.0.0.128 # Network: List set 0 ipset -L test > .foo # Network: Check listing -0 diff .foo ipmap.t.list1 && rm .foo +0 diff .foo ipmap.t.list2 && rm .foo # Network: Flush test set 0 ipset -F test # Network: Delete test set @@ -68,20 +88,28 @@ 0 ipset -T test 10.0.0.255 # Subnets: Test upper boundary 0 ipset -T test 10.255.255.0 -# Subnets: Test value not added to the set +# Subnets: Test element not added to the set 1 ipset -T test 10.1.0.0 -# Subnets: Test value before lower boundary +# Subnets: Test element before lower boundary 1 ipset -T test 9.255.255.255 -# Subnets: Test value after upper boundary +# Subnets: Test element after upper boundary 1 ipset -T test 11.0.0.0 -# Subnets: Try to add value before lower boundary +# Subnets: Try to add element before lower boundary 1 ipset -A test 9.255.255.255 -# Subnets: Try to add value after upper boundary +# Subnets: Try to add element after upper boundary 1 ipset -A test 11.0.0.0 +# Subnets: Try to delete element not added to the set +1 ipset -D test 10.2.0.0 +# Subnets: Add element to the set +0 ipset -A test 10.2.0.0 +# Subnets: Delete the same element from the set +0 ipset -D test 10.2.0.0 +# Subnets: Add a subnet of subnets +0 ipset -A test 10.8.0.0/16 # Subnets: List set 0 ipset -L test > .foo # Subnets: Check listing -0 diff .foo ipmap.t.list2 && rm .foo +0 diff .foo ipmap.t.list3 && rm .foo # Subnets: FLush test set 0 ipset -F test # Subnets: Delete test set @@ -89,19 +117,25 @@ # Full: Create full IPv4 space with /16 networks 0 ipset -N test ipmap --network 0.0.0.0/0 --netmask 16 # Full: Add lower boundary -0 ipset -A test 0.0.255.255 +0 ipset -A test 0.0.0.0 # Full: Add upper boundary 0 ipset -A test 255.255.0.0 # Full: Test lower boundary 0 ipset -T test 0.0.0.0 # Full: Test upper boundary 0 ipset -T test 255.255.255.255 -# Full: Test value not added to the set +# Full: Test element not added to the set 1 ipset -T test 0.1.0.0 +# Full: Delete element not added to the set +1 ipset -T test 0.1.0.0 +# Full: Add element to the set +0 ipset -A test 0.1.0.0 +# Full: Delete same element +0 ipset -D test 0.1.0.0 # Full: List set 0 ipset -L test > .foo # Full: Check listing -0 diff .foo ipmap.t.list3 && rm .foo +0 diff .foo ipmap.t.list4 && rm .foo # Full: Delete test set 0 ipset -X test # eof -- cgit v1.2.3