Fix msd network l3gw on border (#547)

* Update msd_child_fabric_network.j2

* Update msd_child_fabric_network.j2

* Update msd_child_fabric_network.j2

* Update manage_child_fabric_networks.py

Author: ccoueffe

plugins/action/dtc/manage_child_fabric_networks.py

@@ -47,6 +47,7 @@
     'VLAN_NETFLOW_MONITOR': {'dm_key': 'vlan_netflow_monitor', 'default': ''},
     'trmEnabled': {'dm_key': 'trm_enable', 'default': False},
     'mcastGroup': {'dm_key': 'multicast_group_address', 'default': ''},
+    'enableL3OnBorder': {'dm_key': 'l3gw_on_border', 'default': False},
 }
 
 

roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.1/msd_child_fabric_network.j2

@@ -37,7 +37,7 @@
       "trmEnabled": dm.trm_enable if dm.trm_enable is defined else ndfc.trmEnabled,
       "igmpVersion": ndfc.igmpVersion,
       "rtBothAuto": ndfc.rtBothAuto,
-      "enableL3OnBorder": ndfc.enableL3OnBorder,
+      "enableL3OnBorder": dm.l3gw_on_border if dm.l3gw_on_border is defined else ndfc.enableL3OnBorder,
       "nveId": ndfc.nveId,
       "type": "Normal",
     } }}",

roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/3.2/msd_child_fabric_network.j2

@@ -38,7 +38,7 @@
       "igmpVersion": ndfc.igmpVersion,
       "trmV6Enabled": ndfc.trmV6Enabled,
       "rtBothAuto": ndfc.rtBothAuto,
-      "enableL3OnBorder": ndfc.enableL3OnBorder,
+      "enableL3OnBorder": dm.l3gw_on_border if dm.l3gw_on_border is defined else ndfc.enableL3OnBorder,
       "enableL3OnBorderVpcBgw": ndfc.enableL3OnBorderVpcBgw,
       "nveId": ndfc.nveId,
       "type": "Normal",

roles/dtc/common/templates/ndfc_networks/msd_fabric/child_fabric/msd_child_fabric_network.j2

@@ -39,12 +39,12 @@
         "igmpVersion": ndfc.igmpVersion,
         "trmV6Enabled": ndfc.trmV6Enabled,
         "rtBothAuto": ndfc.rtBothAuto,
-        "enableL3OnBorder": ndfc.enableL3OnBorder,
+        "enableL3OnBorder": dm.l3gw_on_border if dm.l3gw_on_border is defined else ndfc.enableL3OnBorder,
         "enableL3OnBorderVpcBgw": ndfc.enableL3OnBorderVpcBgw,
         "nveId": ndfc.nveId,
         "type": "Normal",
     } }}",
     "vrf": "{{ ndfc.vrfName }}",
     "type": "Normal",
     "hierarchicalKey": "{{ fabric_name }}"
-}
+}