Skip to content

Commit 783b6a3

Browse files
“Saurabhravinitp
“Saurabh
authored and
ravinitp
committed
Added - Support for Full Stack Disaster Recovery Service: Test standby
1 parent 2e933a8 commit 783b6a3

27 files changed

+1914
-701
lines changed

‎examples/disaster_recovery/dr_plan/bucket.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "bucket_name" {
2-
default = "testBucketName_2"
2+
default = "testBucketName_1"
33
}
44

55
variable "bucket_namespace" {
@@ -17,9 +17,7 @@ data "oci_objectstorage_namespace" "test_namespace" {
1717
compartment_id = var.compartment_id
1818
}
1919

20-
resource "oci_objectstorage_bucket" "test_bucket" {
21-
#Required
22-
compartment_id = var.compartment_id
23-
name = var.bucket_name
24-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
20+
data "oci_objectstorage_bucket" "test_bucket" {
21+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
22+
name = var.bucket_name
2523
}

‎examples/disaster_recovery/dr_plan/dr_plan.tf‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variable "fingerprint" {}
77
variable "private_key_path" {}
88
variable "region" {}
99
variable "compartment_id" {
10-
default = "ocid1.compartment.oc1..aaaaaaaaaq4dqogd2ktatzmuekujkasvwendyhisgfqdky3ojru47w3f634a"
10+
default = "ocid1.tenancy.oc1..aaaaaaaahowp4zu5z3p3to5mj7vjtlo7zqi2qmbjiij73vfulltlmvtf624a"
1111
}
1212

1313
variable "dr_plan_defined_tags_value" {
@@ -47,7 +47,7 @@ provider "oci" {
4747
resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
4848
#Required
4949
display_name = var.dr_plan_display_name
50-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
50+
dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
5151
type = var.dr_plan_type
5252

5353
lifecycle {
@@ -61,12 +61,11 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
6161

6262
data "oci_disaster_recovery_dr_plans" "test_dr_plans" {
6363
#Required
64-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
64+
dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
6565

6666
#Optional
6767
display_name = var.dr_plan_display_name
6868
dr_plan_id = oci_disaster_recovery_dr_plan.test_dr_plan.id
6969
dr_plan_type = var.dr_plan_dr_plan_type
7070
state = var.dr_plan_state
71-
}
72-
71+
}

‎examples/disaster_recovery/dr_plan/dr_protection_group.tf‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variable "dr_protection_group_defined_tags_value" {
1414
}
1515

1616
variable "dr_protection_group_display_name" {
17-
default = "displayName"
17+
default = "example-standby-drpg"
1818
}
1919

2020
variable "dr_protection_group_freeform_tags" {
@@ -41,62 +41,11 @@ variable "dr_protection_group_state" {
4141
default = "ACTIVE"
4242
}
4343

44-
resource "oci_disaster_recovery_dr_protection_group" "test_peer" {
45-
#Required
46-
compartment_id = var.compartment_id
47-
display_name = var.dr_protection_group_display_name
48-
log_location {
49-
#Required
50-
bucket = oci_objectstorage_bucket.test_bucket.name
51-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
52-
}
53-
54-
#Optional
55-
members {
56-
#Required
57-
member_id = oci_core_volume_group.test_volume_group.id
58-
member_type = var.dr_protection_group_members_member_type
59-
60-
#Optional
61-
is_movable = var.dr_protection_group_members_is_movable
62-
}
63-
}
64-
65-
resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group" {
66-
#Required
67-
compartment_id = var.compartment_id
68-
display_name = var.dr_protection_group_display_name
69-
log_location {
70-
#Required
71-
bucket = oci_objectstorage_bucket.test_bucket.name
72-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
73-
}
74-
75-
#Optional
76-
association {
77-
#Required
78-
role = var.dr_protection_group_association_role
79-
80-
#Optional
81-
peer_id = oci_disaster_recovery_dr_protection_group.test_peer.id
82-
peer_region = var.dr_protection_group_association_peer_region
83-
}
84-
85-
lifecycle {
86-
ignore_changes = [defined_tags]
87-
}
88-
89-
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
90-
freeform_tags = var.dr_protection_group_freeform_tags
91-
}
92-
9344
data "oci_disaster_recovery_dr_protection_groups" "test_dr_protection_groups" {
9445
#Required
9546
compartment_id = var.compartment_id
9647

9748
#Optional
9849
display_name = var.dr_protection_group_display_name
99-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
10050
state = var.dr_protection_group_state
101-
}
102-
51+
}

‎examples/disaster_recovery/dr_plan/volume_group.tf‎

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variable "volume_group_defined_tags_value" {
66
}
77

88
variable "volume_group_display_name" {
9-
default = "displayName"
9+
default = "example-volume-group"
1010
}
1111

1212
variable "volume_group_freeform_tags" {
@@ -34,54 +34,15 @@ variable "volume_group_volume_group_replicas_display_name" {
3434
}
3535

3636
data "oci_identity_availability_domains" "test_availability_domains" {
37-
compartment_id = var.tenancy_ocid
38-
}
39-
40-
resource "oci_core_volume" "source_volume_list" {
41-
count = 2
42-
display_name = format("source-volume-%d", count.index + 1)
43-
44-
#Required
45-
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
46-
compartment_id = var.compartment_id
47-
}
48-
49-
resource "oci_core_volume_group" "test_volume_group" {
50-
#Required
51-
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
52-
compartment_id = var.compartment_id
53-
source_details {
54-
#Required
55-
type = var.volume_group_source_details_type
56-
57-
#Optional
58-
volume_ids = oci_core_volume.source_volume_list.*.id
59-
}
60-
61-
lifecycle {
62-
ignore_changes = [defined_tags]
63-
}
64-
65-
#Optional
66-
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.volume_group_defined_tags_value}")
67-
display_name = var.volume_group_display_name
68-
freeform_tags = var.volume_group_freeform_tags
69-
volume_group_replicas {
70-
#Required
71-
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.1.name
72-
73-
#Optional
74-
display_name = var.volume_group_volume_group_replicas_display_name
75-
}
37+
compartment_id = var.tenancy_ocid
7638
}
7739

7840
data "oci_core_volume_groups" "test_volume_groups" {
7941
#Required
8042
compartment_id = var.compartment_id
8143

8244
#Optional
83-
availability_domain = "${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}"
45+
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains[0].name
8446
display_name = var.volume_group_display_name
8547
state = var.volume_group_state
86-
}
87-
48+
}

‎examples/disaster_recovery/dr_plan_execution/bucket.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "bucket_name" {
2-
default = "testBucketName"
2+
default = "testBucketName_1"
33
}
44

55
variable "bucket_namespace" {
@@ -17,9 +17,7 @@ data "oci_objectstorage_namespace" "test_namespace" {
1717
compartment_id = var.compartment_id
1818
}
1919

20-
resource "oci_objectstorage_bucket" "test_bucket" {
21-
#Required
22-
compartment_id = var.compartment_id
23-
name = var.bucket_name
24-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
20+
data "oci_objectstorage_bucket" "test_bucket" {
21+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
22+
name = var.bucket_name
2523
}

‎examples/disaster_recovery/dr_plan_execution/dr_plan.tf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ variable "dr_plan_type" {
2828
resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
2929
#Required
3030
display_name = var.dr_plan_display_name
31-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
31+
dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
3232
type = var.dr_plan_type
3333

3434
lifecycle {
@@ -42,12 +42,11 @@ resource "oci_disaster_recovery_dr_plan" "test_dr_plan" {
4242

4343
data "oci_disaster_recovery_dr_plans" "test_dr_plans" {
4444
#Required
45-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
45+
dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
4646

4747
#Optional
4848
display_name = var.dr_plan_display_name
4949
dr_plan_id = oci_disaster_recovery_dr_plan.test_dr_plan.id
5050
dr_plan_type = var.dr_plan_dr_plan_type
5151
state = var.dr_plan_state
52-
}
53-
52+
}

‎examples/disaster_recovery/dr_plan_execution/dr_plan_execution.tf‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variable "fingerprint" {}
77
variable "private_key_path" {}
88
variable "region" {}
99
variable "compartment_id" {
10-
default = "ocid1.compartment.oc1..aaaaaaaaaq4dqogd2ktatzmuekujkasvwendyhisgfqdky3ojru47w3f634a"
10+
default = "ocid1.tenancy.oc1..aaaaaaaahowp4zu5z3p3to5mj7vjtlo7zqi2qmbjiij73vfulltlmvtf624a"
1111
}
1212

1313
variable "dr_plan_execution_defined_tags_value" {
@@ -76,12 +76,11 @@ resource "oci_disaster_recovery_dr_plan_execution" "test_dr_plan_execution" {
7676

7777
data "oci_disaster_recovery_dr_plan_executions" "test_dr_plan_executions" {
7878
#Required
79-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
79+
dr_protection_group_id = data.oci_disaster_recovery_dr_protection_groups.test_dr_protection_groups.dr_protection_group_collection.0.items.0.id
8080

8181
#Optional
8282
display_name = var.dr_plan_execution_display_name
8383
dr_plan_execution_id = oci_disaster_recovery_dr_plan_execution.test_dr_plan_execution.id
8484
dr_plan_execution_type = var.dr_plan_execution_dr_plan_execution_type
8585
#state = var.dr_plan_execution_state
86-
}
87-
86+
}

‎examples/disaster_recovery/dr_plan_execution/dr_protection_group.tf‎

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ variable "dr_protection_group_defined_tags_value" {
1414
}
1515

1616
variable "dr_protection_group_display_name" {
17-
default = "displayName"
17+
default = "example-standby-drpg"
1818
}
1919

2020
variable "dr_protection_group_freeform_tags" {
@@ -41,62 +41,11 @@ variable "dr_protection_group_state" {
4141
default = "ACTIVE"
4242
}
4343

44-
resource "oci_disaster_recovery_dr_protection_group" "test_peer" {
45-
#Required
46-
compartment_id = var.compartment_id
47-
display_name = var.dr_protection_group_display_name
48-
log_location {
49-
#Required
50-
bucket = oci_objectstorage_bucket.test_bucket.name
51-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
52-
}
53-
54-
#Optional
55-
members {
56-
#Required
57-
member_id = data.oci_core_volume_groups.test_volume_groups.volume_groups.0.id
58-
member_type = var.dr_protection_group_members_member_type
59-
60-
#Optional
61-
is_movable = var.dr_protection_group_members_is_movable
62-
}
63-
}
64-
65-
resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group" {
66-
#Required
67-
compartment_id = var.compartment_id
68-
display_name = var.dr_protection_group_display_name
69-
log_location {
70-
#Required
71-
bucket = oci_objectstorage_bucket.test_bucket.name
72-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
73-
}
74-
75-
#Optional
76-
association {
77-
#Required
78-
role = var.dr_protection_group_association_role
79-
80-
#Optional
81-
peer_id = oci_disaster_recovery_dr_protection_group.test_peer.id
82-
peer_region = var.dr_protection_group_association_peer_region
83-
}
84-
85-
lifecycle {
86-
ignore_changes = [defined_tags]
87-
}
88-
89-
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
90-
freeform_tags = var.dr_protection_group_freeform_tags
91-
}
92-
9344
data "oci_disaster_recovery_dr_protection_groups" "test_dr_protection_groups" {
9445
#Required
9546
compartment_id = var.compartment_id
9647

9748
#Optional
9849
display_name = var.dr_protection_group_display_name
99-
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
10050
state = var.dr_protection_group_state
101-
}
102-
51+
}

‎examples/disaster_recovery/dr_protection_group/bucket.tf‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ variable "bucket_namespace" {
77
}
88

99
data "oci_identity_tenancy" "test_tenancy" {
10-
#Required
11-
tenancy_id = var.tenancy_ocid
10+
#Required
11+
tenancy_id = var.tenancy_ocid
1212
}
1313

1414
data "oci_objectstorage_namespace" "test_namespace" {
@@ -17,9 +17,7 @@ data "oci_objectstorage_namespace" "test_namespace" {
1717
compartment_id = var.compartment_id
1818
}
1919

20-
resource "oci_objectstorage_bucket" "test_bucket" {
21-
#Required
22-
compartment_id = var.compartment_id
23-
name = var.bucket_name
24-
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
25-
}
20+
data "oci_objectstorage_bucket" "test_bucket" {
21+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
22+
name = var.bucket_name
23+
}

0 commit comments

Comments
 (0)