@@ -44,14 +44,14 @@ def tearDown(self) -> None:
44
44
self .blockAPI .delete_volume (volume_id = volume .id )
45
45
logger .info ("✅ Volume {volume.id} has been deleted" )
46
46
if self ._server :
47
- self .api .delete_server (zone = self .zone , server_id = self ._server .id )
47
+ self .instanceAPI .delete_server (zone = self .zone , server_id = self ._server .id )
48
48
logger .info (f"🗑️ Deleted server: { self ._server .id } " )
49
49
50
50
def wait_test_instance_server (self , server_id ):
51
51
interval = interval
52
52
for i in range (1 , max_retry ):
53
53
interval *= i
54
- s = self .api .get_server (zone = self .zone , server_id = server_id )
54
+ s = self .instanceAPI .get_server (zone = self .zone , server_id = server_id )
55
55
if s .state == "running" :
56
56
logger .info (f"✅ Server { server_id } is running." )
57
57
break
@@ -84,6 +84,7 @@ def create_test_from_empty_volume(self, number) -> List[Volume]:
84
84
from_empty = CreateVolumeRequestFromEmpty (size = 10 ),
85
85
)
86
86
logger .info ("✅ Created server: {volume.id}" )
87
+ self .blockAPI .wait_for_volume (volume_id = volume .id , zone = self .zone )
87
88
self ._volumes .append (volume ) # Ensure cleanup in tearDown
88
89
volumes .append (volume )
89
90
@@ -92,7 +93,7 @@ def create_test_from_empty_volume(self, number) -> List[Volume]:
92
93
def test_attach_aditionnal_volume (self ):
93
94
server = self .create_test_instance_server ()
94
95
additional_volumes = self .create_test_from_empty_volume (1 )
95
- additional_volume = list ( additional_volumes .values () )[0 ]
96
+ additional_volume = additional_volumes .values ()[0 ]
96
97
97
98
self .assertIsNotNone (server .id )
98
99
self .assertEqual (server .zone , self .zone )
@@ -104,9 +105,10 @@ def test_attach_aditionnal_volume(self):
104
105
self .instanceAPI .attach_server_volume (
105
106
server_id = server .id , volume_id = additional_volume .id
106
107
)
107
- logger .info (f"🔗 Attached volume { additional_volume .id } to server { server .id } " )
108
108
109
- time .sleep (timeout_attach )
109
+ self .blockAPI .wait_for_volume (volume_id = additional_volume .id , zone = self .zone )
110
+
111
+ logger .info (f"🔗 Attached volume { additional_volume .id } to server { server .id } " )
110
112
111
113
updated_server = self .instanceAPI .get_server (
112
114
zone = self .zone , server_id = server .id
0 commit comments