Skip to content

Commit 8cfa208

Browse files
neverdreamsdshelbyo
authored andcommitted
VM.Standard1.1, 1.2 is too old for tests which caused a NotFound issue (TER-775), update them to use VM.Standard1.8
Squashed commit of the following: commit a0add130796a648a9d46f0cd2c38d2723dbc5133 Author: Yuanshu Yun <[email protected]> Date: Fri Nov 30 10:37:11 2018 -0800 VM.Standard1.1, 1.2 is too old for tests which caused a NotFound issue (TER-775), update them to use VM.Standard1.8 also fix for database_db_system_resource_test. fix the test validation.
1 parent ea6ac09 commit 8cfa208

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

oci/database_db_system_resource_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
435435
//backup_subnet_id = "${oci_core_subnet.t2.id}" // this requires a specific shape
436436
database_edition = "ENTERPRISE_EDITION"
437437
disk_redundancy = "NORMAL"
438-
shape = "VM.Standard1.1"
438+
shape = "VM.Standard1.8"
439439
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
440440
display_name = "{{.token}}"
441441
domain = "${oci_core_subnet.t.dns_label}.${oci_core_virtual_network.t.dns_label}.oraclevcn.com"
@@ -510,7 +510,7 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
510510
resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
511511
resource.TestCheckResourceAttr(s.ResourceName, "database_edition", "ENTERPRISE_EDITION"),
512512
resource.TestCheckResourceAttr(s.ResourceName, "disk_redundancy", "NORMAL"),
513-
resource.TestCheckResourceAttr(s.ResourceName, "shape", "VM.Standard1.1"),
513+
resource.TestCheckResourceAttr(s.ResourceName, "shape", "VM.Standard1.8"),
514514
resource.TestCheckResourceAttrSet(s.ResourceName, "cpu_core_count"),
515515
resource.TestCheckResourceAttr(s.ResourceName, "ssh_public_keys.#", "1"),
516516
resource.TestCheckResourceAttr(s.ResourceName, "ssh_public_keys.0", "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"),
@@ -547,8 +547,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
547547
resource.TestCheckResourceAttrSet("data.oci_database_db_systems.t", "db_systems.0.time_created"),
548548
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.database_edition", "ENTERPRISE_EDITION"),
549549
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.disk_redundancy", "NORMAL"),
550-
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.shape", "VM.Standard1.1"),
551-
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.cpu_core_count", "1"),
550+
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.shape", "VM.Standard1.8"),
551+
resource.TestCheckResourceAttrSet("data.oci_database_db_systems.t", "db_systems.0.cpu_core_count"),
552552
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.ssh_public_keys.0", "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"),
553553
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.display_name", s.Token),
554554
resource.TestCheckResourceAttr("data.oci_database_db_systems.t", "db_systems.0.domain", "tfsubnet.tfvcn.oraclevcn.com"),
@@ -678,7 +678,7 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
678678
database_edition = "ENTERPRISE_EDITION"
679679
disk_redundancy = "NORMAL"
680680
cpu_core_count = "1"
681-
shape = "VM.Standard1.1"
681+
shape = "VM.Standard1.8"
682682
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
683683
display_name = "{{.token}}"
684684
domain = "${oci_core_subnet.t.dns_label}.${oci_core_virtual_network.t.dns_label}.oraclevcn.com"
@@ -753,8 +753,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem_allV
753753
resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
754754
resource.TestCheckResourceAttr(s.ResourceName, "database_edition", "ENTERPRISE_EDITION"),
755755
resource.TestCheckResourceAttr(s.ResourceName, "disk_redundancy", "NORMAL"),
756-
resource.TestCheckResourceAttr(s.ResourceName, "shape", "VM.Standard1.1"),
757-
resource.TestCheckResourceAttr(s.ResourceName, "cpu_core_count", "1"),
756+
resource.TestCheckResourceAttr(s.ResourceName, "shape", "VM.Standard1.8"),
757+
resource.TestCheckResourceAttrSet(s.ResourceName, "cpu_core_count"),
758758
resource.TestCheckResourceAttr(s.ResourceName, "ssh_public_keys.#", "1"),
759759
resource.TestCheckResourceAttr(s.ResourceName, "ssh_public_keys.0", "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"),
760760
resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Token),

oci/provider_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ resource "oci_core_instance" "t" {
218218
compartment_id = "${var.compartment_id}"
219219
display_name = "-tf-instance"
220220
image = "${var.InstanceImageOCID[var.region]}"
221-
shape = "VM.Standard1.2"
221+
shape = "VM.Standard1.8"
222222
create_vnic_details {
223223
subnet_id = "${oci_core_subnet.t.id}"
224224
hostname_label = "testinstance"

oci/test_templates.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func testInstance1() string {
5656
compartment_id = "${var.compartment_id}"
5757
subnet_id = "${oci_core_subnet.t.id}"
5858
image = "${var.InstanceImageOCID[var.region]}"
59-
shape = "VM.Standard1.1"
59+
shape = "VM.Standard1.8"
6060
metadata {}
6161
timeouts {
6262
create = "15m"

0 commit comments

Comments
 (0)