Re: [pve-devel] [PATCH installer 6/6] fix #5811: auto: add option to retrieve FQDN from DHCP configuration

[Daniel Kral <d.kral@proxmox.com>]

On 3/27/25 16:17, Christoph Heiss wrote:
> The test suite is extended quite a bit, to cover all the different
> cases.
> 
> [0] https://bugzilla.proxmox.com/show_bug.cgi?id=5811
> 
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
>   proxmox-auto-installer/src/answer.rs          | 36 +++++++++++++++++-
>   proxmox-auto-installer/src/utils.rs           | 37 ++++++++++++++++---
>   proxmox-auto-installer/tests/parse-answer.rs  |  8 ++++
>   .../parse_answer/fqdn_from_dhcp.json          | 19 ++++++++++
>   .../parse_answer/fqdn_from_dhcp.toml          | 14 +++++++
>   ...cp_no_dhcp_domain_with_default_domain.json | 19 ++++++++++
>   ...cp_no_dhcp_domain_with_default_domain.toml | 17 +++++++++
>   ...ll_fqdn_from_dhcp_with_default_domain.json | 19 ++++++++++
>   ...ll_fqdn_from_dhcp_with_default_domain.toml | 17 +++++++++
>   .../fqdn_from_dhcp_no_default_domain.json     |  3 ++
>   ...n_from_dhcp_no_default_domain.run-env.json |  1 +
>   .../fqdn_from_dhcp_no_default_domain.toml     | 14 +++++++
>   .../parse_answer_fail/fqdn_hostname_only.json |  3 ++
>   .../parse_answer_fail/fqdn_hostname_only.toml | 14 +++++++
>   .../parse_answer_fail/no_fqdn_from_dhcp.json  |  3 ++
>   .../no_fqdn_from_dhcp.run-env.json            |  1 +
>   .../parse_answer_fail/no_fqdn_from_dhcp.toml  | 14 +++++++
>   .../tests/resources/run-env-info.json         |  2 +-
>   proxmox-post-hook/src/main.rs                 | 19 ++++++++--
>   19 files changed, 250 insertions(+), 10 deletions(-)

Just tried to apply this, and it seems like the diff for the JSON files 
is malformed as it splits the changes at roughly 1000 characters for the 
changes to run-env*.json files:

* run-env-info.json
* no_fqdn_from_dhcp.run-env.json
* fqdn_from_dhcp_no_default_domain.run-env.json

I'm not sure what could have caused this, but after manually fixing 
this, the rest of the patch applies cleanly and the tests run fine.


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