Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat(eos_cli_config_gen): Add Regex pattern for region/zone/site name for router_adapative_virtual_topology #4026

Merged
merged 2 commits into from
May 22, 2024
Merged

Feat(eos_cli_config_gen): Add Regex pattern for region/zone/site name for router_adapative_virtual_topology #4026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4d1b3
Feat(eos_cli_config_gen): Add Regex pattern for region/zone/site name…
ayushmittal-arista May 22, 2024
5dcf379
add length checks as well
ayushmittal-arista May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ta/avd/roles/eos_cli_config_gen/docs/tables/router-adaptive-virtual-topology.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
| [<samp>router_adaptive_virtual_topology</samp>](## "router_adaptive_virtual_topology") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;topology_role</samp>](## "router_adaptive_virtual_topology.topology_role") | String | | | Valid Values:<br>- <code>edge</code><br>- <code>pathfinder</code><br>- <code>transit region</code><br>- <code>transit zone</code> | Role name. |
| [<samp>&nbsp;&nbsp;region</samp>](## "router_adaptive_virtual_topology.region") | Dictionary | | | | Region name and ID. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.region.name") | String | Required | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.region.name") | String | Required | | Pattern: ^[A-Za-z0-9_.:{}\[\]-]+$ | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;id</samp>](## "router_adaptive_virtual_topology.region.id") | Integer | Required | | Min: 1<br>Max: 255 | |
| [<samp>&nbsp;&nbsp;zone</samp>](## "router_adaptive_virtual_topology.zone") | Dictionary | | | | Zone name and ID. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.zone.name") | String | Required | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.zone.name") | String | Required | | Pattern: ^[A-Za-z0-9_.:{}\[\]-]+$ | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;id</samp>](## "router_adaptive_virtual_topology.zone.id") | Integer | Required | | Min: 1<br>Max: 10000 | |
| [<samp>&nbsp;&nbsp;site</samp>](## "router_adaptive_virtual_topology.site") | Dictionary | | | | Site name and ID. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.site.name") | String | Required | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "router_adaptive_virtual_topology.site.name") | String | Required | | Pattern: ^[A-Za-z0-9_.:{}\[\]-]+$ | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;id</samp>](## "router_adaptive_virtual_topology.site.id") | Integer | Required | | Min: 1<br>Max: 10000 | |
| [<samp>&nbsp;&nbsp;profiles</samp>](## "router_adaptive_virtual_topology.profiles") | List, items: Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "router_adaptive_virtual_topology.profiles.[].name") | String | Required, Unique | | | AVT Name. |
Expand Down
3 changes: 3 additions & 0 deletions ...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions ...s/eos_cli_config_gen/schemas/schema_fragments/router_adaptive_virtual_topology.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ keys:
name:
type: str
required: true
pattern: '^[A-Za-z0-9_.:{}\[\]-]+$'
id:
type: int
convert_types:
Expand All @@ -38,6 +39,7 @@ keys:
name:
type: str
required: true
pattern: '^[A-Za-z0-9_.:{}\[\]-]+$'
id:
type: int
convert_types:
Expand All @@ -52,6 +54,7 @@ keys:
name:
type: str
required: true
pattern: '^[A-Za-z0-9_.:{}\[\]-]+$'
id:
type: int
convert_types:
Expand Down
8 changes: 4 additions & 4 deletions ...llections/arista/avd/roles/eos_designs/docs/tables/wan-cv-pathfinder-regions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;description</samp>](## "cv_pathfinder_global_sites.[].description") | String | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;location</samp>](## "cv_pathfinder_global_sites.[].location") | String | | | | Location as a string is resolved on Cloudvision. |
| [<samp>cv_pathfinder_regions</samp>](## "cv_pathfinder_regions") | List, items: Dictionary | | | | Define the CV Pathfinder hierarchy. |
| [<samp>&nbsp;&nbsp;-&nbsp;name</samp>](## "cv_pathfinder_regions.[].name") | String | Required, Unique | | | |
| [<samp>&nbsp;&nbsp;-&nbsp;name</samp>](## "cv_pathfinder_regions.[].name") | String | Required, Unique | | Min Length: 1<br>Max Length: 128<br>Pattern: ^[A-Za-z0-9_.:{}\[\]-]+$ | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;description</samp>](## "cv_pathfinder_regions.[].description") | String | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;id</samp>](## "cv_pathfinder_regions.[].id") | Integer | Required | | Min: 1<br>Max: 255 | The region ID must be unique for the whole WAN deployment. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;sites</samp>](## "cv_pathfinder_regions.[].sites") | List, items: Dictionary | | | | All sites are placed in a default zone "<region_name>-ZONE" with ID 1. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "cv_pathfinder_regions.[].sites.[].name") | String | Required, Unique | | | The site name. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "cv_pathfinder_regions.[].sites.[].name") | String | Required, Unique | | Min Length: 1<br>Max Length: 128<br>Pattern: ^[A-Za-z0-9_.:{}\[\]-]+$ | The site name. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;description</samp>](## "cv_pathfinder_regions.[].sites.[].description") | String | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id</samp>](## "cv_pathfinder_regions.[].sites.[].id") | Integer | Required | | Min: 1<br>Max: 10000 | The site ID must be unique within a zone.<br>Given that all the sites are placed in a zone named after the region, the site ID must be unique within a region. |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;location</samp>](## "cv_pathfinder_regions.[].sites.[].location") | String | | | | Location as a string is resolved on Cloudvision. |
Expand All @@ -39,7 +39,7 @@

# Define the CV Pathfinder hierarchy.
cv_pathfinder_regions:
- name: <str; required; unique>
- name: <str; length 1-128; required; unique>
description: <str>

# The region ID must be unique for the whole WAN deployment.
Expand All @@ -49,7 +49,7 @@
sites:

# The site name.
- name: <str; required; unique>
- name: <str; length 1-128; required; unique>
description: <str>

# The site ID must be unique within a zone.
Expand Down
9 changes: 9 additions & 0 deletions ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ...ns/arista/avd/roles/eos_designs/schemas/schema_fragments/cv_pathfinder_regions.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ keys:
keys:
name:
type: str
min_length: 1
max_length: 128
description:
type: str
id:
Expand All @@ -37,6 +39,8 @@ keys:
type: str
description: |-
The site name.
min_length: 1
max_length: 128
description:
type: str
id:
Expand Down
Loading