@@ -40,36 +40,46 @@ def instance_block_api() -> tuple[InstanceUtilsV1API, BlockV1Alpha1API]:
4040@pytest .fixture (scope = "module" )
4141@scw_vcr .use_cassette
4242def instance_volume (
43- instance_block_api : tuple [InstanceUtilsV1API , BlockV1Alpha1API ],
43+ instance_block_api : tuple [InstanceUtilsV1API , BlockV1Alpha1API ],
4444) -> Generator [tuple [Server , list [Volume ]], None , None ]:
4545 instance_api , block_api = instance_block_api
4646 volumes_list : list [Volume ] = []
47+
4748 volumes = {
4849 "0" : VolumeServerTemplate (
4950 volume_type = VolumeVolumeType .L_SSD ,
5051 size = volume_size ,
5152 boot = False ,
5253 )
5354 }
55+
5456 instance = instance_api ._create_server (
55- commercial_type = commercial_type ,
56- zone = zone ,
57- name = server_name ,
57+ commercial_type = "DEV1-S" , # replace with your type
58+ zone = "fr-par-1" , # replace with your zone
59+ name = "test-server" , # replace with your server name
5860 dynamic_ip_required = False ,
5961 volumes = volumes ,
6062 protected = False ,
6163 boot_type = BootType .LOCAL ,
6264 image = "c00ae53c-1e29-4087-a384-47f3c5c1cd84" ,
6365 )
64- instance_api .wait_instance_server (instance .server .id , zone = zone )
65- yield instance .server , volumes_list
66+
67+ instance_api .wait_instance_server (instance .server .id , zone = "fr-par-1" )
68+
69+ server = instance .server
70+ assert server is not None , "Server creation failed"
71+
72+ yield server , volumes_list
73+
6674 for volume in volumes_list :
6775 instance_api .detach_server_volume (
68- server_id = instance . server .id , volume_id = volume .id , zone = zone
76+ server_id = server .id , volume_id = volume .id , zone = "fr-par-1"
6977 )
70- block_api .wait_for_volume (volume_id = volume .id , zone = zone )
71- block_api .delete_volume (volume_id = volume .id , zone = zone )
72- instance_api .delete_server (server_id = instance .server .id , zone = zone )
78+ block_api .wait_for_volume (volume_id = volume .id , zone = "fr-par-1" )
79+ block_api .delete_volume (volume_id = volume .id , zone = "fr-par-1" )
80+
81+ instance_api .delete_server (server_id = server .id , zone = "fr-par-1" )
82+
7383
7484
7585@scw_vcr .use_cassette
0 commit comments