From bc83fb097719f5c4c803808572f690fbc367b9e5 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 13 Nov 2023 12:54:25 +0100
Subject: igmp: T5736: migrate "protocols igmp" to "protocols pim"

IGMP and PIM are two different but related things.

FRR has both combined in pimd. As we use get_config_dict() and FRR reload it
is better to have both centrally stored under the same CLI node (as FRR does,
too) to just "fire and forget" the commit to the daemon.

"set protocols igmp interface eth1" -> "set protocols pim interface eth1 igmp"
---
 data/configd-include.json      |  1 -
 data/templates/frr/igmp.frr.j2 | 41 -----------------------------------------
 data/templates/frr/pimd.frr.j2 | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 data/templates/frr/igmp.frr.j2

(limited to 'data')

diff --git a/data/configd-include.json b/data/configd-include.json
index 84bc1f14e..a762a6d4c 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -44,7 +44,6 @@
 "policy-local-route.py",
 "protocols_bfd.py",
 "protocols_bgp.py",
-"protocols_igmp.py",
 "protocols_isis.py",
 "protocols_mpls.py",
 "protocols_nhrp.py",
diff --git a/data/templates/frr/igmp.frr.j2 b/data/templates/frr/igmp.frr.j2
deleted file mode 100644
index b75884484..000000000
--- a/data/templates/frr/igmp.frr.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-!
-{% for iface in old_ifaces %}
-interface {{ iface }}
-{%     for group in old_ifaces[iface].gr_join %}
-{%         if old_ifaces[iface].gr_join[group] %}
-{%             for source in old_ifaces[iface].gr_join[group] %}
- no ip igmp join {{ group }} {{ source }}
-{%             endfor %}
-{%         else %}
- no ip igmp join {{ group }}
-{%         endif %}
-{%     endfor %}
- no ip igmp
-!
-{% endfor %}
-{% for interface, interface_config in ifaces.items() %}
-interface {{ interface }}
-{%     if interface_config.version %}
- ip igmp version {{ interface_config.version }}
-{%     else %}
-{# IGMP default version 3 #}
- ip igmp
-{%     endif %}
-{%     if interface_config.query_interval %}
- ip igmp query-interval {{ interface_config.query_interval }}
-{%     endif %}
-{%     if interface_config.query_max_resp_time %}
- ip igmp query-max-response-time {{ interface_config.query_max_resp_time }}
-{%     endif %}
-{%     for group, sources in interface_config.gr_join.items() %}
-{%         if sources is vyos_defined %}
-{%             for source in sources %}
- ip igmp join {{ group }} {{ source }}
-{%             endfor %}
-{%         else %}
- ip igmp join {{ group }}
-{%         endif %}
-{%     endfor %}
-!
-{% endfor %}
-!
diff --git a/data/templates/frr/pimd.frr.j2 b/data/templates/frr/pimd.frr.j2
index 7d6ddf8d4..97c5ff58b 100644
--- a/data/templates/frr/pimd.frr.j2
+++ b/data/templates/frr/pimd.frr.j2
@@ -27,9 +27,26 @@ interface {{ iface }}
 {%         if iface_config.igmp is vyos_defined %}
  ip igmp
 {%         endif %}
+{%         if iface_config.igmp.query_interval %}
+ ip igmp query-interval {{ iface_config.igmp.query_interval }}
+{%         endif %}
+{%         if iface_config.igmp.query_max_response_time %}
+ ip igmp query-max-response-time {{ iface_config.igmp.query_max_response_time }}
+{%         endif %}
 {%         if iface_config.igmp.version is vyos_defined %}
  ip igmp version {{ iface_config.igmp.version }}
 {%         endif %}
+{%         if iface_config.igmp.join is vyos_defined %}
+{%             for join, join_config in iface_config.igmp.join.items() %}
+{%                 if join_config.source_address is vyos_defined %}
+{%                     for source_address in join_config.source_address %}
+ ip igmp join {{ join }} {{ source_address }}
+{%                     endfor %}
+{%                 else %}
+ ip igmp join {{ join }}
+{%                 endif %}
+{%             endfor %}
+{%         endif %}
 exit
 {%     endfor %}
 {% endif %}
-- 
cgit v1.2.3