From b48c96d9334dec0447416b1d48cd2aaefe6c5b4b Mon Sep 17 00:00:00 2001 From: Achim Christ Date: Mon, 28 Apr 2025 13:50:42 +0000 Subject: [PATCH 1/3] fix: add node name to ethernet_port import identifier to avoid "received 2 or more records" error Signed-off-by: Achim Christ --- .../networking/network_ethernet_port_resource.go | 9 +++++---- .../networking/network_ethernet_port_resource_test.go | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/internal/provider/networking/network_ethernet_port_resource.go b/internal/provider/networking/network_ethernet_port_resource.go index f6327727..1d018a85 100644 --- a/internal/provider/networking/network_ethernet_port_resource.go +++ b/internal/provider/networking/network_ethernet_port_resource.go @@ -641,16 +641,17 @@ func (r *EthernetPortResource) ImportState(ctx context.Context, req resource.Imp // Extract ethernet_port info from import identifier idParts := strings.Split(req.ID, ",") - if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" { + if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" { resp.Diagnostics.AddError( "Unexpected Import Identifier", - fmt.Sprintf("Expected import identifier with format: cx_profile_name,name, got: %q.", req.ID), + fmt.Sprintf("Expected import identifier with format: name,node,cx_profile_name, got: %q.", req.ID), ) return } // Save ethernet_port info to attributes - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("cx_profile_name"), idParts[0])...) - resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), idParts[0])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("node").AtName("name"), idParts[1])...) + resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("cx_profile_name"), idParts[2])...) } diff --git a/internal/provider/networking/network_ethernet_port_resource_test.go b/internal/provider/networking/network_ethernet_port_resource_test.go index 08986a4e..e01e4169 100644 --- a/internal/provider/networking/network_ethernet_port_resource_test.go +++ b/internal/provider/networking/network_ethernet_port_resource_test.go @@ -125,7 +125,7 @@ func TestAccNetworkEthernetPortResource(t *testing.T) { // { // ResourceName: "netapp-ontap_port.vlan", // ImportState: true, - // ImportStateId: fmt.Sprintf("%s,%s", "cluster4", "e0a-300"), + // ImportStateId: fmt.Sprintf("%s,%s", "e0a-300", "bsuhas-vsim1", "cluster4"), // Check: resource.ComposeTestCheckFunc( // resource.TestMatchResourceAttr("netapp-ontap_port.vlan", "broadcast_domain.id", regexp.MustCompile(idRegexNetworkEthernetPort)), // resource.TestCheckResourceAttr("netapp-ontap_port.vlan", "broadcast_domain.name", "Default"), From c678bcc11612bc7c74f436b2c8732893d6f07143 Mon Sep 17 00:00:00 2001 From: Achim Christ Date: Mon, 28 Apr 2025 13:52:46 +0000 Subject: [PATCH 2/3] chore: update changelog Signed-off-by: Achim Christ --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b346ac7..e261bdaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ENHANCEMENTS: - **netapp-ontap_aggregate_data_source**, **netapp-ontap_aggregates_data_source**: added `space.block_storage.available` option ([#256](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/256)) +BUG FIXES: + +- **netapp-ontap_port**: error when importing VLANs in multi-node clusters ([#479](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/479)) + # 2.1.2 (not released) BUG FIXES: From c6a4563da47619819906c89ad6e70ab432cd17d5 Mon Sep 17 00:00:00 2001 From: Achim Christ Date: Mon, 28 Apr 2025 14:02:48 +0000 Subject: [PATCH 3/3] chore: update changelog --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 774267c9..7318ce26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,6 @@ ENHANCEMENTS: BUG FIXES: - **netapp-ontap_port**: error when importing VLANs in multi-node clusters ([#479](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/479)) - -BUG FIXES: - - **netapp-ontap_security_account**: Error importing security_account resource if same account exists on multiple SVMs([#457](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/457)) - **netapp-ontap_svm_qos_policy_activation**: ID parameter missing in QOS policy ([#429](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/429)) - **netapp-ontap_security_account**: password, comment and locked parameters not passed into body request for creating account ([#462](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/462))