frr: combine all templates in frr directory

10 files changed, 5 insertions, 5 deletions

diff --git a/data/templates/frr-bfd/bfd.frr.tmpl b/data/templates/frr/bfd.frr.tmpl
index 7df4bfd01..7df4bfd01 100644
--- a/data/templates/frr-bfd/bfd.frr.tmpl
+++ b/data/templates/frr/bfd.frr.tmpl
diff --git a/data/templates/igmp/igmp.frr.tmpl b/data/templates/frr/igmp.frr.tmpl
index de4696c1f..de4696c1f 100644
--- a/data/templates/igmp/igmp.frr.tmpl
+++ b/data/templates/frr/igmp.frr.tmpl
diff --git a/data/templates/mpls/ldpd.frr.tmpl b/data/templates/frr/ldpd.frr.tmpl
index bbff88ae5..bbff88ae5 100644
--- a/data/templates/mpls/ldpd.frr.tmpl
+++ b/data/templates/frr/ldpd.frr.tmpl
diff --git a/data/templates/pim/pimd.frr.tmpl b/data/templates/frr/pimd.frr.tmpl
index 1d1532c60..1d1532c60 100644
--- a/data/templates/pim/pimd.frr.tmpl
+++ b/data/templates/frr/pimd.frr.tmpl
diff --git a/data/templates/frr-mcast/static_mcast.frr.tmpl b/data/templates/frr/static_mcast.frr.tmpl
index 86d619ab0..86d619ab0 100644
--- a/data/templates/frr-mcast/static_mcast.frr.tmpl
+++ b/data/templates/frr/static_mcast.frr.tmpl
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index ed8c3637b..d6577579e 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -190,7 +190,7 @@ def generate(bfd):
     if bfd is None:
         return None
 
-    render(config_file, 'frr-bfd/bfd.frr.tmpl', bfd)
+    render(config_file, 'frr/bfd.frr.tmpl', bfd)
     return None
 
 def apply(bfd):
diff --git a/src/conf_mode/protocols_igmp.py b/src/conf_mode/protocols_igmp.py
index 9b338c5b9..821ccb0fc 100755
--- a/src/conf_mode/protocols_igmp.py
+++ b/src/conf_mode/protocols_igmp.py
@@ -87,7 +87,7 @@ def generate(igmp):
     if igmp is None:
         return None
 
-    render(config_file, 'igmp/igmp.frr.tmpl', igmp)
+    render(config_file, 'frr/igmp.frr.tmpl', igmp)
     return None
 
 def apply(igmp):
diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index 0a241277d..9b946b43a 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -127,7 +127,7 @@ def generate(mpls):
     if mpls is None:
         return None
 
-    render(config_file, 'mpls/ldpd.frr.tmpl', mpls)
+    render(config_file, 'frr/ldpd.frr.tmpl', mpls)
     return None
 
 def apply(mpls):
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index f12de4a72..15c4a2b0f 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -114,7 +114,7 @@ def generate(pim):
     if pim is None:
         return None
 
-    render(config_file, 'pim/pimd.frr.tmpl', pim)
+    render(config_file, 'frr/pimd.frr.tmpl', pim)
     return None
 
 def apply(pim):
diff --git a/src/conf_mode/protocols_static_multicast.py b/src/conf_mode/protocols_static_multicast.py
index 411a130ec..ba6324393 100755
--- a/src/conf_mode/protocols_static_multicast.py
+++ b/src/conf_mode/protocols_static_multicast.py
@@ -91,7 +91,7 @@ def generate(mroute):
     if mroute is None:
         return None
 
-    render(config_file, 'frr-mcast/static_mcast.frr.tmpl', mroute)
+    render(config_file, 'frr/static_mcast.frr.tmpl', mroute)
     return None
 
 def apply(mroute):