Skip to content

Commit b0de130

Browse files
estellesoulardestellesoulard
authored
chore(instance): handle deprecated_optional fields (#1691)
1 parent 4308d15 commit b0de130

File tree

4 files changed

+56
-56
lines changed

4 files changed

+56
-56
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,13 +1108,13 @@ def unmarshal_Server(data: Any) -> Server:
11081108
if field is not None:
11091109
args["routed_ip_enabled"] = field
11101110
else:
1111-
args["routed_ip_enabled"] = False
1111+
args["routed_ip_enabled"] = None
11121112

11131113
field = data.get("enable_ipv6", None)
11141114
if field is not None:
11151115
args["enable_ipv6"] = field
11161116
else:
1117-
args["enable_ipv6"] = False
1117+
args["enable_ipv6"] = None
11181118

11191119
field = data.get("image", None)
11201120
if field is not None:
@@ -1472,7 +1472,7 @@ def unmarshal_SecurityGroup(data: Any) -> SecurityGroup:
14721472
if field is not None:
14731473
args["organization_default"] = field
14741474
else:
1475-
args["organization_default"] = False
1475+
args["organization_default"] = None
14761476

14771477
field = data.get("creation_date", None)
14781478
if field is not None:
@@ -1905,85 +1905,85 @@ def unmarshal_Dashboard(data: Any) -> Dashboard:
19051905
if field is not None:
19061906
args["volumes_count"] = field
19071907
else:
1908-
args["volumes_count"] = None
1908+
args["volumes_count"] = 0
19091909

19101910
field = data.get("running_servers_count", None)
19111911
if field is not None:
19121912
args["running_servers_count"] = field
19131913
else:
1914-
args["running_servers_count"] = None
1914+
args["running_servers_count"] = 0
19151915

19161916
field = data.get("servers_by_types", None)
19171917
if field is not None:
19181918
args["servers_by_types"] = field
19191919
else:
1920-
args["servers_by_types"] = None
1920+
args["servers_by_types"] = {}
19211921

19221922
field = data.get("images_count", None)
19231923
if field is not None:
19241924
args["images_count"] = field
19251925
else:
1926-
args["images_count"] = None
1926+
args["images_count"] = 0
19271927

19281928
field = data.get("snapshots_count", None)
19291929
if field is not None:
19301930
args["snapshots_count"] = field
19311931
else:
1932-
args["snapshots_count"] = None
1932+
args["snapshots_count"] = 0
19331933

19341934
field = data.get("servers_count", None)
19351935
if field is not None:
19361936
args["servers_count"] = field
19371937
else:
1938-
args["servers_count"] = None
1938+
args["servers_count"] = 0
19391939

19401940
field = data.get("ips_count", None)
19411941
if field is not None:
19421942
args["ips_count"] = field
19431943
else:
1944-
args["ips_count"] = None
1944+
args["ips_count"] = 0
19451945

19461946
field = data.get("security_groups_count", None)
19471947
if field is not None:
19481948
args["security_groups_count"] = field
19491949
else:
1950-
args["security_groups_count"] = None
1950+
args["security_groups_count"] = 0
19511951

19521952
field = data.get("ips_unused", None)
19531953
if field is not None:
19541954
args["ips_unused"] = field
19551955
else:
1956-
args["ips_unused"] = None
1956+
args["ips_unused"] = 0
19571957

19581958
field = data.get("volumes_l_ssd_count", None)
19591959
if field is not None:
19601960
args["volumes_l_ssd_count"] = field
19611961
else:
1962-
args["volumes_l_ssd_count"] = None
1962+
args["volumes_l_ssd_count"] = 0
19631963

19641964
field = data.get("volumes_l_ssd_total_size", None)
19651965
if field is not None:
19661966
args["volumes_l_ssd_total_size"] = field
19671967
else:
1968-
args["volumes_l_ssd_total_size"] = None
1968+
args["volumes_l_ssd_total_size"] = 0
19691969

19701970
field = data.get("private_nics_count", None)
19711971
if field is not None:
19721972
args["private_nics_count"] = field
19731973
else:
1974-
args["private_nics_count"] = None
1974+
args["private_nics_count"] = 0
19751975

19761976
field = data.get("placement_groups_count", None)
19771977
if field is not None:
19781978
args["placement_groups_count"] = field
19791979
else:
1980-
args["placement_groups_count"] = None
1980+
args["placement_groups_count"] = 0
19811981

19821982
field = data.get("volumes_scratch_count", None)
19831983
if field is not None:
19841984
args["volumes_scratch_count"] = field
19851985
else:
1986-
args["volumes_scratch_count"] = None
1986+
args["volumes_scratch_count"] = 0
19871987

19881988
field = data.get("volumes_b_ssd_count", None)
19891989
if field is not None:
@@ -2662,7 +2662,7 @@ def unmarshal_ServerType(data: Any) -> ServerType:
26622662
if field is not None:
26632663
args["monthly_price"] = field
26642664
else:
2665-
args["monthly_price"] = 0.0
2665+
args["monthly_price"] = None
26662666

26672667
field = data.get("hourly_price", None)
26682668
if field is not None:

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,12 @@ class Server:
879879
Instance creation date.
880880
"""
881881

882-
routed_ip_enabled: Optional[bool] = False
882+
routed_ip_enabled: Optional[bool] = None
883883
"""
884884
True to configure the instance so it uses the routed IP mode. Use of `routed_ip_enabled` as `False` is deprecated.
885885
"""
886886

887-
enable_ipv6: Optional[bool] = False
887+
enable_ipv6: Optional[bool] = None
888888
"""
889889
True if IPv6 is enabled (deprecated and always `False` when `routed_ip_enabled` is `True`).
890890
"""
@@ -1064,7 +1064,7 @@ class SecurityGroup:
10641064
Zone in which the security group is located.
10651065
"""
10661066

1067-
organization_default: Optional[bool] = False
1067+
organization_default: Optional[bool] = None
10681068
"""
10691069
True if it is your default security group for this Organization ID.
10701070
"""
@@ -1329,7 +1329,7 @@ class ServerType:
13291329
True if this Instance type has reached end of service.
13301330
"""
13311331

1332-
monthly_price: Optional[float] = 0.0
1332+
monthly_price: Optional[float] = None
13331333
"""
13341334
Estimated monthly price, for a 30 days month, in Euro.
13351335
"""
@@ -1724,7 +1724,7 @@ class CreateSecurityGroupRequest:
17241724

17251725
organization: Optional[str] = None
17261726

1727-
organization_default: Optional[bool] = False
1727+
organization_default: Optional[bool] = None
17281728

17291729
project_default: Optional[bool] = False
17301730

@@ -1803,7 +1803,7 @@ class CreateServerRequest:
18031803
By default, `dynamic_ip_required` is true, a dynamic ip is attached to the instance (if no flexible ip is already attached).
18041804
"""
18051805

1806-
routed_ip_enabled: Optional[bool] = False
1806+
routed_ip_enabled: Optional[bool] = None
18071807
"""
18081808
If true, configure the Instance so it uses the new routed IP mode.
18091809
"""
@@ -1818,7 +1818,7 @@ class CreateServerRequest:
18181818
Volumes attached to the server.
18191819
"""
18201820

1821-
enable_ipv6: Optional[bool] = False
1821+
enable_ipv6: Optional[bool] = None
18221822
"""
18231823
True if IPv6 is enabled on the server (deprecated and always `False` when `routed_ip_enabled` is `True`).
18241824
"""
@@ -3354,7 +3354,7 @@ class UpdateSecurityGroupRequest:
33543354
Tags of the security group.
33553355
"""
33563356

3357-
organization_default: Optional[bool] = False
3357+
organization_default: Optional[bool] = None
33583358
"""
33593359
Please use project_default instead.
33603360
"""
@@ -3469,7 +3469,7 @@ class UpdateServerRequest:
34693469

34703470
volumes: Optional[dict[str, VolumeServerTemplate]] = field(default_factory=dict)
34713471
dynamic_ip_required: Optional[bool] = False
3472-
routed_ip_enabled: Optional[bool] = False
3472+
routed_ip_enabled: Optional[bool] = None
34733473
"""
34743474
True to configure the instance so it uses the new routed IP mode (once this is set to True you cannot set it back to False).
34753475
"""
@@ -3479,7 +3479,7 @@ class UpdateServerRequest:
34793479
A list of reserved IP IDs to attach to the Instance.
34803480
"""
34813481

3482-
enable_ipv6: Optional[bool] = False
3482+
enable_ipv6: Optional[bool] = None
34833483
protected: Optional[bool] = False
34843484
"""
34853485
True to activate server protection option.

‎scaleway/scaleway/instance/v1/marshalling.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,13 +1108,13 @@ def unmarshal_Server(data: Any) -> Server:
11081108
if field is not None:
11091109
args["routed_ip_enabled"] = field
11101110
else:
1111-
args["routed_ip_enabled"] = False
1111+
args["routed_ip_enabled"] = None
11121112

11131113
field = data.get("enable_ipv6", None)
11141114
if field is not None:
11151115
args["enable_ipv6"] = field
11161116
else:
1117-
args["enable_ipv6"] = False
1117+
args["enable_ipv6"] = None
11181118

11191119
field = data.get("image", None)
11201120
if field is not None:
@@ -1472,7 +1472,7 @@ def unmarshal_SecurityGroup(data: Any) -> SecurityGroup:
14721472
if field is not None:
14731473
args["organization_default"] = field
14741474
else:
1475-
args["organization_default"] = False
1475+
args["organization_default"] = None
14761476

14771477
field = data.get("creation_date", None)
14781478
if field is not None:
@@ -1905,85 +1905,85 @@ def unmarshal_Dashboard(data: Any) -> Dashboard:
19051905
if field is not None:
19061906
args["volumes_count"] = field
19071907
else:
1908-
args["volumes_count"] = None
1908+
args["volumes_count"] = 0
19091909

19101910
field = data.get("running_servers_count", None)
19111911
if field is not None:
19121912
args["running_servers_count"] = field
19131913
else:
1914-
args["running_servers_count"] = None
1914+
args["running_servers_count"] = 0
19151915

19161916
field = data.get("servers_by_types", None)
19171917
if field is not None:
19181918
args["servers_by_types"] = field
19191919
else:
1920-
args["servers_by_types"] = None
1920+
args["servers_by_types"] = {}
19211921

19221922
field = data.get("images_count", None)
19231923
if field is not None:
19241924
args["images_count"] = field
19251925
else:
1926-
args["images_count"] = None
1926+
args["images_count"] = 0
19271927

19281928
field = data.get("snapshots_count", None)
19291929
if field is not None:
19301930
args["snapshots_count"] = field
19311931
else:
1932-
args["snapshots_count"] = None
1932+
args["snapshots_count"] = 0
19331933

19341934
field = data.get("servers_count", None)
19351935
if field is not None:
19361936
args["servers_count"] = field
19371937
else:
1938-
args["servers_count"] = None
1938+
args["servers_count"] = 0
19391939

19401940
field = data.get("ips_count", None)
19411941
if field is not None:
19421942
args["ips_count"] = field
19431943
else:
1944-
args["ips_count"] = None
1944+
args["ips_count"] = 0
19451945

19461946
field = data.get("security_groups_count", None)
19471947
if field is not None:
19481948
args["security_groups_count"] = field
19491949
else:
1950-
args["security_groups_count"] = None
1950+
args["security_groups_count"] = 0
19511951

19521952
field = data.get("ips_unused", None)
19531953
if field is not None:
19541954
args["ips_unused"] = field
19551955
else:
1956-
args["ips_unused"] = None
1956+
args["ips_unused"] = 0
19571957

19581958
field = data.get("volumes_l_ssd_count", None)
19591959
if field is not None:
19601960
args["volumes_l_ssd_count"] = field
19611961
else:
1962-
args["volumes_l_ssd_count"] = None
1962+
args["volumes_l_ssd_count"] = 0
19631963

19641964
field = data.get("volumes_l_ssd_total_size", None)
19651965
if field is not None:
19661966
args["volumes_l_ssd_total_size"] = field
19671967
else:
1968-
args["volumes_l_ssd_total_size"] = None
1968+
args["volumes_l_ssd_total_size"] = 0
19691969

19701970
field = data.get("private_nics_count", None)
19711971
if field is not None:
19721972
args["private_nics_count"] = field
19731973
else:
1974-
args["private_nics_count"] = None
1974+
args["private_nics_count"] = 0
19751975

19761976
field = data.get("placement_groups_count", None)
19771977
if field is not None:
19781978
args["placement_groups_count"] = field
19791979
else:
1980-
args["placement_groups_count"] = None
1980+
args["placement_groups_count"] = 0
19811981

19821982
field = data.get("volumes_scratch_count", None)
19831983
if field is not None:
19841984
args["volumes_scratch_count"] = field
19851985
else:
1986-
args["volumes_scratch_count"] = None
1986+
args["volumes_scratch_count"] = 0
19871987

19881988
field = data.get("volumes_b_ssd_count", None)
19891989
if field is not None:
@@ -2662,7 +2662,7 @@ def unmarshal_ServerType(data: Any) -> ServerType:
26622662
if field is not None:
26632663
args["monthly_price"] = field
26642664
else:
2665-
args["monthly_price"] = 0.0
2665+
args["monthly_price"] = None
26662666

26672667
field = data.get("hourly_price", None)
26682668
if field is not None:

0 commit comments

Comments
 (0)