14 files changed, 21 insertions, 21 deletions
diff --git a/src/conf_mode/policy.py b/src/conf_mode/policy.py
index 9d8fcfa36..ef6008140 100755
--- a/src/conf_mode/policy.py
+++ b/src/conf_mode/policy.py
@@ -177,7 +177,7 @@ def verify(policy):
 def generate(policy):
     if not policy:
         return None
-    policy['new_frr_config'] = render_to_string('frr/policy.frr.tmpl', policy)
+    policy['new_frr_config'] = render_to_string('frr/policy.frr.j2', policy)
     return None
 
 def apply(policy):
diff --git a/src/conf_mode/protocols_bfd.py b/src/conf_mode/protocols_bfd.py
index 4ebc0989c..0436abaf9 100755
--- a/src/conf_mode/protocols_bfd.py
+++ b/src/conf_mode/protocols_bfd.py
@@ -98,7 +98,7 @@ def verify(bfd):
 def generate(bfd):
     if not bfd:
         return None
-    bfd['new_frr_config'] = render_to_string('frr/bfdd.frr.tmpl', bfd)
+    bfd['new_frr_config'] = render_to_string('frr/bfdd.frr.j2', bfd)
 
 def apply(bfd):
     bfd_daemon = 'bfdd'
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index dace53d37..f6d5071c2 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -297,9 +297,9 @@ def generate(bgp):
     if not bgp or 'deleted' in bgp:
         return None
 
-    bgp['protocol'] = 'bgp' # required for frr/vrf.route-map.frr.tmpl
-    bgp['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.tmpl', bgp)
-    bgp['frr_bgpd_config']  = render_to_string('frr/bgpd.frr.tmpl', bgp)
+    bgp['protocol'] = 'bgp' # required for frr/vrf.route-map.frr.j2
+    bgp['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', bgp)
+    bgp['frr_bgpd_config']  = render_to_string('frr/bgpd.frr.j2', bgp)
 
     return None
 
diff --git a/src/conf_mode/protocols_igmp.py b/src/conf_mode/protocols_igmp.py
index 28d560d03..65cc2beba 100755
--- a/src/conf_mode/protocols_igmp.py
+++ b/src/conf_mode/protocols_igmp.py
@@ -108,7 +108,7 @@ def generate(igmp):
     if igmp is None:
         return None
 
-    render(config_file, 'frr/igmp.frr.tmpl', igmp)
+    render(config_file, 'frr/igmp.frr.j2', igmp)
     return None
 
 def apply(igmp):
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index f2501e38a..5dafd26d0 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -210,9 +210,9 @@ def generate(isis):
     if not isis or 'deleted' in isis:
         return None
 
-    isis['protocol'] = 'isis' # required for frr/vrf.route-map.frr.tmpl
-    isis['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.tmpl', isis)
-    isis['frr_isisd_config'] = render_to_string('frr/isisd.frr.tmpl', isis)
+    isis['protocol'] = 'isis' # required for frr/vrf.route-map.frr.j2
+    isis['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', isis)
+    isis['frr_isisd_config'] = render_to_string('frr/isisd.frr.j2', isis)
     return None
 
 def apply(isis):
diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index 933e23065..5da8e7b06 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -68,7 +68,7 @@ def generate(mpls):
     if not mpls or 'deleted' in mpls:
         return None
 
-    mpls['frr_ldpd_config'] = render_to_string('frr/ldpd.frr.tmpl', mpls)
+    mpls['frr_ldpd_config'] = render_to_string('frr/ldpd.frr.j2', mpls)
     return None
 
 def apply(mpls):
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index 26d491838..5b4874ba2 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -160,7 +160,7 @@ def verify(ospf):
     route_map_name = dict_search('default_information.originate.route_map', ospf)
     if route_map_name: verify_route_map(route_map_name, ospf)
 
-    # Validate if configured Access-list exists 
+    # Validate if configured Access-list exists
     if 'area' in ospf:
           for area, area_config in ospf['area'].items():
               if 'import_list' in area_config:
@@ -204,9 +204,9 @@ def generate(ospf):
     if not ospf or 'deleted' in ospf:
         return None
 
