Skip to content

Commit 2bd6cd4

Browse files
author
Thoughtseize1
committed
Updated functionality and tests
1 parent 99f2d75 commit 2bd6cd4

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

compute/client_library/ingredients/instances/create_start_instance/create_with_regional_disk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def create_with_regional_boot_disk(
2525
project_id: str,
2626
zone: str,
2727
instance_name: str,
28-
source_snapshot,
28+
source_snapshot: str,
2929
disk_region: str,
3030
disk_type: str = "pd-balanced",
3131
) -> compute_v1.Instance:
@@ -53,10 +53,10 @@ def create_with_regional_boot_disk(
5353
f"projects/{project_id}/zones/{disk_region}-a",
5454
f"projects/{project_id}/zones/{disk_region}-b",
5555
]
56-
initialize_params.disk_size_gb = 100
5756

5857
disk.initialize_params = initialize_params
5958
disk.boot = True
59+
disk.auto_delete = True
6060

6161
instance = create_instance(project_id, zone, instance_name, [disk])
6262

compute/client_library/snippets/instances/create_start_instance/create_with_regional_disk.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def create_with_regional_boot_disk(
218218
project_id: str,
219219
zone: str,
220220
instance_name: str,
221-
source_snapshot,
221+
source_snapshot: str,
222222
disk_region: str,
223223
disk_type: str = "pd-balanced",
224224
) -> compute_v1.Instance:
@@ -246,10 +246,10 @@ def create_with_regional_boot_disk(
246246
f"projects/{project_id}/zones/{disk_region}-a",
247247
f"projects/{project_id}/zones/{disk_region}-b",
248248
]
249-
initialize_params.disk_size_gb = 100
250249

251250
disk.initialize_params = initialize_params
252251
disk.boot = True
252+
disk.auto_delete = True
253253

254254
instance = create_instance(project_id, zone, instance_name, [disk])
255255

compute/client_library/snippets/tests/test_create_vm.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import pytest
1919

2020
from .test_disks import autodelete_regional_blank_disk # noqa: F401
21+
from .test_disks import DISK_SIZE
2122

2223
from ..disks.create_empty_disk import create_empty_disk
2324
from ..disks.create_from_image import create_disk_from_image
@@ -261,7 +262,7 @@ def test_create_with_ssd():
261262
delete_instance(PROJECT, INSTANCE_ZONE, instance_name)
262263

263264

264-
def test_with_regional_boot_disk(autodelete_regional_blank_disk): # noqa: F811
265+
def test_create_with_regional_boot_disk(autodelete_regional_blank_disk): # noqa: F811
265266
snapshot_name = "test-snap-" + uuid.uuid4().hex[:10]
266267
instance_name = "test-vm-" + uuid.uuid4().hex[:10]
267268
test_snapshot = create_snapshot(
@@ -273,9 +274,9 @@ def test_with_regional_boot_disk(autodelete_regional_blank_disk): # noqa: F811
273274
instance = create_with_regional_boot_disk(
274275
PROJECT, INSTANCE_ZONE_SECOND, instance_name, test_snapshot.name, REGION_SECOND
275276
)
276-
# Disk size from fixture is 15
277+
# Disk size takes from test_disk.py
277278
try:
278-
assert any(disk.disk_size_gb == 11 for disk in instance.disks)
279+
assert any(disk.disk_size_gb == DISK_SIZE for disk in instance.disks)
279280
finally:
280281
delete_instance(PROJECT, INSTANCE_ZONE_SECOND, instance_name)
281282
op = compute_v1.SnapshotsClient().delete_unary(

0 commit comments

Comments
 (0)