Skip to content

Commit e209de3

Browse files
Terraform Team AutomationjiaqchenO
authored andcommitted
Added - Support for VMware Major and Minor Version Upgrade
1 parent 92531c8 commit e209de3

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

internal/integrationtest/ocvp_supported_vmware_software_version_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ import (
1616

1717
var (
1818
OcvpSupportedVmwareSoftwareVersionDataSourceRepresentation = map[string]interface{}{
19-
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
20-
"host_shape_name": acctest.Representation{RepType: acctest.Optional, Create: `BM.DenseIO2.52`},
21-
"version": acctest.Representation{RepType: acctest.Optional, Create: `7.0 update 3`},
19+
"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
20+
"host_shape_name": acctest.Representation{RepType: acctest.Optional, Create: `BM.DenseIO2.52`},
21+
"version": acctest.Representation{RepType: acctest.Optional, Create: `7.0 update 3`},
22+
"version_to_upgrade": acctest.Representation{RepType: acctest.Optional, Create: `7.0 update 2`},
2223
}
2324

2425
OcvpSupportedVmwareSoftwareVersionResourceConfig = ""
@@ -59,6 +60,7 @@ func TestOcvpSupportedVmwareSoftwareVersionResource_basic(t *testing.T) {
5960
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
6061
resource.TestCheckResourceAttr(datasourceName, "compartment_id", compartmentId),
6162
resource.TestCheckResourceAttrSet(datasourceName, "host_shape_name"),
63+
resource.TestCheckResourceAttr(datasourceName, "version_to_upgrade", "7.0 update 2"),
6264
resource.TestCheckResourceAttr(datasourceName, "version", `7.0 update 3`),
6365

6466
resource.TestCheckResourceAttr(datasourceName, "items.0.description", "7.0 update 3"),

internal/service/ocvp/ocvp_supported_vmware_software_versions_data_source.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ func OcvpSupportedVmwareSoftwareVersionsDataSource() *schema.Resource {
3030
Type: schema.TypeString,
3131
Optional: true,
3232
},
33+
"version_to_upgrade": {
34+
Type: schema.TypeString,
35+
Optional: true,
36+
},
3337
"items": {
3438
Type: schema.TypeList,
3539
Computed: true,
@@ -119,6 +123,11 @@ func (s *OcvpSupportedVmwareSoftwareVersionsDataSourceCrud) Get() error {
119123
request.Version = &tmp
120124
}
121125

126+
if versionToUpgrade, ok := s.D.GetOkExists("version_to_upgrade"); ok {
127+
tmp := versionToUpgrade.(string)
128+
request.VersionToUpgrade = &tmp
129+
}
130+
122131
request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "ocvp")
123132

124133
response, err := s.Client.ListSupportedVmwareSoftwareVersions(context.Background(), request)

website/docs/d/ocvp_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data "oci_ocvp_cluster" "test_cluster" {
2525

2626
The following arguments are supported:
2727

28-
* `cluster_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Cluster.
28+
* `cluster_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the SDDC Cluster.
2929

3030

3131
## Attributes Reference

website/docs/d/ocvp_esxi_hosts.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ data "oci_ocvp_esxi_hosts" "test_esxi_hosts" {
4242

4343
The following arguments are supported:
4444

45-
* `cluster_id` - (Optional) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Cluster.
45+
* `cluster_id` - (Optional) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the SDDC Cluster.
4646
* `compartment_id` - (Optional) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment as optional parameter.
4747
* `compute_instance_id` - (Optional) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Compute instance.
4848
* `display_name` - (Optional) A filter to return only resources that match the given display name exactly.

website/docs/d/ocvp_supported_vmware_software_versions.html.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ data "oci_ocvp_supported_vmware_software_versions" "test_supported_vmware_softwa
2424
#Optional
2525
host_shape_name = oci_core_shape.test_shape.name
2626
version = var.supported_vmware_software_version_version
27+
version_to_upgrade = var.supported_vmware_software_version_version_to_upgrade
2728
}
2829
```
2930

@@ -34,6 +35,7 @@ The following arguments are supported:
3435
* `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
3536
* `host_shape_name` - (Optional) A filter to return only resources that match or support the given ESXi host shape.
3637
* `version` - (Optional) A filter to return only resources that match the given VMware software version exactly.
38+
* `version_to_upgrade` - (Optional) A filter to return only VMware software versions that the given VMware software version can be upgraded to.
3739

3840

3941
## Attributes Reference

0 commit comments

Comments
 (0)