[DHCPv6] [202012] Update the dhcpv6_relay config/show cli

[vivekrnv]

Signed-off-by: vkarri [email protected]

What I did

Fixes sonic-net/sonic-buildimage#11455

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

root@r-lionfish-16:/home/admin# config vlan add 10
root@r-lionfish-16:/home/admin# config vlan member add 10 Ethernet0

root@r-lionfish-16:/home/admin# config vlan dhcp_relay add 10 192.168.1.1
Added DHCP relay destination address 192.168.1.1 to Vlan10
Restarting DHCP relay service...

root@r-lionfish-16:/home/admin# config vlan dhcp_relay add 10 fc02:2000::1
Added DHCP relay destination address fc02:2000::1 to Vlan10
Restarting DHCP relay service...

root@r-lionfish-16:/home/admin# config vlan dhcp_relay add 10 2000:1::2
Added DHCP relay destination address 2000:1::2 to Vlan10
Restarting DHCP relay service...

root@r-lionfish-16:/home/admin# show vlan brief
+-----------+--------------+-----------+----------------+-----------------------+-------------+
|   VLAN ID | IP Address   | Ports     | Port Tagging   | DHCP Helper Address   | Proxy ARP   |
+===========+==============+===========+================+=======================+=============+
|        10 |              | Ethernet0 | tagged         | 192.168.1.1           | disabled    |
|           |              |           |                | 2000:1::2             |             |
|           |              |           |                | fc02:2000::1          |             |
+-----------+--------------+-----------+----------------+-----------------------+-------------+


root@r-lionfish-16:/home/admin# config vlan dhcp_relay del 10 fc02:2000::1
Removed DHCP relay destination address fc02:2000::1 from Vlan10
Restarting DHCP relay service...


[group:dhcp-relay]
programs=isc-dhcpv4-relay-Vlan10,dhcp6relay

[program:isc-dhcpv4-relay-Vlan10]
command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id Vlan10 192.168.1.2
priority=3
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=start:exited

[program:dhcp6relay]
command=/usr/sbin/dhcp6relay

priority=3
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=start:exited

[liat-grozovik]

@yxieca could you please help to review or assign someone?

[dgsudharsan]

@kellyyeh Can you please review and sign off?

[kellyyeh]

@vivekrnv Reverting this change. #2321
ipv6 helper are not expected in vlan table, they're shown in a separate dhcp_relay_table

[vivekrnv]

@vivekrnv Reverting this change. #2321 ipv6 helper are not expected in vlan table, they're shown in a separate dhcp_relay_table

I think the latest labels show the ipv6 helper address in the vlan_table itself, am i wrong?

[kellyyeh]

ipv6 addresses added to vlan_table does not get read by dhcp6relay

[vivekrnv]

ipv6 addresses added to vlan_table does not get read by dhcp6relay

Yes, we need the separate dhcp_relay table for dhcp6relay program. But at the same time, we need the data to be in VLAN table for the supervisord to recognize and launch the programs crct? https://github.com/sonic-net/sonic-buildimage/blob/202012/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2#L51.

Only in master, we've completely moved away from VLAN table. The other labels need the data in DHCP_RELAY and VLAN tables for the dhcpv6 to work.
https://github.com/sonic-net/sonic-buildimage/blob/master/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2#L51