fix typing issue

Author: Laure-di

scaleway/scaleway/instance/v1/tests/test_instance_sdk.py

@@ -40,7 +40,7 @@ def instance_block_api() -> tuple[InstanceUtilsV1API, BlockV1Alpha1API]:
 @pytest.fixture(scope="module")
 @scw_vcr.use_cassette
 def instance_volume(
-        instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
+    instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
 ) -> Generator[tuple[Server, list[Volume]], None, None]:
     instance_api, block_api = instance_block_api
     volumes_list: list[Volume] = []
@@ -54,50 +54,54 @@ def instance_volume(
     }
 
     instance = instance_api._create_server(
-        commercial_type="DEV1-S",  # replace with your type
-        zone="fr-par-1",            # replace with your zone
-        name="test-server",          # replace with your server name
+        commercial_type=commercial_type,
+        zone=zone,
+        name=server_name,
         dynamic_ip_required=False,
         volumes=volumes,
         protected=False,
         boot_type=BootType.LOCAL,
         image="c00ae53c-1e29-4087-a384-47f3c5c1cd84",
     )
 
-    instance_api.wait_instance_server(instance.server.id, zone="fr-par-1")
-
     server = instance.server
     assert server is not None, "Server creation failed"
+    assert server.id is not None, "Server ID is None after creation"
+
+    instance_api.wait_instance_server(server.id, zone=zone)
 
     yield server, volumes_list
 
     for volume in volumes_list:
+        assert volume.id is not None
         instance_api.detach_server_volume(
-            server_id=server.id, volume_id=volume.id, zone="fr-par-1"
+            server_id=server.id, volume_id=volume.id, zone=zone
         )
-        block_api.wait_for_volume(volume_id=volume.id, zone="fr-par-1")
-        block_api.delete_volume(volume_id=volume.id, zone="fr-par-1")
-
-    instance_api.delete_server(server_id=server.id, zone="fr-par-1")
+        block_api.wait_for_volume(volume_id=volume.id, zone=zone)
+        block_api.delete_volume(volume_id=volume.id, zone=zone)
 
+    instance_api.delete_server(server_id=server.id, zone=zone)
 
 
 @scw_vcr.use_cassette
-def test_attach_additionnal_volume(
+def test_attach_additional_volume(
     instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
     instance_volume: tuple[Server, list[Volume]],
 ) -> None:
     instance_api, block_api = instance_block_api
     server, volumes_list = instance_volume
+    assert server.id is not None
+
     additional_volume = block_api.create_volume(
         from_empty=CreateVolumeRequestFromEmpty(size=volume_size),
     )
+    assert additional_volume.id is not None
+
     updated_volume = block_api.wait_for_volume(
         volume_id=additional_volume.id, zone=zone
     )
-    volumes_list.append(updated_volume)
-    assert updated_volume.size == volume_size
     assert updated_volume.id is not None
+    volumes_list.append(updated_volume)
 
     instance_api.attach_server_volume(
         server_id=server.id,
@@ -109,6 +113,7 @@ def test_attach_additionnal_volume(
     block_api.wait_for_volume(volume_id=additional_volume.id, zone=zone)
 
     server_details = instance_api.get_server(server_id=server.id, zone=zone).server
+    assert server_details is not None
     attached_volume_ids = [v.id for v in server_details.volumes.values()]
     assert additional_volume.id in attached_volume_ids
 
@@ -117,7 +122,7 @@ def test_attach_additionnal_volume(
 def test_list_server(
     instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
 ) -> None:
-    instance_api, block_api = instance_block_api
+    instance_api, _ = instance_block_api
     servers = instance_api.list_servers(zone=zone)
     assert len(servers.servers) >= 1
     assert servers.servers[0].name == server_name
@@ -127,8 +132,8 @@ def test_list_server(
 def test_create_new_server(
     instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
 ) -> None:
-    instance_api, block_api = instance_block_api
-    server = instance_api._create_server(
+    instance_api, _ = instance_block_api
+    server_instance = instance_api._create_server(
         commercial_type=commercial_type,
         zone=zone,
         name=server_name_extra,
@@ -137,19 +142,22 @@ def test_create_new_server(
         protected=False,
         boot_type=BootType.LOCAL,
     )
-    assert server.server.id is not None
-    assert server.server.name == server_name_extra
+    server = server_instance.server
+    assert server is not None
+    assert server.id is not None
+    assert server.name == server_name_extra
 
     servers = instance_api.list_servers_all(zone=zone)
     assert len(servers) >= 2
 
-    instance_api.delete_server(server_id=server.server.id, zone=zone)
+    instance_api.delete_server(server_id=server.id, zone=zone)
 
 
 @scw_vcr.use_cassette
 def test_create_ip(
     instance_block_api: tuple[InstanceUtilsV1API, BlockV1Alpha1API],
 ) -> None:
-    instance_api, block_api = instance_block_api
-    ip = instance_api.create_ip(type_=IpType.ROUTED_IPV6).ip
-    assert ip.id is not None
+    instance_api, _ = instance_block_api
+    ip_instance = instance_api.create_ip(type_=IpType.ROUTED_IPV6).ip
+    assert ip_instance is not None
+    assert ip_instance.id is not None