Improvements on the resource routeros_interface_ethernet #266
Conversation
Add examples for routeros_interface_ethernet Add additional computed properties of the routeros_interface_ethernet resource
|
@vaerh I open the PR to test against CI and you get a preview of the work that I am doing. But I really don't have intention to bother you, even the PR may be drastically changed in next commits. I usually signal that the PR is ready to review when I change it from |
|
|
||
| // {"channel": "channel.config", "mikrotik-field-name": "schema-field-name"} | ||
| if ts, ok := s[MetaTransformSet]; ok { | ||
| transformSet = loadTransformSet(ts.Default.(string), false) | ||
| } | ||
|
|
||
| // "field_first", "field_second", "field_third" |
There was a problem hiding this comment.
@vaerh this 3 lines are a bit structural change. heads up, double check if you think it makes sense.
What I am trying to do here is be able to skip fields from being passed to terraform as it throws warnings about fields being missing in the schema.
There was a problem hiding this comment.
It looks logical and good. In my opinion it should work without errors.
jlpedrosa
changed the title
routeros/provider_schema_helpers.go
Outdated
| @@ -170,6 +170,12 @@ var ( | |||
| Description: "Layer2 Maximum transmission unit. " + | |||
| "[See](https://wiki.mikrotik.com/wiki/Maximum_Transmission_Unit_on_RouterBoards).", | |||
| } | |||
| PropL2MtuRw = &schema.Schema{ | |||
There was a problem hiding this comment.
in ethernet devices l2mtu is writable (and must be written).
There was a problem hiding this comment.
I suggest not putting this attribute in the helpers, as it only occurs in this form (RW) in one resource so far.
There was a problem hiding this comment.
KeyL2Mtu: {
Type: schema.TypeInt,
Optional: true,
Description: "Layer2 Maximum transmission unit. " +
"See.",
}
| @@ -121,7 +147,7 @@ func ResourceInterfaceEthernet() *schema.Resource { | |||
| Default: true, | |||
| Optional: true, | |||
| }, | |||
| KeyL2Mtu: PropL2MtuRo, | |||
| KeyL2Mtu: PropL2MtuRw, | |||
There was a problem hiding this comment.
in ethernet devices l2mtu is writable (and must be written).
| return nil | ||
| func updateSchemaWithRouterCapabilities(s map[string]*schema.Schema, item MikrotikItem) map[string]*schema.Schema { | ||
| // Dynamic schema, counters for tx_queue${number}_packets, changes from router to router, read only counters. | ||
| // Just drop them as they don't have much sense in the context of a terraform provider |
There was a problem hiding this comment.
The warning logs by terraform are in the shape of:
╷
│ Warning: Field 'tx_queue2_packet' not found in the schema
│
│ with routeros_interface_ethernet.eths["test-2"],
│ on temp.tf line 33, in resource "routeros_interface_ethernet" "eths":
│ 33: resource "routeros_interface_ethernet" "eths" {
│
│ [MikrotikResourceDataToTerraform] The field was lost during the Schema development: ▷ 'tx_queue2_packet': '0' ◁
|
|
||
| // {"channel": "channel.config", "mikrotik-field-name": "schema-field-name"} | ||
| if ts, ok := s[MetaTransformSet]; ok { | ||
| transformSet = loadTransformSet(ts.Default.(string), false) | ||
| } | ||
|
|
||
| // "field_first", "field_second", "field_third" |
There was a problem hiding this comment.
It looks logical and good. In my opinion it should work without errors.
routeros/provider_schema_helpers.go
Outdated
| @@ -170,6 +170,12 @@ var ( | |||
| Description: "Layer2 Maximum transmission unit. " + | |||
| "[See](https://wiki.mikrotik.com/wiki/Maximum_Transmission_Unit_on_RouterBoards).", | |||
| } | |||
| PropL2MtuRw = &schema.Schema{ | |||
There was a problem hiding this comment.
I suggest not putting this attribute in the helpers, as it only occurs in this form (RW) in one resource so far.
routeros/provider_schema_helpers.go
Outdated
| @@ -170,6 +170,12 @@ var ( | |||
| Description: "Layer2 Maximum transmission unit. " + | |||
| "[See](https://wiki.mikrotik.com/wiki/Maximum_Transmission_Unit_on_RouterBoards).", | |||
| } | |||
| PropL2MtuRw = &schema.Schema{ | |||
There was a problem hiding this comment.
KeyL2Mtu: {
Type: schema.TypeInt,
Optional: true,
Description: "Layer2 Maximum transmission unit. " +
"See.",
}
|
🎉 This PR is included in version 1.18.2 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Add examples for routeros_interface_ethernet
Add additional computed properties of the routeros_interface_ethernet resource.
Disable reading fields that are being ignored (dynamic counters), so the output from terraform plan on subsequent reads is clean.
Disable sending fields not supported by the routers where the provider is pointing to.