Skip to content

Commit 0515c82

Browse files
committed
Move windows instance to generated test and drop legacy datasource test
1 parent 6b87269 commit 0515c82

File tree

2 files changed

+47
-100
lines changed

2 files changed

+47
-100
lines changed

provider/core_instance_credential_data_source_test.go

Lines changed: 0 additions & 99 deletions
This file was deleted.

provider/core_instance_credential_test.go

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,52 @@ const (
1818
1919
`
2020
InstanceCredentialResourceDependencies = ""
21+
22+
WindowsInstanceDnsConfig = `
23+
data "oci_identity_availability_domains" "ADs" {
24+
compartment_id = "${var.compartment_id}"
25+
}
26+
27+
resource "oci_core_virtual_network" "t" {
28+
compartment_id = "${var.compartment_id}"
29+
cidr_block = "10.0.0.0/16"
30+
display_name = "-tf-vcn"
31+
}
32+
33+
resource "oci_core_subnet" "t" {
34+
compartment_id = "${var.compartment_id}"
35+
vcn_id = "${oci_core_virtual_network.t.id}"
36+
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[0],"name")}"
37+
route_table_id = "${oci_core_virtual_network.t.default_route_table_id}"
38+
security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}"]
39+
dhcp_options_id = "${oci_core_virtual_network.t.default_dhcp_options_id}"
40+
cidr_block = "10.0.1.0/24"
41+
display_name = "-tf-subnet"
42+
}
43+
44+
variable "InstanceImageOCID" {
45+
type = "map"
46+
default = {
47+
// Oracle-provided image "Windows-Server-2012-R2-Standard-Edition-VM-2017.07.25-0"
48+
us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaab2xgy6bijtudhsgsbgns6zwfqnkdb2bp4l4qap7e4mehv6bv3qca"
49+
us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaajlfsi5npxguvhad3v5d5lu7dc3zcylr2csfdexgd6kor3f6zeqeq"
50+
eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaanc7bsuauwkfonfmk52cn3mwjzgamhp4llsh754yahbv2e6no4u3q"
51+
}
52+
}
53+
54+
resource "oci_core_instance" "t" {
55+
availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
56+
compartment_id = "${var.compartment_id}"
57+
subnet_id = "${oci_core_subnet.t.id}"
58+
image = "${var.InstanceImageOCID[var.region]}"
59+
shape = "VM.Standard1.1"
60+
metadata {
61+
ssh_authorized_keys = "${var.ssh_public_key}"
62+
}
63+
timeouts {
64+
create = "15m"
65+
}
66+
}`
2167
)
2268

2369
func TestCoreInstanceCredentialResource_basic(t *testing.T) {
@@ -36,7 +82,7 @@ func TestCoreInstanceCredentialResource_basic(t *testing.T) {
3682
Steps: []resource.TestStep{
3783
// verify singular datasource
3884
{
39-
Config: config + windowsInstanceDnsConfig + `
85+
Config: config + WindowsInstanceDnsConfig + `
4086
4187
data "oci_core_instance_credentials" "test_instance_credentials" {
4288
#Required

0 commit comments

Comments
 (0)