-    ospf['protocol'] = 'ospf' # required for frr/vrf.route-map.frr.tmpl
-    ospf['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.tmpl', ospf)
-    ospf['frr_ospfd_config'] = render_to_string('frr/ospfd.frr.tmpl', ospf)
+    ospf['protocol'] = 'ospf' # required for frr/vrf.route-map.frr.j2
+    ospf['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', ospf)
+    ospf['frr_ospfd_config'] = render_to_string('frr/ospfd.frr.j2', ospf)
     return None
 
 def apply(ospf):
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index f8e733ba5..ee4eaf59d 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -142,7 +142,7 @@ def generate(ospfv3):
     if not ospfv3 or 'deleted' in ospfv3:
         return None
 
-    ospfv3['new_frr_config'] = render_to_string('frr/ospf6d.frr.tmpl', ospfv3)
+    ospfv3['new_frr_config'] = render_to_string('frr/ospf6d.frr.j2', ospfv3)
     return None
 
 def apply(ospfv3):
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index df2e6f941..78df9b6f8 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -135,7 +135,7 @@ def generate(pim):
     if pim is None:
         return None
 
-    render(config_file, 'frr/pimd.frr.tmpl', pim)
+    render(config_file, 'frr/pimd.frr.j2', pim)
     return None
 
 def apply(pim):
diff --git a/src/conf_mode/protocols_rip.py b/src/conf_mode/protocols_rip.py
index 300f56489..a76c1ce76 100755
--- a/src/conf_mode/protocols_rip.py
+++ b/src/conf_mode/protocols_rip.py
@@ -102,7 +102,7 @@ def generate(rip):
     if not rip or 'deleted' in rip:
         return None
 
-    rip['new_frr_config'] = render_to_string('frr/ripd.frr.tmpl', rip)
+    rip['new_frr_config'] = render_to_string('frr/ripd.frr.j2', rip)
     return None
 
 def apply(rip):
diff --git a/src/conf_mode/protocols_ripng.py b/src/conf_mode/protocols_ripng.py
index d9b8c0b30..21ff710b3 100755
--- a/src/conf_mode/protocols_ripng.py
+++ b/src/conf_mode/protocols_ripng.py
@@ -93,7 +93,7 @@ def generate(ripng):
         ripng['new_frr_config'] = ''
         return None
 
-    ripng['new_frr_config'] = render_to_string('frr/ripngd.frr.tmpl', ripng)
+    ripng['new_frr_config'] = render_to_string('frr/ripngd.frr.j2', ripng)
     return None
 
 def apply(ripng):
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index f0ec48de4..87432bc1c 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -91,7 +91,7 @@ def verify(static):
 def generate(static):
     if not static:
         return None
-    static['new_frr_config'] = render_to_string('frr/staticd.frr.tmpl', static)
+    static['new_frr_config'] = render_to_string('frr/staticd.frr.j2', static)
     return None
 
 def apply(static):
diff --git a/src/conf_mode/protocols_static_multicast.py b/src/conf_mode/protocols_static_multicast.py
index 99157835a..6afdf31f3 100755
--- a/src/conf_mode/protocols_static_multicast.py
+++ b/src/conf_mode/protocols_static_multicast.py
@@ -96,7 +96,7 @@ def generate(mroute):
     if mroute is None:
         return None
 
-    render(config_file, 'frr/static_mcast.frr.tmpl', mroute)
+    render(config_file, 'frr/static_mcast.frr.j2', mroute)
     return None
 
 def apply(mroute):
diff --git a/src/conf_mode/vrf_vni.py b/src/conf_mode/vrf_vni.py
index 1a7bd1f09..585fdbebf 100755
--- a/src/conf_mode/vrf_vni.py
+++ b/src/conf_mode/vrf_vni.py
@@ -40,7 +40,7 @@ def verify(vrf):
     return None
 
 def generate(vrf):
-    vrf['new_frr_config'] = render_to_string('frr/vrf-vni.frr.tmpl', vrf)
+    vrf['new_frr_config'] = render_to_string('frr/vrf-vni.frr.j2', vrf)
     return None
 
 def apply(vrf):