Skip to content

Commit ed0be28

Browse files
TetyanaYahodskaTetyanaYahodska
committed
Fixed code
1 parent 6109822 commit ed0be28

11 files changed

+46
-35
lines changed

‎compute/cloud-client/src/main/java/compute/disks/CreateReplicatedDisk.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.compute.v1.Disk;
2121
import com.google.cloud.compute.v1.InsertRegionDiskRequest;
2222
import com.google.cloud.compute.v1.Operation;
23+
import com.google.cloud.compute.v1.Operation.Status;
2324
import com.google.cloud.compute.v1.RegionDisksClient;
2425
import java.io.IOException;
2526
import java.util.ArrayList;
@@ -55,7 +56,7 @@ public static void main(String[] args)
5556
}
5657

5758
// Create a disk for synchronous data replication between two zones in the same region
58-
public static Operation.Status createReplicatedDisk(String projectId, String region,
59+
public static Status createReplicatedDisk(String projectId, String region,
5960
List<String> replicaZones, String diskName, int diskSizeGb, String diskType)
6061
throws IOException, InterruptedException, ExecutionException, TimeoutException {
6162
// Initialize client that will be used to send requests. This client only needs to be created

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/AddRegionalDiskToConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START compute_consistency_group_add_regional_disk]
2020
import com.google.cloud.compute.v1.AddResourcePoliciesRegionDiskRequest;
2121
import com.google.cloud.compute.v1.Operation;
22+
import com.google.cloud.compute.v1.Operation.Status;
2223
import com.google.cloud.compute.v1.RegionDisksAddResourcePoliciesRequest;
2324
import com.google.cloud.compute.v1.RegionDisksClient;
2425
import java.io.IOException;
@@ -44,7 +45,7 @@ public static void main(String[] args)
4445
}
4546

