Feat(eos_cli_config_gen): DHCP Server data model #3269

emilarista · 2023-10-19T13:29:19Z

Change Summary

Implements dhcp servers in eos_cli_config_gen

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

```yaml
dhcp_servers:
  - disabled: <bool>
    vrf: <str>
    dns_domain_name_ipv4: <str>
    dns_domain_name_ipv6: <str>
    ipv4_vendor_options:
      - vendor_id: <str>
        sub_options:
          - number: <int>
            type: <str>
            data: <str>
    subnets:
      - subnet: <str>
        name: <str>
        default_gateway: <str>
        dns_servers:
          - <str>
        ranges:
          - start: <str>
            end: <str>
        lease_time:
          days: <int>
          hours: <int>
          minutes: <int>
```

How to test

Repository Checklist

My code has been rebased from devel before I start
I have read the CONTRIBUTING document.
My change requires a change to the documentation and documentation have been updated accordingly.
I have updated molecule CI testing accordingly. (check the box if not applicable)

github-actions · 2023-10-19T13:33:13Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2023-10-19T13:35:22Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

...ections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_servers.schema.yml

ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-server.yml

ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-server.cfg

ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-servers.j2

RestlessWanderer · 2023-10-24T20:26:21Z

Just tried rendering config with this data model and I was able to render a subnet with a prefix with no subnet mask and a plain-text value, which wouldn't be accepted at the CLI. See below:

With subnet with no subnet mask:

---
type: l3spine

dhcp_servers:
  - disabled: false
    vrf: default
    dns_domain_name_ipv4: arista.com
    dns_domain_name_ipv6: arista.com
    ipv4_vendor_options:
      - vendor_id: phone
        sub_options:
          - number: 66
            type: ipv4-address
            data: 1.1.1.1
    subnets:
      - subnet: 10.255.255.0
        name: Phones
        default_gateway: 10.255.255.1
        dns_servers:
          - 8.8.8.8
        ranges:
          - start: 10.255.255.50
            end: 10.255.255.254
        lease_time:
          days: 5
          hours: 24
          minutes: 15

Resulting configuration:

dhcp server vrf default
   dns domain name ipv4 arista.com
   dns domain name ipv6 arista.com
   !
   subnet 10.255.255.0
      !
      range 10.255.255.50 10.255.255.254
      name Phones
      dns server 8.8.8.8
      lease time 5 days 24 hours 15 minutes
      default-gateway 10.255.255.1
   !
   vendor-option ipv4 phone
      sub-option 66 type ipv4-address data 1.1.1.1

With plain text:

---
type: l3spine

dhcp_servers:
  - disabled: false
    vrf: default
    dns_domain_name_ipv4: arista.com
    dns_domain_name_ipv6: arista.com
    ipv4_vendor_options:
      - vendor_id: phone
        sub_options:
          - number: 66
            type: ipv4-address
            data: 1.1.1.1
    subnets:
      - subnet: phone-subnet
        name: Phones
        default_gateway: 10.255.255.1
        dns_servers:
          - 8.8.8.8
        ranges:
          - start: 10.255.255.50
            end: 10.255.255.254
        lease_time:
          days: 5
          hours: 24
          minutes: 15

Resulting configuration:

dhcp server vrf default
   dns domain name ipv4 arista.com
   dns domain name ipv6 arista.com
   !
   subnet phone-subnet
      !
      range 10.255.255.50 10.255.255.254
      name Phones
      dns server 8.8.8.8
      lease time 5 days 24 hours 15 minutes
      default-gateway 10.255.255.1
   !
   vendor-option ipv4 phone
      sub-option 66 type ipv4-address data 1.1.1.1

Everything else looks good.

gmuloc · 2023-10-26T07:46:29Z

Just tried rendering config with this data model and I was able to render a subnet with a prefix with no subnet mask and a plain-text value, which wouldn't be accepted at the CLI. See below:

With subnet with no subnet mask:

---
type: l3spine

