Add the VRF helper

terraform-routeros · Jul 12, 2023 · c595bcb · c595bcb
1 parent ebf45d9
commit c595bcb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/routeros/provider_schema_helpers.go b/routeros/provider_schema_helpers.go
@@ -37,6 +37,7 @@ const (
 	KeyName        = "name"
 	KeyPlaceBefore = "place_before"
 	KeyRunning     = "running"
+	KeyVrf         = "vrf"
 )
 
 // PropResourcePath Resource path property.
@@ -190,6 +191,12 @@ var (
 		Type:     schema.TypeBool,
 		Computed: true,
 	}
+	PropVrfRw = &schema.Schema{
+		Type:        schema.TypeString,
+		Optional:    true,
+		Default:     "main",
+		Description: "The VRF table this resource operates on.",
+	}
 )
 
 // PropMtuRw MTU value can be integer or 'auto'.

diff --git a/routeros/resource_bgp_connection.go b/routeros/resource_bgp_connection.go
@@ -520,12 +520,7 @@ func ResourceRoutingBGPConnection() *schema.Resource {
 			Optional:    true,
 			Description: "Whether to use the BFD protocol for faster connection state detection.",
 		},
-		"vrf": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Default:     "main",
-			Description: "Name of the VRF BGP connections operates on. By default always use the 'main' routing table.",
-		},
+		KeyVrf: PropVrfRw,
 	}
 
 	return &schema.Resource{

diff --git a/routeros/resource_bgp_template.go b/routeros/resource_bgp_template.go
@@ -391,12 +391,7 @@ func ResourceRoutingBGPTemplate() *schema.Resource {
 			Optional:    true,
 			Description: "Whether to use the BFD protocol for faster connection state detection.",
 		},
-		"vrf": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Default:     "main",
-			Description: "Name of the VRF BGP connections operates on. By default always use the 'main' routing table.",
-		},
+		KeyVrf: PropVrfRw,
 	}
 
 	return &schema.Resource{

diff --git a/routeros/resource_ip_service.go b/routeros/resource_ip_service.go
@@ -82,12 +82,7 @@ func ResourceIpService() *schema.Resource {
 			Description:  "Specifies which TLS versions to allow by a particular service.",
 			ValidateFunc: validation.StringInSlice([]string{"any", "only-1.2"}, false),
 		},
-		"vrf": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Default:     "main",
-			Description: "Specify which VRF instance to use by a particular service.",
-		},
+		KeyVrf: PropVrfRw,
 	}
 
 	resCreateUpdate := func(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {

diff --git a/routeros/resource_routing_ospf_instance.go b/routeros/resource_routing_ospf_instance.go
@@ -107,12 +107,7 @@ func ResourceRoutingOspfInstance() *schema.Resource {
 			Description:  "OSPF version this instance will be running (v2 for IPv4, v3 for IPv6).",
 			ValidateFunc: validation.IntBetween(2, 3),
 		},
-		"vrf": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Default:     "main",
-			Description: "The VRF table this OSPF instance operates on",
-		},
+		KeyVrf: PropVrfRw,
 	}
 
 	return &schema.Resource{