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.

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

Cut(eos_designs): Remove deprecated key cvp_instance_ip #4317

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The following data model keys have been removed from `eos_designs` in v5.0.0.

| Removed key | New key |
| ----------- | ------- |
| old key 1(cvp_instance_ip) | new key(TODO) |
| cvp_instance_ip | cvp_instance_ips |
| old key 2(defs_adapter_config) | new key(TODO) |
| old key 3.1(defs_node_type) | new key(TODO) |
| old key 3.2(defs_node_type) | new key(TODO) |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
!RANCID-CONTENT-TYPE: arista
!
daemon TerminAttr
exec /usr/bin/TerminAttr -cvaddr=192.168.200.12:9910,192.168.200.13:9910,192.168.200.11:9910 -cvauth=token,/tmp/token -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs
no shutdown
!
vlan internal order ascending range 1006 1199
!
transceiver qsfp default-mode 4x10G
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ router_bgp:
activate: true
service_routing_protocols_model: multi-agent
ip_routing: true
daemon_terminattr:
cvaddrs:
- 192.168.200.12:9910
- 192.168.200.13:9910
- 192.168.200.11:9910
cvauth:
method: token
token_file: /tmp/token
cvvrf: MGMT
smashexcludes: ale,flexCounter,hardware,kni,pulse,strata
ingestexclude: /Sysdb/cell/1/agent,/Sysdb/cell/2/agent
disable_aaa: false
vlan_internal_order:
allocation: ascending
range:
Expand Down

This file was deleted.

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ keys:
warning: true
new_key: cvp_instance_ips
remove_in_version: "5.0.0"
removed: true
type: str
description: |
IPv4 address or DNS name for CloudVision.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,16 @@ def hardware(self) -> dict | None:
@cached_property
def daemon_terminattr(self) -> dict | None:
"""
daemon_terminattr set based on cvp_instance_ip and cvp_instance_ips variables.
daemon_terminattr set based on cvp_instance_ips.

Updating cvaddrs and cvauth considering conditions for cvaas and cvp_on_prem IPs

if 'arista.io' in cvp_instance_ip:
if 'arista.io' in cvp_instance_ips:
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
<updating as cvaas_ip>
else:
<updating as cvp_on_prem ip>
"""
# cvp_instance_ip will be removed in AVD5.0
cvp_instance_ip = get(self._hostvars, "cvp_instance_ip")
cvp_instance_ip_list = get(self._hostvars, "cvp_instance_ips", [])
if cvp_instance_ip is not None:
cvp_instance_ip_list.append(cvp_instance_ip)
if not cvp_instance_ip_list:
return None

Expand Down
Loading