dhcp_servers:
  - disabled: false
    vrf: default
    dns_domain_name_ipv4: arista.com
    dns_domain_name_ipv6: arista.com
    ipv4_vendor_options:
      - vendor_id: phone
        sub_options:
          - number: 66
            type: ipv4-address
            data: 1.1.1.1
    subnets:
      - subnet: 10.255.255.0
        name: Phones
        default_gateway: 10.255.255.1
        dns_servers:
          - 8.8.8.8
        ranges:
          - start: 10.255.255.50
            end: 10.255.255.254
        lease_time:
          days: 5
          hours: 24
          minutes: 15

Resulting configuration:

dhcp server vrf default
   dns domain name ipv4 arista.com
   dns domain name ipv6 arista.com
   !
   subnet 10.255.255.0
      !
      range 10.255.255.50 10.255.255.254
      name Phones
      dns server 8.8.8.8
      lease time 5 days 24 hours 15 minutes
      default-gateway 10.255.255.1
   !
   vendor-option ipv4 phone
      sub-option 66 type ipv4-address data 1.1.1.1

With plain text:

---
type: l3spine

dhcp_servers:
  - disabled: false
    vrf: default
    dns_domain_name_ipv4: arista.com
    dns_domain_name_ipv6: arista.com
    ipv4_vendor_options:
      - vendor_id: phone
        sub_options:
          - number: 66
            type: ipv4-address
            data: 1.1.1.1
    subnets:
      - subnet: phone-subnet
        name: Phones
        default_gateway: 10.255.255.1
        dns_servers:
          - 8.8.8.8
        ranges:
          - start: 10.255.255.50
            end: 10.255.255.254
        lease_time:
          days: 5
          hours: 24
          minutes: 15

Resulting configuration:

dhcp server vrf default
   dns domain name ipv4 arista.com
   dns domain name ipv6 arista.com
   !
   subnet phone-subnet
      !
      range 10.255.255.50 10.255.255.254
      name Phones
      dns server 8.8.8.8
      lease time 5 days 24 hours 15 minutes
      default-gateway 10.255.255.1
   !
   vendor-option ipv4 phone
      sub-option 66 type ipv4-address data 1.1.1.1

Everything else looks good.

These are both valid points though today we don't support yet format validation on these type of keys except through regex and we are not really implementing this today for instance you could generate this using AVD:

interface Vlan12
   description VRF10_VLAN12
   no shutdown
   vrf VRF10
   ip address virtual is-this-the-right-format <<<<<<<<<<<<<<

so let's not fix it in this PR yet

ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-server.j2

ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-servers.yml

...ble_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-servers.md

ClausHolbechArista · 2023-11-08T07:50:20Z

Moving to draft until review comments have been addressed.

github-actions · 2023-11-21T13:34:40Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

rebasing rebasing

rebasing

github-actions · 2023-11-27T10:25:14Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

...ections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_servers.schema.yml

gmuloc

Couple of final touches - my changes will require to re-run molecule so let me do this. And I will approve!

Thanks @emilarista

...ections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_servers.schema.yml

ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-server.j2

will need to run pre-commit + molecule again

hubertsumarno

Checked and works as intended!

gmuloc · 2024-01-03T14:15:34Z

Thanks for the review @hubertsumarno
Merging this once CI finishes - Thanks for the work @emilarista !!

emilarista added the EPIC - AVD AutoVPN/WAN label Oct 19, 2023

github-actions bot added role: eos_cli_config_gen issue related to eos_cli_config_gen role state: CI Updated CI scenario have been updated in the PR state: Documentation role Updated labels Oct 19, 2023

github-actions bot assigned emilarista Oct 19, 2023

emilarista force-pushed the dhcp_server branch from 739cd3e to 466ae2f Compare October 19, 2023 13:32

github-actions bot added the state: conflict PR with conflict label Oct 19, 2023

emilarista force-pushed the dhcp_server branch from 466ae2f to f3ce50f Compare October 19, 2023 13:35

github-actions bot removed the state: conflict PR with conflict label Oct 19, 2023

emilarista marked this pull request as ready for review October 23, 2023 17:56

emilarista requested review from a team as code owners October 23, 2023 17:56

gmuloc requested changes Oct 24, 2023

