Skip to content

Commit e140c18

Browse files
authored
feat(instance): set some fields of VolumeServer as optional (#765)
1 parent cbcca62 commit e140c18

File tree

4 files changed

+70
-50
lines changed

4 files changed

+70
-50
lines changed

scaleway-async/scaleway_async/instance/v1/marshalling.py

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,38 +653,36 @@ def unmarshal_VolumeServer(data: Any) -> VolumeServer:
653653
field = data.get("name", None)
654654
if field is not None:
655655
args["name"] = field
656-
657-
field = data.get("organization", None)
658-
if field is not None:
659-
args["organization"] = field
660-
661-
field = data.get("size", None)
662-
if field is not None:
663-
args["size"] = field
656+
else:
657+
args["name"] = None
664658

665659
field = data.get("export_uri", None)
666660
if field is not None:
667661
args["export_uri"] = field
668662
else:
669663
args["export_uri"] = None
670664

665+
field = data.get("organization", None)
666+
if field is not None:
667+
args["organization"] = field
668+
else:
669+
args["organization"] = None
670+
671671
field = data.get("server", None)
672672
if field is not None:
673673
args["server"] = unmarshal_ServerSummary(field)
674674
else:
675675
args["server"] = None
676676

677-
field = data.get("volume_type", None)
678-
if field is not None:
679-
args["volume_type"] = field
680-
681-
field = data.get("state", None)
677+
field = data.get("size", None)
682678
if field is not None:
683-
args["state"] = field
679+
args["size"] = field
680+
else:
681+
args["size"] = None
684682

685-
field = data.get("project", None)
683+
field = data.get("volume_type", None)
686684
if field is not None:
687-
args["project"] = field
685+
args["volume_type"] = field
688686

689687
field = data.get("boot", None)
690688
if field is not None:
@@ -710,6 +708,18 @@ def unmarshal_VolumeServer(data: Any) -> VolumeServer:
710708
else:
711709
args["modification_date"] = None
712710

711+
field = data.get("state", None)
712+
if field is not None:
713+
args["state"] = field
714+
else:
715+
args["state"] = None
716+
717+
field = data.get("project", None)
718+
if field is not None:
719+
args["project"] = field
720+
else:
721+
args["project"] = None
722+
713723
return VolumeServer(**args)
714724

715725

scaleway-async/scaleway_async/instance/v1/types.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -660,21 +660,17 @@ class ServerMaintenance:
660660
class VolumeServer:
661661
id: str
662662

663-
name: str
664-
665-
organization: str
666-
667-
size: int
663+
name: Optional[str]
668664

669665
export_uri: Optional[str]
670666

671-
server: Optional[ServerSummary]
667+
organization: Optional[str]
672668

673-
volume_type: VolumeServerVolumeType
669+
server: Optional[ServerSummary]
674670

675-
state: VolumeServerState
671+
size: Optional[int]
676672

677-
project: str
673+
volume_type: VolumeServerVolumeType
678674

679675
boot: bool
680676

@@ -687,6 +683,10 @@ class VolumeServer:
687683

688684
modification_date: Optional[datetime]
689685

686+
state: Optional[VolumeServerState]
687+
688+
project: Optional[str]
689+
690690

691691
@dataclass
692692
class SnapshotBaseVolume:

scaleway/scaleway/instance/v1/marshalling.py

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,38 +653,36 @@ def unmarshal_VolumeServer(data: Any) -> VolumeServer:
653653
field = data.get("name", None)
654654
if field is not None:
655655
args["name"] = field
656-
657-
field = data.get("organization", None)
658-
if field is not None:
659-
args["organization"] = field
660-
661-
field = data.get("size", None)
662-
if field is not None:
663-
args["size"] = field
656+
else:
657+
args["name"] = None
664658

665659
field = data.get("export_uri", None)
666660
if field is not None:
667661
args["export_uri"] = field
668662
else:
669663
args["export_uri"] = None
670664

665+
field = data.get("organization", None)
666+
if field is not None:
667+
args["organization"] = field
668+
else:
669+
args["organization"] = None
670+
671671
field = data.get("server", None)
672672
if field is not None:
673673
args["server"] = unmarshal_ServerSummary(field)
674674
else:
675675
args["server"] = None
676676

677-
field = data.get("volume_type", None)
678-
if field is not None:
679-
args["volume_type"] = field
680-
681-
field = data.get("state", None)
677+
field = data.get("size", None)
682678
if field is not None:
683-
args["state"] = field
679+
args["size"] = field
680+
else:
681+
args["size"] = None
684682

685-
field = data.get("project", None)
683+
field = data.get("volume_type", None)
686684
if field is not None:
687-
args["project"] = field
685+
args["volume_type"] = field
688686

689687
field = data.get("boot", None)
690688
if field is not None:
@@ -710,6 +708,18 @@ def unmarshal_VolumeServer(data: Any) -> VolumeServer:
710708
else:
711709
args["modification_date"] = None
712710

711+
field = data.get("state", None)
712+
if field is not None:
713+
args["state"] = field
714+
else:
715+
args["state"] = None
716+
717+
field = data.get("project", None)
718+
if field is not None:
719+
args["project"] = field
720+
else:
721+
args["project"] = None
722+
713723
return VolumeServer(**args)
714724

715725

scaleway/scaleway/instance/v1/types.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -660,21 +660,17 @@ class ServerMaintenance:
660660
class VolumeServer:
661661
id: str
662662

663-
name: str
664-
665-
organization: str
666-
667-
size: int
663+
name: Optional[str]
668664

669665
export_uri: Optional[str]
670666

671-
server: Optional[ServerSummary]
667+
organization: Optional[str]
672668

673-
volume_type: VolumeServerVolumeType
669+
server: Optional[ServerSummary]
674670

675-
state: VolumeServerState
671+
size: Optional[int]
676672

677-
project: str
673+
volume_type: VolumeServerVolumeType
678674

679675
boot: bool
680676

@@ -687,6 +683,10 @@ class VolumeServer:
687683

688684
modification_date: Optional[datetime]
689685

686+
state: Optional[VolumeServerState]
687+
688+
project: Optional[str]
689+
690690

691691
@dataclass
692692
class SnapshotBaseVolume:

0 commit comments

Comments
 (0)