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

Revert "renaming vrrpmgr into macvlanmgr" #1834

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions doc/vrrp/VRRP_Adaptation_HLD.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ zebra:
- Provide an API for vrrpd to update kernel Macvlan device state.
- Listen for kernel interface state change events and notify vrrpd.

macvlanmgrd:
vrrpmgrd:
- Listens to VRRP create, delete and parameter change in CONFIG_DB. Complete the following tasks:
- Add/del Linux Macvlan device to kernel. The Macvlan device name starting with 'Vrrp4-' or 'Vrrp6-'.
- Config virtual MAC to Macvlan device;
Expand All @@ -227,7 +227,7 @@ macvlanmgrd:
##### SWSS container

vrrpsyncd:
- Listens to MACVLAN interfaces that are added by vrrp, programming in kernel. Macvlanmgrd would add the MACVLAN interface in the kernel with interface name starting with 'vrrp'. Here the status of MACVLAN interface determines Master/Backup state of VRRP instances. VRRP_Table in APPL_DB will be programmed with interface name and VIP for Master instances.
- Listens to MACVLAN interfaces that are added by vrrp, programming in kernel. Vrrpmgrd would add the MACVLAN interface in the kernel with interface name starting with 'vrrp'. Here the status of MACVLAN interface determines Master/Backup state of VRRP instances. VRRP_Table in APPL_DB will be programmed with interface name and VIP for Master instances.
- For every IP add to MACVLAN interface, adds interface name and Virtual IP in APPL_DB in VRRP_Table.
- For every IP delete from MACVLAN interface, deletes interface name and Virtual IP in APPL_DB from VRRP_Table.

Expand Down Expand Up @@ -265,7 +265,7 @@ VRRP_TABLE

Producer: config manager

Consumer: macvlanmgrd
Consumer: vrrpmgrd

Description: New table that stores VRRP configuration for per interface + VRID.

Expand Down Expand Up @@ -458,7 +458,7 @@ admin@sonic:~$ redis-cli -n 1 hgetall "ASIC_STATE:SAI_OBJECT_TYPE_ROUTER_INTERFA

![VRRP ADD/DEL VRRP instance Flows](images/VRRP_Config_Instance_Flow.png)

macvlanmgrd:
vrrpmgrd:
- Listens to VRRP create, delete and parameter change in CONFIG DB
- Upon change
- Add/del VRRP instance corresponding Macvlan device to kernel with IPs and state.
Expand Down
Binary file modified doc/vrrp/images/VRRP_Architecture_Diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/vrrp/images/VRRP_Config_Instance_Flow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.