Skip to content

Commit fa74244

Browse files
suhasbshekarsuhasbshekar
authored
Merge branch 'integration/main' into stable-2.4.0
2 parents 31f001f + 11886c5 commit fa74244

35 files changed

+2022
-57
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ BUG FIXES:
55
- **netapp-ontap_volumes**: fixed issue with data source ([#578](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/578))
66
- **netapp-ontap_svms_data_source**: Fixed `storage_limit` value conversion error. ([#574](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/574))
77

8+
FEATURES:
9+
10+
- **New Data Source:** `netapp-ontap_network_ip_service_policy` and `netapp-ontap_network_ip_service_policies`([#621](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/621))
11+
- **New Resource:** `netapp-ontap_network_ip_service_policy` ([#621](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/621))
12+
13+
ENHANCEMENTS:
14+
15+
- Fixed import documentation on resources which are supporting import. ([#613](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/613))
16+
- **netapp-ontap_security_certificate**: added extra parameter to import to support for avoiding duplicate cert names across svms ([#614](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/614))
17+
18+
BUG FIXES:
19+
20+
- Fixed import documentation on resources which are supporting import. ([#613](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/613))
21+
- **netapp-ontap_name_services_ldap_resource**: Fixed duplicate Set Element Error with `preferred_ad_servers` ([#615](https://github.com/NetApp/terraform-provider-netapp-ontap/issues/615))
22+
823
# 2.4.0 (2025-11-20)
924

1025
ENHANCEMENTS:

‎docs/data-sources/network_ip_service_policies.md‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "netapp-ontap_network_ip_service_policies Data Source - terraform-provider-netapp-ontap"
4+
subcategory: "Networking"
5+
description: |-
6+
Service Policies data source
7+
---
8+
9+
# Data Source Service Policies
10+
11+
Retrieves details of multiple Service Policies
12+
13+
## Related ONTAP commands
14+
15+
```commandline
16+
* network interface service-policy show
17+
```
18+
19+
## Example Usage
20+
21+
```terraform
22+
# retrieving cluster-scoped service policies
23+
data "netapp-ontap_network_ip_service_policies" "example1" {
24+
# required to know which system to interface with
25+
cx_profile_name = "hw-cluster"
26+
filter = {
27+
scope = "cluster"
28+
}
29+
}
30+
31+
# retrieving svm-scoped service policies
32+
data "netapp-ontap_network_ip_service_policies" "example2" {
33+
# required to know which system to interface with
34+
cx_profile_name = "hw-cluster"
35+
filter = {
36+
svm_name = "svm1"
37+
}
38+
}
39+
40+
# retrieving service policies with matching name pattern
41+
data "netapp-ontap_network_ip_service_policies" "example3" {
42+
# required to know which system to interface with
43+
cx_profile_name = "hw-cluster"
44+
filter = {
45+
svm_name = "svm1"
46+
name = "test_service_policy*"
47+
}
48+
}
49+
```
50+
51+
<!-- schema generated by tfplugindocs -->
52+
## Schema
53+
54+
### Required
55+
56+
- `cx_profile_name` (String) Connection profile name
57+
- `filter` (Attributes) (see [below for nested schema](#nestedatt--filter))
58+
59+
### Read-Only
60+
61+
- `ip_service_policies` (Attributes List) (see [below for nested schema](#nestedatt--ip_service_policies))
62+
63+
<a id="nestedatt--filter"></a>
64+
### Nested Schema for `filter`
65+
66+
Optional:
67+
68+
- `name` (String) The name of the service policy
69+
- `scope` (String) The name of the SVM
70+
- `svm_name` (String) The name of the SVM
71+
72+
73+
<a id="nestedatt--ip_service_policies"></a>
74+
### Nested Schema for `ip_service_policies`
75+
76+
Required:
77+
78+
- `cx_profile_name` (String) Connection profile name
79+
- `name` (String) The name of the service policy
80+
81+
Read-Only:
82+
83+
- `id` (String) Service policy UUID
84+
- `ipspace` (String) IP space name
85+
- `scope` (String) Set to "svm" for service policies owned by an SVM. Otherwise, set to "cluster".
86+
- `services` (Set of String) A list of services that should be included in this policy
87+
- `svm_name` (String) The name of the SVM on which the service policy exists

‎docs/data-sources/network_ip_service_policy.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "netapp-ontap_network_ip_service_policy Data Source - terraform-provider-netapp-ontap"
4+
subcategory: "Networking"
5+
description: |-
6+
Service Policy data source
7+
---
8+
9+
# Data Source Service Policy
10+
11+
Retrieves the specified cluster-scoped or svm-scoped service policy
12+
13+
## Related ONTAP commands
14+
15+
```commandline
16+
* network interface service-policy show
17+
```
18+
19+
## Supported Platforms
20+
21+
* On-prem ONTAP system 9.8 or higher
22+
* Amazon FSx for NetApp ONTAP
23+
24+
## Example Usage
25+
26+
```terraform
27+
data "netapp-ontap_network_ip_service_policy" "svm_scoped" {
28+
# required to know which system to interface with
29+
cx_profile_name = "hw-cluster"
30+
name = "test_service_policy"
31+
svm_name = "svm1"
32+
}
33+
34+
data "netapp-ontap_network_ip_service_policy" "cluster_scoped" {
35+
# required to know which system to interface with
36+
cx_profile_name = "hw-cluster"
37+
name = "default-management"
38+
scope = "cluster"
39+
ipspace = "Default"
40+
}
41+
```
42+
43+
<!-- schema generated by tfplugindocs -->
44+
## Schema
45+
46+
### Required
47+
48+
- `cx_profile_name` (String) Connection profile name
49+
- `name` (String) The name of the service policy
50+
51+
### Optional
52+
53+
- `ipspace` (String) IP space name
54+
- `scope` (String) Set to "svm" for service policies owned by an SVM. Otherwise, set to "cluster".
55+
- `svm_name` (String) The name of the SVM on which the service policy exists
56+
57+
### Read-Only
58+
59+
- `id` (String) Service policy UUID
60+
- `services` (Set of String) A list of services that should be included in this policy

‎docs/resources/cifs_local_user.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,53 @@ resource "netapp-ontap_cifs_local_user" "example" {
6565
Read-Only:
6666

6767
- `name` (String) CifsLocalUser membership name
68+
69+
## Import
70+
71+
This resource supports import, which allows you to import existing CIFS local user into the state of this resource.
72+
Import require a unique ID composed of the user name, SVM name, and connection profile, separated by commas.
73+
74+
id = `name`,`svm_name`,`cx_profile_name`
75+
76+
### Terraform Import
77+
78+
For example
79+
80+
```shell
81+
terraform import netapp-ontap_cifs_local_user.example localuser1,svm1,cluster4
82+
```
83+
84+
!> The terraform import CLI command can only import resources into the state. Importing via the CLI does not generate configuration. If you want to generate the accompanying configuration for imported resources, use the import block instead.
85+
86+
### Terraform Import Block
87+
88+
This requires Terraform 1.5 or higher, and will auto create the configuration for you
89+
90+
First create the block
91+
92+
```terraform
93+
import {
94+
to = netapp-ontap_cifs_local_user.user_import
95+
id = "localuser1,svm1,cluster4"
96+
}
97+
```
98+
99+
Next run, this will auto create the configuration for you
100+
101+
```shell
102+
terraform plan -generate-config-out=generated.tf
103+
```
104+
105+
This will generate a file called generated.tf, which will contain the configuration for the imported resource
106+
107+
```terraform
108+
# __generated__ by Terraform
109+
# Please review these resources and move them into your main configuration files.
110+
# __generated__ by Terraform from "localuser1,svm1,cluster4"
111+
resource "netapp-ontap_cifs_local_user" "user_import" {
112+
cx_profile_name = "cluster4"
113+
name = "localuser1"
114+
svm_name = "svm1"
115+
...
116+
}
117+
```

‎docs/resources/cifs_service.md‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,3 +136,58 @@ Optional:
136136
- `try_ldap_channel_binding` (Boolean) Specifies whether or not channel binding is attempted in the case of TLS/LDAPS (9.10)
137137
- `use_ldaps` (Boolean) Specifies whether or not to use use LDAPS for secure Active Directory LDAP connections by using the TLS/SSL protocols (9.10)
138138
- `use_start_tls` (Boolean) Specifies whether or not to use SSL/TLS for allowing secure LDAP communication with Active Directory LDAP servers (9.10)
139+
140+
## Import
141+
142+
This resource supports import, which allows you to import existing CIFS service into the state of this resource.
143+
Import require a unique ID composed of the service name, SVM name, connection profile, AD domain user, and AD domain password, separated by commas.
144+
145+
id = `name`,`svm_name`,`cx_profile_name`,`ad_domain.user`,`ad_domain.password`
146+
147+
### Terraform Import
148+
149+
For example
150+
151+
```shell
152+
terraform import netapp-ontap_cifs_service.example tftestcifs,testSVM,clustercifs,administrator,password
153+
```
154+
155+
!> The terraform import CLI command can only import resources into the state. Importing via the CLI does not generate configuration. If you want to generate the accompanying configuration for imported resources, use the import block instead.
156+
157+
### Terraform Import Block
158+
159+
This requires Terraform 1.5 or higher, and will auto create the configuration for you
160+
161+
First create the block
162+
163+
```terraform
164+
import {
165+
to = netapp-ontap_cifs_service.cifs_import
166+
id = "tftestcifs,testSVM,clustercifs,administrator,password"
167+
}
168+
```
169+
170+
Next run, this will auto create the configuration for you
171+
172+
```shell
173+
terraform plan -generate-config-out=generated.tf
174+
```
175+
176+
This will generate a file called generated.tf, which will contain the configuration for the imported resource
177+
178+
```terraform
179+
# __generated__ by Terraform
180+
# Please review these resources and move them into your main configuration files.
181+
# __generated__ by Terraform from "tftestcifs,testSVM,clustercifs,administrator,password"
182+
resource "netapp-ontap_cifs_service" "cifs_import" {
183+
cx_profile_name = "clustercifs"
184+
name = "tftestcifs"
185+
svm_name = "testSVM"
186+
ad_domain = {
187+
user = "administrator"
188+
password = "password"
189+
...
190+
}
191+
...
192+
}
193+
```

‎docs/resources/cifs_share.md‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,54 @@ Optional:
9898
- `permission` (String) Specifies the access rights that a user or group has on the defined CIFS Share.
9999
- `type` (String) string Specifies the type of the user or group to add to the access control list of a CIFS share.
100100
- `user_or_group` (String) Specifies the user or group name to add to the access control list of a CIFS share.
101+
102+
## Import
103+
104+
This resource supports import, which allows you to import existing CIFS share into the state of this resource.
105+
Import require a unique ID composed of the share name, SVM name, and connection profile, separated by commas.
106+
107+
id = `name`,`svm_name`,`cx_profile_name`
108+
109+
### Terraform Import
110+
111+
For example
112+
113+
```shell
114+
terraform import netapp-ontap_cifs_share.example share1,svm1,cluster4
115+
```
116+
117+
!> The terraform import CLI command can only import resources into the state. Importing via the CLI does not generate configuration. If you want to generate the accompanying configuration for imported resources, use the import block instead.
118+
119+
### Terraform Import Block
120+
121+
This requires Terraform 1.5 or higher, and will auto create the configuration for you
122+
123+
First create the block
124+
125+
```terraform
126+
import {
127+
to = netapp-ontap_cifs_share.share_import
128+
id = "share1,svm1,cluster4"
129+
}
130+
```
131+
132+
Next run, this will auto create the configuration for you
133+
134+
```shell
135+
terraform plan -generate-config-out=generated.tf
136+
```
137+
138+
This will generate a file called generated.tf, which will contain the configuration for the imported resource
139+
140+
```terraform
141+
# __generated__ by Terraform
142+
# Please review these resources and move them into your main configuration files.
143+
# __generated__ by Terraform from "share1,svm1,cluster4"
144+
resource "netapp-ontap_cifs_share" "share_import" {
145+
cx_profile_name = "cluster4"
146+
name = "share1"
147+
svm_name = "svm1"
148+
path = "/vol1"
149+
...
150+
}
151+
```

‎docs/resources/iscsi_service.md‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,53 @@ Optional:
5353
Read-Only:
5454

5555
- `name` (String) iSCSI target name of the iSCSI service
56+
57+
## Import
58+
59+
This resource supports import, which allows you to import existing iSCSI service into the state of this resource.
60+
Import require a unique ID composed of the SVM name and connection profile, separated by a comma.
61+
62+
id = `svm_name`,`cx_profile_name`
63+
64+
### Terraform Import
65+
66+
For example
67+
68+
```shell
69+
terraform import netapp-ontap_iscsi_service.example svm1,cluster4
70+
```
71+
72+
!> The terraform import CLI command can only import resources into the state. Importing via the CLI does not generate configuration. If you want to generate the accompanying configuration for imported resources, use the import block instead.
73+
74+
### Terraform Import Block
75+
76+
This requires Terraform 1.5 or higher, and will auto create the configuration for you
77+
78+
First create the block
79+
80+
```terraform
81+
import {
82+
to = netapp-ontap_iscsi_service.iscsi_import
83+
id = "svm1,cluster4"
84+
}
85+
```
86+
87+
Next run, this will auto create the configuration for you
88+
89+
```shell
90+
terraform plan -generate-config-out=generated.tf
91+
```
92+
93+
This will generate a file called generated.tf, which will contain the configuration for the imported resource
94+
95+
```terraform
96+
# __generated__ by Terraform
97+
# Please review these resources and move them into your main configuration files.
98+
# __generated__ by Terraform from "svm1,cluster4"
99+
resource "netapp-ontap_iscsi_service" "iscsi_import" {
100+
cx_profile_name = "cluster4"
101+
svm_name = "svm1"
102+
enabled = true
103+
...
104+
}
105+
```

0 commit comments

Comments
 (0)