@@ -1268,8 +1268,11 @@ def update_create_params(self, net):
1268
1268
template_conf ["vrfDhcp3" ] = ""
1269
1269
if template_conf ["loopbackId" ] is None :
1270
1270
template_conf ["loopbackId" ] = ""
1271
- if template_conf ["mcastGroup" ] is None :
1272
- template_conf ["mcastGroup" ] = ""
1271
+ if self .is_ms_fabric is True :
1272
+ template_conf .pop ("mcastGroup" )
1273
+ else :
1274
+ if template_conf ["mcastGroup" ] is None :
1275
+ template_conf ["mcastGroup" ] = ""
1273
1276
if template_conf ["gatewayIpV6Address" ] is None :
1274
1277
template_conf ["gatewayIpV6Address" ] = ""
1275
1278
if template_conf ["secondaryGW1" ] is None :
@@ -1378,6 +1381,10 @@ def get_have(self):
1378
1381
t_conf .update (SVI_NETFLOW_MONITOR = json_to_dict .get ("SVI_NETFLOW_MONITOR" , "" ))
1379
1382
t_conf .update (VLAN_NETFLOW_MONITOR = json_to_dict .get ("VLAN_NETFLOW_MONITOR" , "" ))
1380
1383
1384
+ # Remove mcastGroup when Fabric is MSD
1385
+ if "mcastGroup" not in json_to_dict :
1386
+ del t_conf ["mcastGroup" ]
1387
+
1381
1388
net .update ({"networkTemplateConfig" : json .dumps (t_conf )})
1382
1389
del net ["displayName" ]
1383
1390
del net ["serviceNetworkTemplate" ]
@@ -1905,7 +1912,8 @@ def get_diff_merge(self, replace=False):
1905
1912
dhcp2_vrf_changed .update ({want_c ["networkName" ]: dhcp2_vrf_chg })
1906
1913
dhcp3_vrf_changed .update ({want_c ["networkName" ]: dhcp3_vrf_chg })
1907
1914
dhcp_loopback_changed .update ({want_c ["networkName" ]: dhcp_loopbk_chg })
1908
- multicast_group_address_changed .update ({want_c ["networkName" ]: mcast_grp_chg })
1915
+ if self .is_ms_fabric == False :
1916
+ multicast_group_address_changed .update ({want_c ["networkName" ]: mcast_grp_chg })
1909
1917
gwv6_changed .update ({want_c ["networkName" ]: gwv6_chg })
1910
1918
sec_gw1_changed .update ({want_c ["networkName" ]: sec_gw1_chg })
1911
1919
sec_gw2_changed .update ({want_c ["networkName" ]: sec_gw2_chg })
@@ -2902,8 +2910,9 @@ def dcnm_update_network_information(self, want, have, cfg):
2902
2910
if cfg .get ("dhcp_loopback_id" , None ) is None :
2903
2911
json_to_dict_want ["loopbackId" ] = json_to_dict_have ["loopbackId" ]
2904
2912
2905
- if cfg .get ("multicast_group_address" , None ) is None :
2906
- json_to_dict_want ["mcastGroup" ] = json_to_dict_have ["mcastGroup" ]
2913
+ if self .is_ms_fabric is False :
2914
+ if cfg .get ("multicast_group_address" , None ) is None :
2915
+ json_to_dict_want ["mcastGroup" ] = json_to_dict_have ["mcastGroup" ]
2907
2916
2908
2917
if cfg .get ("gw_ipv6_subnet" , None ) is None :
2909
2918
json_to_dict_want ["gatewayIpV6Address" ] = json_to_dict_have ["gatewayIpV6Address" ]
0 commit comments