Skip to content

Commit 7a77ca0

Browse files
Laure-diGnoale
authored andcommitted
last update
1 parent a39c1ca commit 7a77ca0

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

scaleway/tests/test_instance.py

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from scaleway.instance.v1.api import InstanceV1API
1010
from scaleway.block.v1alpha1 import BlockV1Alpha1API
1111
from scaleway.instance.v1.types import Server, VolumeServerTemplate
12-
from scaleway.block.v1alpha1.types import Volume, CreateVolumeRequestFromEmpty
12+
from scaleway.block.v1alpha1.types import Volume, CreateVolumeRequestFromEmpty
1313

1414
logger = logging.getLogger()
1515
logger.level = logging.DEBUG
@@ -20,6 +20,8 @@
2020
timeout = 10
2121
volume_size = 10
2222
commercial_type = "DEV1-S"
23+
24+
2325
class TestE2EServerCreation(unittest.TestCase):
2426
def setUp(self) -> None:
2527
self.zone = "fr-par-1"
@@ -32,29 +34,27 @@ def setUp(self) -> None:
3234
def tearDown(self) -> None:
3335
for volume in self._volumes:
3436
try:
35-
self.instanceAPI.detach_server_volume(server_id=self._server.id, volume_id=volume.id)
37+
self.instanceAPI.detach_server_volume(
38+
server_id=self._server.id, volume_id=volume.id
39+
)
3640
logger.info("✅ Volume {volume.id} has been detach")
3741
except Exception as e:
3842
logger.warning(f"Failed to detach volume {volume.id}: {e}")
39-
40-
4143
try:
42-
4344
self.blockAPI.delete_volume(volume_id=volume.id)
4445
logger.info("✅ Volume {volume.id} has been deleted")
4546
except Exception as e:
4647
logger.warning(f"Failed to delete volume {volume.id}: {e}")
47-
4848
if self._server:
4949
try:
5050
self.api.delete_server(zone=self.zone, server_id=self._server.id)
5151
logger.info(f"🗑️ Deleted server: {self._server.id}")
5252
except Exception as e:
5353
logger.warning(f"Failed to delete server {self._server.id}: {e}")
54-
54+
5555
def wait_test_instance_server(self, server_id):
5656
for _ in range(10):
57-
s = self.api.get_server(zone=self.zone, server_id=server.id)
57+
s = self.api.get_server(zone=self.zone, server_id=server_id)
5858
if s.state == "running":
5959
logger.info(f"✅ Server {server_id} is running.")
6060
break
@@ -63,16 +63,17 @@ def wait_test_instance_server(self, server_id):
6363
self.fail("Server did not reach 'running' state in time.")
6464

6565
def create_test_instance_server(self) -> Server:
66-
volume = { "0": VolumeServerTemplate(volume_type= "sbs_volume",
67-
name="my-volume",
68-
size=volume_size
69-
)}
66+
volume = {
67+
"0": VolumeServerTemplate(
68+
volume_type="sbs_volume", name="my-volume", size=volume_size
69+
)
70+
}
7071
server = self.instanceAPI._create_server(
7172
commercial_type=commercial_type,
7273
zone=self.zone,
7374
name=server_name,
7475
dynamic_ip_required=True,
75-
volumes=volume
76+
volumes=volume,
7677
)
7778
logger.info(f"✅ Created server: {server.id}")
7879
self._server = server.server
@@ -83,23 +84,20 @@ def create_test_from_empty_volume(self, number) -> Dict[str, Volume]:
8384
volumes: Dict[str, Volume] = {}
8485
for i in range(number):
8586
volume = self.blockAPI.create_volume(
86-
project_id="19e2fd0b-3d53-4f8f-9338-629df9c1b1db",
87-
from_empty=CreateVolumeRequestFromEmpty(size=10)
87+
project_id="19e2fd0b-3d53-4f8f-9338-629df9c1b1db",
88+
from_empty=CreateVolumeRequestFromEmpty(size=10),
8889
)
8990
logger.info("✅ Created server: {volume.id}")
9091
self._volumes.append(volume) # Ensure cleanup in tearDown
9192
volumes[str(i)] = volume
92-
93-
return volumes
9493

95-
94+
return volumes
9695

9796
def test_attach_aditionnal_volume(self):
9897
server = self.create_test_instance_server()
9998
additional_volumes = self.create_test_from_empty_volume(1)
10099
additional_volume = list(additional_volumes.values())[0]
101100

102-
103101
self.assertIsNotNone(server.id)
104102
self.assertEqual(server.zone, self.zone)
105103

@@ -108,15 +106,18 @@ def test_attach_aditionnal_volume(self):
108106
logger.info(f"✅ Volume created with ID: {additional_volume.id}")
109107

110108
self.instanceAPI.attach_server_volume(
111-
server_id=server.id,
112-
volume_id=additional_volume.id
109+
server_id=server.id, volume_id=additional_volume.id
113110
)
114111
logger.info(f"🔗 Attached volume {additional_volume.id} to server {server.id}")
115112

116113
time.sleep(5)
117114

118-
updated_server = self.instanceAPI.get_server(zone=self.zone, server_id=server.id)
115+
updated_server = self.instanceAPI.get_server(
116+
zone=self.zone, server_id=server.id
117+
)
119118
attached_volumes = updated_server.volumes or {}
120119
attached_volume_ids = [v.volume.id for v in attached_volumes.values()]
121120
self.assertIn(additional_volume.id, attached_volume_ids)
122-
logger.info(f"✅ Volume {additional_volume.id} is attached to server {server.id}")
121+
logger.info(
122+
f"✅ Volume {additional_volume.id} is attached to server {server.id}"
123+
)

0 commit comments

Comments
 (0)