4647
// Adds regional disk to a consistency group.
47-
public static Operation.Status addRegionalDiskToConsistencyGroup(
48+
public static Status addRegionalDiskToConsistencyGroup(
4849
String project, String region, String diskName, String consistencyGroupName)
4950
throws IOException, ExecutionException, InterruptedException, TimeoutException {
5051
String consistencyGroupUrl = String.format(

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/AddZonalDiskToConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.cloud.compute.v1.DisksAddResourcePoliciesRequest;
2222
import com.google.cloud.compute.v1.DisksClient;
2323
import com.google.cloud.compute.v1.Operation;
24+
import com.google.cloud.compute.v1.Operation.Status;
2425
import java.io.IOException;
2526
import java.util.Arrays;
2627
import java.util.concurrent.ExecutionException;
@@ -45,7 +46,7 @@ public static void main(String[] args)
4546
}
4647

4748
// Adds zonal disk to a consistency group.
48-
public static Operation.Status addZonalDiskToConsistencyGroup(
49+
public static Status addZonalDiskToConsistencyGroup(
4950
String project, String diskLocation, String diskName,
5051
String consistencyGroupName)
5152
throws IOException, ExecutionException, InterruptedException, TimeoutException {

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneRegionalDisksFromConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.compute.v1.BulkInsertDiskResource;
2121
import com.google.cloud.compute.v1.BulkInsertRegionDiskRequest;
2222
import com.google.cloud.compute.v1.Operation;
23+
import com.google.cloud.compute.v1.Operation.Status;
2324
import com.google.cloud.compute.v1.RegionDisksClient;
2425
import java.io.IOException;
2526
import java.util.concurrent.ExecutionException;
@@ -42,7 +43,7 @@ public static void main(String[] args)
4243
}
4344

4445
// Clones regional disks from a consistency group.
45-
public static Operation.Status cloneRegionalDisksFromConsistencyGroup(
46+
public static Status cloneRegionalDisksFromConsistencyGroup(
4647
String project, String region, String consistencyGroupName)
4748
throws IOException, InterruptedException, ExecutionException, TimeoutException {
4849
String sourceConsistencyGroupPolicy = String.format(

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/CloneZonalDisksFromConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.cloud.compute.v1.BulkInsertDiskResource;
2222
import com.google.cloud.compute.v1.DisksClient;
2323
import com.google.cloud.compute.v1.Operation;
24+
import com.google.cloud.compute.v1.Operation.Status;
2425
import java.io.IOException;
2526
import java.util.concurrent.ExecutionException;
2627
import java.util.concurrent.TimeUnit;
@@ -41,7 +42,7 @@ public static void main(String[] args)
4142
}
4243

4344
// Clones zonal disks from a consistency group.
44-
public static Operation.Status cloneZonalDisksFromConsistencyGroup(
45+
public static Status cloneZonalDisksFromConsistencyGroup(
4546
String project, String zone, String consistencyGroupName)
4647
throws IOException, InterruptedException, ExecutionException, TimeoutException {
4748
String region = zone.substring(0, zone.lastIndexOf('-'));

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/CreateConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START compute_consistency_group_create]
2020
import com.google.cloud.compute.v1.InsertResourcePolicyRequest;
2121
import com.google.cloud.compute.v1.Operation;
22+
import com.google.cloud.compute.v1.Operation.Status;
2223
import com.google.cloud.compute.v1.ResourcePoliciesClient;
2324
import com.google.cloud.compute.v1.ResourcePolicy;
2425
import java.io.IOException;
@@ -42,7 +43,7 @@ public static void main(String[] args)
4243
}
4344

4445
// Creates a new consistency group resource policy in the specified project and region.
45-
public static Operation.Status createConsistencyGroup(
46+
public static Status createConsistencyGroup(
4647
String project, String region, String consistencyGroupName)
4748
throws IOException, ExecutionException, InterruptedException, TimeoutException {
4849
// Initialize client that will be used to send requests. This client only needs to be created

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/DeleteConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
// [START compute_consistency_group_delete]
2020
import com.google.cloud.compute.v1.Operation;
21+
import com.google.cloud.compute.v1.Operation.Status;
2122
import com.google.cloud.compute.v1.ResourcePoliciesClient;
2223
import java.io.IOException;
2324
import java.util.concurrent.ExecutionException;
@@ -40,7 +41,7 @@ public static void main(String[] args)
4041
}
4142

4243
// Deletes a consistency group resource policy in the specified project and region.
43-
public static Operation.Status deleteConsistencyGroup(
44+
public static Status deleteConsistencyGroup(
4445
String project, String region, String consistencyGroupName)
4546
throws IOException, ExecutionException, InterruptedException, TimeoutException {
4647
// Initialize client that will be used to send requests. This client only needs to be created

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/RemoveRegionalDiskFromConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
// [START compute_consistency_group_remove_regional_disk]
2020
import com.google.cloud.compute.v1.Operation;
21+
import com.google.cloud.compute.v1.Operation.Status;
2122
import com.google.cloud.compute.v1.RegionDisksClient;
2223
import com.google.cloud.compute.v1.RegionDisksRemoveResourcePoliciesRequest;
2324
import com.google.cloud.compute.v1.RemoveResourcePoliciesRegionDiskRequest;
@@ -45,7 +46,7 @@ public static void main(String[] args)
4546
}
4647

4748
// Removes a disk from a consistency group.
48-
public static Operation.Status removeRegionalDiskFromConsistencyGroup(
49+
public static Status removeRegionalDiskFromConsistencyGroup(
4950
String project, String region, String diskName, String consistencyGroupName)
5051
throws IOException, ExecutionException, InterruptedException, TimeoutException {
5152
String consistencyGroupUrl = String.format(

‎compute/cloud-client/src/main/java/compute/disks/consistencygroup/RemoveZonalDiskFromConsistencyGroup.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.compute.v1.DisksClient;
2121
import com.google.cloud.compute.v1.DisksRemoveResourcePoliciesRequest;
2222
import com.google.cloud.compute.v1.Operation;
23+
import com.google.cloud.compute.v1.Operation.Status;
2324
import com.google.cloud.compute.v1.RemoveResourcePoliciesDiskRequest;
2425
import java.io.IOException;
2526
import java.util.Arrays;
@@ -45,7 +46,7 @@ public static void main(String[] args)
4546
}
4647

4748
// Removes a disk from a consistency group.
48-
public static Operation.Status removeZonalDiskFromConsistencyGroup(
49+
public static Status removeZonalDiskFromConsistencyGroup(
4950
String project, String diskLocation, String diskName, String consistencyGroupName)
5051
throws IOException, ExecutionException, InterruptedException, TimeoutException {
5152
String region = diskLocation.substring(0, diskLocation.lastIndexOf('-'));

‎compute/cloud-client/src/test/java/compute/disks/ConsistencyGroupIT.java‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.google.cloud.compute.v1.ListDisksRequest;
3636
import com.google.cloud.compute.v1.ListRegionDisksRequest;
3737
import com.google.cloud.compute.v1.Operation;
38+
import com.google.cloud.compute.v1.Operation.Status;
3839
import com.google.cloud.compute.v1.RegionDisksClient;
3940
import com.google.cloud.compute.v1.RemoveResourcePoliciesDiskRequest;
4041
import com.google.cloud.compute.v1.RemoveResourcePoliciesRegionDiskRequest;
@@ -77,14 +78,14 @@ public void testCreateConsistencyGroupResourcePolicy() throws Exception {
7778
when(mockClient.insertAsync(any(InsertResourcePolicyRequest.class)))
7879
.thenReturn(mockFuture);
7980
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
80-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
81+
when(operation.getStatus()).thenReturn(Status.DONE);
8182

82-
Operation.Status status = CreateConsistencyGroup.createConsistencyGroup(
83+
Status status = CreateConsistencyGroup.createConsistencyGroup(
8384
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
8485

8586
verify(mockClient, times(1)).insertAsync(any(InsertResourcePolicyRequest.class));
8687
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
87-
assertEquals(Operation.Status.DONE, status);
88+
assertEquals(Status.DONE, status);
8889
}
8990
}
9091

@@ -100,15 +101,15 @@ public void testAddRegionalDiskToConsistencyGroup() throws Exception {
100101
when(mockClient.addResourcePoliciesAsync(any(AddResourcePoliciesRegionDiskRequest.class)))
101102
.thenReturn(mockFuture);
102103
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
103-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
104+
when(operation.getStatus()).thenReturn(Status.DONE);
104105

105-
Operation.Status status = AddRegionalDiskToConsistencyGroup.addRegionalDiskToConsistencyGroup(
106+
Status status = AddRegionalDiskToConsistencyGroup.addRegionalDiskToConsistencyGroup(
106107
PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME);
107108

108109
verify(mockClient, times(1))
109110
.addResourcePoliciesAsync(any(AddResourcePoliciesRegionDiskRequest.class));
110111
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
111-
assertEquals(Operation.Status.DONE, status);
112+
assertEquals(Status.DONE, status);
112113
}
113114
}
114115

@@ -124,15 +125,15 @@ public void testAddZonalDiskToConsistencyGroup() throws Exception {
124125
when(mockClient.addResourcePoliciesAsync(any(AddResourcePoliciesDiskRequest.class)))
125126
.thenReturn(mockFuture);
126127
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
127-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
128+
when(operation.getStatus()).thenReturn(Status.DONE);
128129

129-
Operation.Status status = AddZonalDiskToConsistencyGroup.addZonalDiskToConsistencyGroup(
130+
Status status = AddZonalDiskToConsistencyGroup.addZonalDiskToConsistencyGroup(
130131
PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME);
131132

132133
verify(mockClient, times(1))
133134
.addResourcePoliciesAsync(any(AddResourcePoliciesDiskRequest.class));
134135
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
135-
assertEquals(Operation.Status.DONE, status);
136+
assertEquals(Status.DONE, status);
136137
}
137138
}
138139

@@ -148,16 +149,16 @@ public void testRemoveRegionalDiskFromConsistencyGroup() throws Exception {
148149
when(mockClient.removeResourcePoliciesAsync(
149150
any(RemoveResourcePoliciesRegionDiskRequest.class))).thenReturn(mockFuture);
150151
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
151-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
152+
when(operation.getStatus()).thenReturn(Status.DONE);
152153

153-
Operation.Status status = RemoveRegionalDiskFromConsistencyGroup
154+
Status status = RemoveRegionalDiskFromConsistencyGroup
154155
.removeRegionalDiskFromConsistencyGroup(
155156
PROJECT_ID, REGION, DISK_NAME, CONSISTENCY_GROUP_NAME);
156157

157158
verify(mockClient, times(1))
158159
.removeResourcePoliciesAsync(any(RemoveResourcePoliciesRegionDiskRequest.class));
159160
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
160-
assertEquals(Operation.Status.DONE, status);
161+
assertEquals(Status.DONE, status);
161162
}
162163
}
163164

@@ -173,16 +174,16 @@ public void testRemoveZonalDiskFromConsistencyGroup() throws Exception {
173174
when(mockClient.removeResourcePoliciesAsync(
174175
any(RemoveResourcePoliciesDiskRequest.class))).thenReturn(mockFuture);
175176
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
176-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
177+
when(operation.getStatus()).thenReturn(Status.DONE);
177178

178-
Operation.Status status = RemoveZonalDiskFromConsistencyGroup
179+
Status status = RemoveZonalDiskFromConsistencyGroup
179180
.removeZonalDiskFromConsistencyGroup(
180181
PROJECT_ID, ZONE, DISK_NAME, CONSISTENCY_GROUP_NAME);
181182

182183
verify(mockClient, times(1))
183184
.removeResourcePoliciesAsync(any(RemoveResourcePoliciesDiskRequest.class));
184185
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
185-
assertEquals(Operation.Status.DONE, status);
186+
assertEquals(Status.DONE, status);
186187
}
187188
}
188189

@@ -198,15 +199,15 @@ public void testDeleteConsistencyGroup() throws Exception {
198199
when(mockClient.deleteAsync(PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME))
199200
.thenReturn(mockFuture);
200201
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
201-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
202+
when(operation.getStatus()).thenReturn(Status.DONE);
202203

203-
Operation.Status status = DeleteConsistencyGroup.deleteConsistencyGroup(
204+
Status status = DeleteConsistencyGroup.deleteConsistencyGroup(
204205
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
205206

206207
verify(mockClient, times(1))
207208
.deleteAsync(PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
208209
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
209-
assertEquals(Operation.Status.DONE, status);
210+
assertEquals(Status.DONE, status);
210211
}
211212
}
212213

@@ -243,16 +244,16 @@ public void testCloneRegionalDisksFromConsistencyGroup() throws Exception {
243244
when(mockClient.bulkInsertAsync(any(BulkInsertRegionDiskRequest.class)))
244245
.thenReturn(mockFuture);
245246
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
246-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
247+
when(operation.getStatus()).thenReturn(Status.DONE);
247248

248-
Operation.Status status = CloneRegionalDisksFromConsistencyGroup
249+
Status status = CloneRegionalDisksFromConsistencyGroup
249250
.cloneRegionalDisksFromConsistencyGroup(
250251
PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
251252

252253
verify(mockClient, times(1))
253254
.bulkInsertAsync(any(BulkInsertRegionDiskRequest.class));
254255
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
255-
assertEquals(Operation.Status.DONE, status);
256+
assertEquals(Status.DONE, status);
256257
}
257258
}
258259

@@ -268,15 +269,15 @@ public void testCloneZonalDisksFromConsistencyGroup() throws Exception {
268269
when(mockClient.bulkInsertAsync(any(BulkInsertDiskRequest.class)))
269270
.thenReturn(mockFuture);
270271
when(mockFuture.get(anyLong(), any(TimeUnit.class))).thenReturn(operation);
271-
when(operation.getStatus()).thenReturn(Operation.Status.DONE);
272+
when(operation.getStatus()).thenReturn(Status.DONE);
272273

273-
Operation.Status status = CloneZonalDisksFromConsistencyGroup
274+
Status status = CloneZonalDisksFromConsistencyGroup
274275
.cloneZonalDisksFromConsistencyGroup(PROJECT_ID, REGION, CONSISTENCY_GROUP_NAME);
275276

276277
verify(mockClient, times(1))
277278
.bulkInsertAsync(any(BulkInsertDiskRequest.class));
278279
verify(mockFuture, times(1)).get(anyLong(), any(TimeUnit.class));
279-
assertEquals(Operation.Status.DONE, status);
280+
assertEquals(Status.DONE, status);
280281
}
281282
}
282283

0 commit comments

Comments
 (0)