Re: [PATCH 8/9] autotests: Update APRanges usage in testAP

[James Prestwood <prestwoj@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2877 bytes --]

Hi Andrew,

On Thu, 2021-05-13 at 20:47 +0200, Andrew Zaborowski wrote:
> [General].APRange is now [IPv4].APAddressPool and the netmask is
> changed
> from 23 to 27 bits to make the test correctly assert that only two
> default-sized subnets are allowed by IWD simultaneously (default has
> changed from 24 to 28 bits)
> ---
>  autotests/testAP/dhcp/main.conf |  4 +++-
>  autotests/testAP/dhcp_test.py   | 12 +++++++++---
>  2 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/autotests/testAP/dhcp/main.conf
> b/autotests/testAP/dhcp/main.conf
> index 667de23c..62ae782d 100644
> --- a/autotests/testAP/dhcp/main.conf
> +++ b/autotests/testAP/dhcp/main.conf
> @@ -3,4 +3,6 @@ DisableMacAddressRandomization=true
>  
>  [General]
>  EnableNetworkConfiguration=true
> -APRanges=192.168.80.0/23
> +
> +[IPv4]
> +APAddressPool=192.168.80.0/27
> diff --git a/autotests/testAP/dhcp_test.py
> b/autotests/testAP/dhcp_test.py
> index bf52fb28..e69c4465 100644
> --- a/autotests/testAP/dhcp_test.py
> +++ b/autotests/testAP/dhcp_test.py
> @@ -58,8 +58,14 @@ class Test(unittest.TestCase):
>              testutil.test_iface_operstate(dev2.name)
>              testutil.test_ifaces_connected(dev1.name, dev2.name,
> group=False)
>  
> -            testutil.test_ip_address_match(dev1.name,
> "192.168.80.1")
> -            testutil.test_ip_address_match(dev2.name,
> "192.168.80.2")
> +            try:
> +                testutil.test_ip_address_match(dev1.name,
> "192.168.80.1")
> +                testutil.test_ip_address_match(dev2.name,
> "192.168.80.2")
> +                ip = "192.168.80.1"
> +            except:
> +                testutil.test_ip_address_match(dev1.name,
> "192.168.80.17")
> +                testutil.test_ip_address_match(dev2.name,
> "192.168.80.18")
> +                ip = "192.168.80.17"

Not really a huge fan of this try/except. Why is it not deterministic
which IP each station will have? I'm probably missing something with
the previous patches but with the new APAddressPool you set you should
have a range of .80.1 to .80.31 right? So why wouldn't the DHCP server
just choose 80.1 and 80.2 still?

>  
>              wd.unregister_psk_agent(psk_agent)
>  
> @@ -76,7 +82,7 @@ class Test(unittest.TestCase):
>              # got initially.
>              dev4.start_ap('TestAP4', 'Password4')
>  
> -            testutil.test_ip_address_match(dev4.name,
> "192.168.80.1")
> +            testutil.test_ip_address_match(dev4.name, ip)
>  
>          finally:
>              dev1.stop_ap()

Thanks,
James