Skip to content

Commit 6d3f6ce

Browse files
Joey Ganleyvsin12
Joey Ganley
authored and
vsin12
committed
Added - E4 Dense Availability for OCVS
1 parent 4fbebde commit 6d3f6ce

File tree

118 files changed

+5663
-1563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+5663
-1563
lines changed

‎examples/ocvp/main.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,8 @@ resource "oci_ocvp_sddc" "test_sddc" {
379379
provisioning_vlan_id = oci_core_vlan.test_provisioning_vlan.id
380380
replication_vlan_id = oci_core_vlan.test_replication_vlan.id
381381
initial_sku = "HOUR"
382+
initial_host_ocpu_count = "52.0"
383+
initial_host_shape_name = "BM.DenseIO2.52"
382384
is_shielded_instance_enabled = false
383385
hcx_action = "upgrade"
384386
refresh_hcx_license_status = true
@@ -396,6 +398,8 @@ resource "oci_ocvp_esxi_host" "test_esxi_host" {
396398
#Optional
397399
compute_availability_domain = data.oci_identity_availability_domains.ADs.availability_domains[0]["name"]
398400
current_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
401+
host_ocpu_count = "52.0"
402+
host_shape_name = "BM.DenseIO2.52"
399403
next_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
400404
#defined_tags = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "${var.esxihost_defined_tags_value}"}
401405
#display_name = var.esxihost_display_name

‎internal/integrationtest/ocvp_esxi_host_test.go‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,14 @@ var (
5959
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
6060
"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
6161
"next_sku": acctest.Representation{RepType: acctest.Optional, Create: `MONTH`, Update: `HOUR`},
62+
"host_ocpu_count": acctest.Representation{RepType: acctest.Optional, Create: `8.0`},
63+
"host_shape_name": acctest.Representation{RepType: acctest.Optional, Create: `VM.Standard.E3.Flex`},
6264
}
63-
replacementEsxiHostRepresentation = acctest.RepresentationCopyWithNewProperties(esxiHostRepresentation, map[string]interface{}{
65+
replacementEsxiHostRepresentation = map[string]interface{}{
66+
"sddc_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_ocvp_sddc.test_sddc.id}`},
6467
"failed_esxi_host_id": acctest.Representation{RepType: acctest.Optional, Create: `${data.oci_ocvp_esxi_hosts.existing_esxi_hosts.esxi_host_collection[0].id}`},
6568
"display_name": acctest.Representation{RepType: acctest.Optional, Create: `replacement`},
66-
})
69+
}
6770

6871
EsxiHostResourceDependencies = SddcRequiredOnlyResource + acctest.GenerateDataSourceFromRepresentationMap("oci_ocvp_esxi_hosts", "existing_esxi_hosts", acctest.Optional, acctest.Create, existingEsxiHostDataSourceRepresentation)
6972
)
@@ -93,7 +96,20 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
9396
Config: config + compartmentIdVariableStr + EsxiHostResourceDependencies +
9497
acctest.GenerateResourceFromRepresentationMap("oci_ocvp_esxi_host", "test_esxi_host", acctest.Required, acctest.Create, esxiHostRepresentation),
9598
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
99+
resource.TestCheckResourceAttrSet(resourceName, "billing_contract_end_date"),
100+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
101+
resource.TestCheckResourceAttrSet(resourceName, "compute_availability_domain"),
102+
resource.TestCheckResourceAttrSet(resourceName, "compute_instance_id"),
103+
resource.TestCheckResourceAttrSet(resourceName, "current_sku"),
104+
resource.TestCheckResourceAttrSet(resourceName, "display_name"),
105+
resource.TestCheckResourceAttrSet(resourceName, "host_ocpu_count"),
106+
resource.TestCheckResourceAttrSet(resourceName, "host_shape_name"),
107+
resource.TestCheckResourceAttrSet(resourceName, "id"),
108+
resource.TestCheckResourceAttrSet(resourceName, "next_sku"),
96109
resource.TestCheckResourceAttrSet(resourceName, "sddc_id"),
110+
resource.TestCheckResourceAttrSet(resourceName, "state"),
111+
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
112+
resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
97113

98114
func(s *terraform.State) (err error) {
99115
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -111,14 +127,20 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
111127
Config: config + compartmentIdVariableStr + EsxiHostResourceDependencies +
112128
acctest.GenerateResourceFromRepresentationMap("oci_ocvp_esxi_host", "test_esxi_host", acctest.Optional, acctest.Create, replacementEsxiHostRepresentation),
113129
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
130+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
114131
resource.TestCheckResourceAttrSet(resourceName, "compute_availability_domain"),
132+
resource.TestCheckResourceAttrSet(resourceName, "compute_instance_id"),
115133
resource.TestCheckResourceAttr(resourceName, "current_sku", "MONTH"),
116134
resource.TestCheckResourceAttr(resourceName, "display_name", `replacement`),
117135
resource.TestCheckResourceAttrSet(resourceName, "failed_esxi_host_id"),
118-
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
136+
resource.TestCheckResourceAttrSet(resourceName, "host_ocpu_count"),
137+
resource.TestCheckResourceAttrSet(resourceName, "host_shape_name"),
119138
resource.TestCheckResourceAttrSet(resourceName, "id"),
120-
resource.TestCheckResourceAttr(resourceName, "next_sku", "MONTH"),
139+
resource.TestCheckResourceAttrSet(resourceName, "next_sku"),
121140
resource.TestCheckResourceAttrSet(resourceName, "sddc_id"),
141+
resource.TestCheckResourceAttrSet(resourceName, "state"),
142+
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
143+
resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
122144

123145
func(s *terraform.State) (err error) {
124146
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -140,12 +162,15 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
140162
resource.TestCheckResourceAttrSet(singularDatasourceName, "esxi_host_id"),
141163
resource.TestCheckResourceAttrSet(singularDatasourceName, "compartment_id"),
142164
resource.TestCheckResourceAttrSet(singularDatasourceName, "compute_availability_domain"),
165+
resource.TestCheckResourceAttrSet(singularDatasourceName, "compute_instance_id"),
143166
resource.TestCheckResourceAttr(singularDatasourceName, "current_sku", "MONTH"),
144167
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", `replacement`),
145-
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
146168
resource.TestCheckResourceAttrSet(singularDatasourceName, "grace_period_end_date"),
169+
resource.TestCheckResourceAttr(singularDatasourceName, "host_ocpu_count", "8"),
170+
resource.TestCheckResourceAttr(singularDatasourceName, "host_shape_name", "VM.Standard.E3.Flex"),
147171
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
148172
resource.TestCheckResourceAttr(singularDatasourceName, "next_sku", "MONTH"),
173+
resource.TestCheckResourceAttrSet(singularDatasourceName, "sddc_id"),
149174
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
150175
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"),
151176
resource.TestCheckResourceAttrSet(singularDatasourceName, "time_updated"),
@@ -161,13 +186,20 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
161186
acctest.GenerateResourceFromRepresentationMap("oci_ocvp_esxi_host", "test_esxi_host", acctest.Optional, acctest.Create, esxiHostRepresentation),
162187
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
163188
resource.TestCheckResourceAttrSet(resourceName, "billing_contract_end_date"),
189+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
164190
resource.TestCheckResourceAttrSet(resourceName, "compute_availability_domain"),
191+
resource.TestCheckResourceAttrSet(resourceName, "compute_instance_id"),
165192
resource.TestCheckResourceAttr(resourceName, "current_sku", "MONTH"),
166193
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
167194
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
195+
resource.TestCheckResourceAttr(resourceName, "host_ocpu_count", "8"),
196+
resource.TestCheckResourceAttr(resourceName, "host_shape_name", "VM.Standard.E3.Flex"),
168197
resource.TestCheckResourceAttrSet(resourceName, "id"),
169198
resource.TestCheckResourceAttr(resourceName, "next_sku", "MONTH"),
170199
resource.TestCheckResourceAttrSet(resourceName, "sddc_id"),
200+
resource.TestCheckResourceAttrSet(resourceName, "state"),
201+
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
202+
resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
171203

172204
func(s *terraform.State) (err error) {
173205
resId, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -187,13 +219,20 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
187219
acctest.GenerateResourceFromRepresentationMap("oci_ocvp_esxi_host", "test_esxi_host", acctest.Optional, acctest.Update, esxiHostRepresentation),
188220
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
189221
resource.TestCheckResourceAttrSet(resourceName, "billing_contract_end_date"),
222+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
190223
resource.TestCheckResourceAttrSet(resourceName, "compute_availability_domain"),
224+
resource.TestCheckResourceAttrSet(resourceName, "compute_instance_id"),
191225
resource.TestCheckResourceAttr(resourceName, "current_sku", "MONTH"),
192226
resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
193227
resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"),
228+
resource.TestCheckResourceAttr(resourceName, "host_ocpu_count", "8"),
229+
resource.TestCheckResourceAttr(resourceName, "host_shape_name", "VM.Standard.E3.Flex"),
194230
resource.TestCheckResourceAttrSet(resourceName, "id"),
195231
resource.TestCheckResourceAttr(resourceName, "next_sku", "HOUR"),
196232
resource.TestCheckResourceAttrSet(resourceName, "sddc_id"),
233+
resource.TestCheckResourceAttrSet(resourceName, "state"),
234+
resource.TestCheckResourceAttrSet(resourceName, "time_created"),
235+
resource.TestCheckResourceAttrSet(resourceName, "time_updated"),
197236

198237
func(s *terraform.State) (err error) {
199238
resId2, err = acctest.FromInstanceState(s, resourceName, "id")
@@ -221,6 +260,8 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
221260
resource.TestCheckResourceAttr(datasourceName, "esxi_host_collection.0.display_name", "displayName2"),
222261
resource.TestCheckResourceAttrSet(datasourceName, "esxi_host_collection.0.sddc_id"),
223262
resource.TestCheckResourceAttrSet(datasourceName, "esxi_host_collection.0.id"),
263+
resource.TestCheckResourceAttr(datasourceName, "esxi_host_collection.0.host_ocpu_count", "8"),
264+
resource.TestCheckResourceAttr(datasourceName, "esxi_host_collection.0.host_shape_name", "VM.Standard.E3.Flex"),
224265
resource.TestCheckResourceAttrSet(datasourceName, "esxi_host_collection.0.compute_instance_id"),
225266
resource.TestCheckResourceAttrSet(datasourceName, "esxi_host_collection.0.time_created"),
226267
resource.TestCheckResourceAttrSet(datasourceName, "esxi_host_collection.0.time_updated"),
@@ -240,6 +281,8 @@ func TestOcvpEsxiHostResource_basic(t *testing.T) {
240281
resource.TestCheckResourceAttr(singularDatasourceName, "current_sku", "MONTH"),
241282
resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
242283
resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
284+
resource.TestCheckResourceAttr(singularDatasourceName, "host_ocpu_count", "8"),
285+
resource.TestCheckResourceAttr(singularDatasourceName, "host_shape_name", "VM.Standard.E3.Flex"),
243286
resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
244287
resource.TestCheckResourceAttr(singularDatasourceName, "next_sku", "HOUR"),
245288
resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),

0 commit comments

Comments
 (0)