View reviewed changes

carlbuchmann requested review from gmuloc and a team November 2, 2023 01:32

gmuloc reviewed Nov 2, 2023

View reviewed changes

ClausHolbechArista marked this pull request as draft November 8, 2023 07:50

github-actions bot added the state: conflict PR with conflict label Nov 21, 2023

emilarista added 6 commits November 27, 2023 11:23

working on schema, template

156060b

schema/molecule updates

e650a8d

rebasing rebasing

added doc

64f71f9

rebasing

fix EOF

97ec1b8

fix j2lint issues

d555904

fix documentation after rebase

2869430

add pre-commit corrections

37b8bf5

emilarista marked this pull request as ready for review November 27, 2023 10:37

Merge branch 'devel' into dhcp_server

59c889b

gmuloc requested a review from a team December 1, 2023 10:07

gmuloc reviewed Dec 5, 2023

View reviewed changes

...ections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_servers.schema.yml Show resolved Hide resolved

...ections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_servers.schema.yml Show resolved Hide resolved

emilarista and others added 3 commits December 5, 2023 16:06

changes

aa7ee3e

regenerate schemas

7e61939

Merge branch 'devel' into dhcp_server

a8d0699

gmuloc requested a review from a team December 14, 2023 09:39

emilarista and others added 2 commits December 14, 2023 12:02

Merge branch 'devel' into dhcp_server

16cc294

fix pre-commit issue

c444545

emilarista requested a review from gmuloc December 19, 2023 09:31

Merge branch 'devel' into dhcp_server

40299a1

gmuloc reviewed Dec 19, 2023

View reviewed changes

gmuloc added 2 commits December 19, 2023 10:58

Apply suggestions from code review

e53d6a0

will need to run pre-commit + molecule again

CI: Run pre-commit and molecule

fef2449

gmuloc requested review from a team December 19, 2023 10:12

gmuloc approved these changes Dec 19, 2023

View reviewed changes

gmuloc requested review from a team December 19, 2023 10:37

gmuloc added the one approval This PR has one approval and is only missing one more. label Dec 19, 2023

hubertsumarno approved these changes Jan 3, 2024

View reviewed changes

gmuloc added 2 commits January 3, 2024 14:33

Merge branch 'devel' into dhcp_server

ce37531

CI: 2024 update

3ad1fb5

gmuloc merged commit 82ad975 into aristanetworks:devel Jan 3, 2024
41 checks passed

github-actions bot added the rn: Feat(eos_cli_config_gen) label Jan 3, 2024

ClausHolbechArista mentioned this pull request Jan 10, 2024

Feat(eos_cli_config_gen): Add support for dhcp server #3007

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat(eos_cli_config_gen): DHCP Server data model #3269

Feat(eos_cli_config_gen): DHCP Server data model #3269

emilarista commented Oct 19, 2023 •

edited

github-actions bot commented Oct 19, 2023

github-actions bot commented Oct 19, 2023

RestlessWanderer commented Oct 24, 2023

gmuloc commented Oct 26, 2023

ClausHolbechArista commented Nov 8, 2023

github-actions bot commented Nov 21, 2023

github-actions bot commented Nov 27, 2023

gmuloc left a comment

hubertsumarno left a comment

gmuloc commented Jan 3, 2024

Feat(eos_cli_config_gen): DHCP Server data model #3269

Feat(eos_cli_config_gen): DHCP Server data model #3269

Conversation

emilarista commented Oct 19, 2023 • edited

Change Summary

Component(s) name

Proposed changes

How to test

Repository Checklist

github-actions bot commented Oct 19, 2023

github-actions bot commented Oct 19, 2023

RestlessWanderer commented Oct 24, 2023

gmuloc commented Oct 26, 2023

ClausHolbechArista commented Nov 8, 2023

github-actions bot commented Nov 21, 2023

github-actions bot commented Nov 27, 2023

gmuloc left a comment

Choose a reason for hiding this comment

hubertsumarno left a comment

Choose a reason for hiding this comment

gmuloc commented Jan 3, 2024

emilarista commented Oct 19, 2023 •

edited