Merge pull request #594 from terraform-routeros/vaerh/issue593

Vaerh/issue593

examples/resources/routeros_interface_6to4/import.sh

@@ -0,0 +1,5 @@
+#The ID can be found via API or the terminal
+#The command for the terminal is -> :put [/interface/6to4 get [print show-ids]]
+terraform import routeros_interface_6to4.test *3
+#Or you can import a resource using one of its attributes
+terraform import routeros_interface_6to4.test "name=6to4-tunnel1"

examples/resources/routeros_interface_6to4/resource.tf

@@ -0,0 +1,4 @@
+resource "routeros_interface_6to4" "test" {
+  name      = "6to4-tunnel1"
+  keepalive = "10,10"
+}

routeros/provider.go

@@ -150,6 +150,7 @@ func Provider() *schema.Provider {
 			"routeros_dns_record":          ResourceDnsRecord(),
 
 			// Interface Objects
+			"routeros_interface_6to4":                           ResourceInterface6to4(),
 			"routeros_interface_bonding":                        ResourceInterfaceBonding(),
 			"routeros_interface_bridge_port":                    ResourceInterfaceBridgePort(),
 			"routeros_interface_bridge_settings":                ResourceInterfaceBridgeSettings(),

routeros/provider_schema_helpers.go

@@ -333,7 +333,6 @@ var (
 	PropKeepaliveRw = &schema.Schema{
 		Type:     schema.TypeString,
 		Optional: true,
-		Default:  "10s,10",
 		ValidateFunc: validation.StringMatch(regexp.MustCompile(`^(\d+[smhdw]?)+(,\d+)?$`),
 			"value must be integer[/time],integer 0..4294967295 (https://help.mikrotik.com/docs/display/ROS/GRE)"),
 		Description: "Tunnel keepalive parameter sets the time interval in which the tunnel running flag will " +
@@ -346,14 +345,18 @@ var (
 				return true
 			}
 
+			if AlwaysPresentNotUserProvided(k, old, new, d) {
+				return true
+			}
+
 			if old == "" || new == "" {
 				return false
 			}
 
 			o := strings.Split(old, ",")
 			n := strings.Split(new, ",")
 			if len(o) != 2 || len(n) != 2 {
-				panic(fmt.Sprintf("[GRE keepalive] wrong keepalive format, old: '%v', new: '%v'", old, new))
+				panic(fmt.Sprintf("[Keepalive] wrong keepalive format, old: '%v', new: '%v'", old, new))
 			}
 
 			// Compare keepalive retries.
@@ -364,12 +367,12 @@ var (
 			// Compare keepalive intervals.
 			oDuration, err := ParseDuration(o[0])
 			if err != nil {
-				panic("[GRE keepalive] parse 'old' duration error: " + err.Error())
+				panic("[Keepalive] parse 'old' duration error: " + err.Error())
 			}
 
 			nDuration, err := ParseDuration(n[0])
 			if err != nil {
-				panic("[GRE keepalive] parse 'new' duration error: " + err.Error())
+				panic("[Keepalive] parse 'new' duration error: " + err.Error())
 			}
 
 			return oDuration.Seconds() == nDuration.Seconds()

routeros/resource_interface_6to4.go

@@ -0,0 +1,56 @@
+package routeros
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+/*
+  {
+    ".id": "*3",
+    "actual-mtu": "1480",
+    "clamp-tcp-mss": "true",
+    "disabled": "false",
+    "dont-fragment": "no",
+    "dscp": "inherit",
+    "local-address": "0.0.0.0",
+    "mtu": "auto",
+    "name": "6to4-tunnel1",
+    "remote-address": "unspecified",
+    "running": "true"
+  }
+*/
+
+// https://help.mikrotik.com/docs/spaces/ROS/pages/135004174/6to4
+func ResourceInterface6to4() *schema.Resource {
+	resSchema := map[string]*schema.Schema{
+		MetaResourcePath: PropResourcePath("/interface/6to4"),
+		MetaId:           PropId(Id),
+
+		KeyActualMtu:     PropActualMtuRo,
+		KeyClampTcpMss:   PropClampTcpMssRw,
+		KeyComment:       PropCommentRw,
+		KeyDisabled:      PropDisabledRw,
+		KeyDontFragment:  PropDontFragmentRw,
+		KeyDscp:          PropDscpRw,
+		KeyIpsecSecret:   PropIpsecSecretRw,
+		KeyKeepalive:     PropKeepaliveRw,
+		KeyLocalAddress:  PropLocalAddressRw,
+		KeyMtu:           PropMtuRw(),
+		KeyName:          PropName("Interface name."),
+		KeyRemoteAddress: PropRemoteAddressRw,
+		KeyRunning:       PropRunningRo,
+	}
+
+	return &schema.Resource{
+		CreateContext: DefaultCreate(resSchema),
+		ReadContext:   DefaultRead(resSchema),
+		UpdateContext: DefaultUpdate(resSchema),
+		DeleteContext: DefaultDelete(resSchema),
+
+		Importer: &schema.ResourceImporter{
+			StateContext: ImportStateCustomContext(resSchema),
+		},
+
+		Schema: resSchema,
+	}
+}

routeros/resource_interface_6to4_test.go

@@ -0,0 +1,47 @@
+package routeros
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+)
+
+const testInterface6to4 = "routeros_interface_6to4.test"
+
+func TestAccInterface6to4Test_basic(t *testing.T) {
+	t.Parallel()
+	for _, name := range testNames {
+		t.Run(name, func(t *testing.T) {
+			resource.Test(t, resource.TestCase{
+				PreCheck: func() {
+					testAccPreCheck(t)
+					testSetTransportEnv(t, name)
+				},
+				ProviderFactories: testAccProviderFactories,
+				CheckDestroy:      testCheckResourceDestroy("/interface/6to4", "routeros_interface_6to4"),
+				Steps: []resource.TestStep{
+					{
+						Config: testAccInterface6to4Config(),
+						Check: resource.ComposeTestCheckFunc(
+							testResourcePrimaryInstanceId(testInterface6to4),
+							resource.TestCheckResourceAttr(testInterface6to4, "name", "6to4-tunnel1"),
+							resource.TestCheckResourceAttr(testInterface6to4, "keepalive", "10s,10"),
+						),
+					},
+				},
+			})
+
+		})
+	}
+}
+
+func testAccInterface6to4Config() string {
+	return fmt.Sprintf(`%v
+
+resource "routeros_interface_6to4" "test" {
+  name      = "6to4-tunnel1"
+  keepalive = "10,10"
+}
+`, providerConfig)
+}