r/evpn: add no_core_isolation argument

.changes/issue-644.md

@@ -0,0 +1,8 @@
+<!-- markdownlint-disable-file MD013 MD041 -->
+FEATURES:
+
+ENHANCEMENTS:
+
+* **resource/junos_evpn**: add `no_core_isolation` argument (Fix [#644](https://github.com/jeremmfr/terraform-provider-junos/issues/644))
+
+BUG FIXES:

docs/resources/evpn.md

@@ -51,6 +51,9 @@ The following arguments are supported:
     Time window for detection of duplicate MACs (5..600 seconds).
 - **multicast_mode** (Optional, String)  
   Multicast mode for EVPN.
+- **no_core_isolation** (Optional, Boolean)  
+  Disable EVPN Core isolation.  
+  `routing_instance` need to be `default`.
 - **switch_or_ri_options** (Optional, Block, Forces new resource)  
   Declare `switch-options` or `routing-instance` configuration.  
   Need to be set if `routing_instance` = `default` or `routing_instance_evpn` = true.  

internal/providerfwk/resource_evpn.go

@@ -129,6 +129,13 @@ func (rsc *evpn) Schema(
 					stringvalidator.OneOf("ingress-replication"),
 				},
 			},
+			"no_core_isolation": schema.BoolAttribute{
+				Optional:    true,
+				Description: "Disable EVPN Core isolation.",
+				Validators: []validator.Bool{
+					tfvalidator.BoolTrue(),
+				},
+			},
 			"routing_instance_evpn": schema.BoolAttribute{
 				Optional:    true,
 				Description: "Configure routing instance is an evpn instance-type.",
@@ -257,6 +264,7 @@ type evpnData struct {
 	Encapsulation         types.String                    `tfsdk:"encapsulation"`
 	DefaultGateway        types.String                    `tfsdk:"default_gateway"`
 	MulticastMode         types.String                    `tfsdk:"multicast_mode"`
+	NoCoreIsolation       types.Bool                      `tfsdk:"no_core_isolation"`
 	RoutingInstanceEvpn   types.Bool                      `tfsdk:"routing_instance_evpn"`
 	DuplicateMacDetection *evpnBlockDuplicateMACDetection `tfsdk:"duplicate_mac_detection"`
 	SwitchOrRIOptions     *evpnBlockSwitchOrRIOptions     `tfsdk:"switch_or_ri_options"`
@@ -268,6 +276,7 @@ type evpnConfig struct {
 	Encapsulation         types.String                      `tfsdk:"encapsulation"`
 	DefaultGateway        types.String                      `tfsdk:"default_gateway"`
 	MulticastMode         types.String                      `tfsdk:"multicast_mode"`
+	NoCoreIsolation       types.Bool                        `tfsdk:"no_core_isolation"`
 	RoutingInstanceEvpn   types.Bool                        `tfsdk:"routing_instance_evpn"`
 	DuplicateMacDetection *evpnBlockDuplicateMACDetection   `tfsdk:"duplicate_mac_detection"`
 	SwitchOrRIOptions     *evpnBlockSwitchOrRIOptionsConfig `tfsdk:"switch_or_ri_options"`
@@ -336,6 +345,15 @@ func (rsc *evpn) ValidateConfig(
 			)
 		}
 	}
+	if !config.RoutingInstance.IsNull() && !config.RoutingInstance.IsUnknown() &&
+		config.RoutingInstance.ValueString() != junos.DefaultW &&
+		!config.NoCoreIsolation.IsNull() && !config.NoCoreIsolation.IsUnknown() {
+		resp.Diagnostics.AddAttributeError(
+			path.Root("no_core_isolation"),
+			tfdiag.ConflictConfigErrSummary,
+			fmt.Sprintf("no_core_isolation cannot be configured when routing_instance != %q", junos.DefaultW),
+		)
+	}
 	if config.DuplicateMacDetection != nil {
 		if config.DuplicateMacDetection.isEmpty() {
 			resp.Diagnostics.AddAttributeError(
@@ -637,6 +655,9 @@ func (rscData *evpnData) set(
 	if v := rscData.MulticastMode.ValueString(); v != "" {
 		configSet = append(configSet, setPrefix+"multicast-mode "+v)
 	}
+	if rscData.NoCoreIsolation.ValueBool() {
+		configSet = append(configSet, setPrefix+"no-core-isolation")
+	}
 	if rscData.SwitchOrRIOptions != nil {
 		configSet = append(configSet,
 			setSwitchRIPrefix+"route-distinguisher "+rscData.SwitchOrRIOptions.RouteDistinguisher.ValueString())
@@ -722,6 +743,8 @@ func (rscData *evpnData) read(
 				rscData.Encapsulation = types.StringValue(itemTrim)
 			case balt.CutPrefixInString(&itemTrim, "multicast-mode "):
 				rscData.MulticastMode = types.StringValue(itemTrim)
+			case itemTrim == "no-core-isolation":
+				rscData.NoCoreIsolation = types.BoolValue(true)
 			}
 		}
 	}
@@ -790,6 +813,7 @@ func (rscData *evpnData) delOpts(
 		delPrefix + "duplicate-mac-detection",
 		delPrefix + "encapsulation",
 		delPrefix + "multicast-mode",
+		delPrefix + "no-core-isolation",
 	}
 
 	if rscData.RoutingInstanceEvpn.ValueBool() {

internal/providerfwk/testdata/TestAccResourceEvpn_basic/1/main.tf

@@ -41,7 +41,8 @@ resource "junos_evpn" "testacc_evpn_default" {
   depends_on = [
     junos_switch_options.testacc_evpn,
   ]
-  encapsulation = "vxlan"
+  encapsulation     = "vxlan"
+  no_core_isolation = true
   switch_or_ri_options {
     route_distinguisher = "20:1"
     vrf_target          = "target:20:2"