Skip to content

Commit 08d8707

Browse files
authored
feat(instance): add server dns (#1456)
1 parent f9b9737 commit 08d8707

File tree

4 files changed

+142
-120
lines changed

4 files changed

+142
-120
lines changed

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

Lines changed: 66 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,36 +1016,6 @@ def unmarshal_Server(data: Any) -> Server:
10161016
else:
10171017
args["protected"] = False
10181018

1019-
field = data.get("routed_ip_enabled", None)
1020-
if field is not None:
1021-
args["routed_ip_enabled"] = field
1022-
else:
1023-
args["routed_ip_enabled"] = False
1024-
1025-
field = data.get("enable_ipv6", None)
1026-
if field is not None:
1027-
args["enable_ipv6"] = field
1028-
else:
1029-
args["enable_ipv6"] = False
1030-
1031-
field = data.get("image", None)
1032-
if field is not None:
1033-
args["image"] = unmarshal_Image(field)
1034-
else:
1035-
args["image"] = None
1036-
1037-
field = data.get("private_ip", None)
1038-
if field is not None:
1039-
args["private_ip"] = field
1040-
else:
1041-
args["private_ip"] = None
1042-
1043-
field = data.get("public_ip", None)
1044-
if field is not None:
1045-
args["public_ip"] = unmarshal_ServerIp(field)
1046-
else:
1047-
args["public_ip"] = None
1048-
10491019
field = data.get("public_ips", None)
10501020
if field is not None:
10511021
args["public_ips"] = (
@@ -1104,6 +1074,66 @@ def unmarshal_Server(data: Any) -> Server:
11041074
else:
11051075
args["arch"] = Arch.UNKNOWN_ARCH
11061076

1077+
field = data.get("private_nics", None)
1078+
if field is not None:
1079+
args["private_nics"] = (
1080+
[unmarshal_PrivateNIC(v) for v in field] if field is not None else None
1081+
)
1082+
else:
1083+
args["private_nics"] = []
1084+
1085+
field = data.get("zone", None)
1086+
if field is not None:
1087+
args["zone"] = field
1088+
else:
1089+
args["zone"] = None
1090+
1091+
field = data.get("filesystems", None)
1092+
if field is not None:
1093+
args["filesystems"] = (
1094+
[unmarshal_ServerFilesystem(v) for v in field]
1095+
if field is not None
1096+
else None
1097+
)
1098+
else:
1099+
args["filesystems"] = []
1100+
1101+
field = data.get("end_of_service", None)
1102+
if field is not None:
1103+
args["end_of_service"] = field
1104+
else:
1105+
args["end_of_service"] = False
1106+
1107+
field = data.get("routed_ip_enabled", None)
1108+
if field is not None:
1109+
args["routed_ip_enabled"] = field
1110+
else:
1111+
args["routed_ip_enabled"] = False
1112+
1113+
field = data.get("enable_ipv6", None)
1114+
if field is not None:
1115+
args["enable_ipv6"] = field
1116+
else:
1117+
args["enable_ipv6"] = False
1118+
1119+
field = data.get("image", None)
1120+
if field is not None:
1121+
args["image"] = unmarshal_Image(field)
1122+
else:
1123+
args["image"] = None
1124+
1125+
field = data.get("private_ip", None)
1126+
if field is not None:
1127+
args["private_ip"] = field
1128+
else:
1129+
args["private_ip"] = None
1130+
1131+
field = data.get("public_ip", None)
1132+
if field is not None:
1133+
args["public_ip"] = unmarshal_ServerIp(field)
1134+
else:
1135+
args["public_ip"] = None
1136+
11071137
field = data.get("modification_date", None)
11081138
if field is not None:
11091139
args["modification_date"] = (
@@ -1136,36 +1166,6 @@ def unmarshal_Server(data: Any) -> Server:
11361166
else:
11371167
args["placement_group"] = None
11381168

1139-
field = data.get("private_nics", None)
1140-
if field is not None:
1141-
args["private_nics"] = (
1142-
[unmarshal_PrivateNIC(v) for v in field] if field is not None else None
1143-
)
1144-
else:
1145-
args["private_nics"] = []
1146-
1147-
field = data.get("zone", None)
1148-
if field is not None:
1149-
args["zone"] = field
1150-
else:
1151-
args["zone"] = None
1152-
1153-
field = data.get("filesystems", None)
1154-
if field is not None:
1155-
args["filesystems"] = (
1156-
[unmarshal_ServerFilesystem(v) for v in field]
1157-
if field is not None
1158-
else None
1159-
)
1160-
else:
1161-
args["filesystems"] = []
1162-
1163-
field = data.get("end_of_service", None)
1164-
if field is not None:
1165-
args["end_of_service"] = field
1166-
else:
1167-
args["end_of_service"] = False
1168-
11691169
field = data.get("admin_password_encryption_ssh_key_id", None)
11701170
if field is not None:
11711171
args["admin_password_encryption_ssh_key_id"] = field
@@ -1178,6 +1178,12 @@ def unmarshal_Server(data: Any) -> Server:
11781178
else:
11791179
args["admin_password_encrypted_value"] = None
11801180

1181+
field = data.get("dns", None)
1182+
if field is not None:
1183+
args["dns"] = field
1184+
else:
1185+
args["dns"] = None
1186+
11811187
return Server(**args)
11821188

11831189

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,11 @@ class Server:
939939
This value is reset when admin_password_encryption_ssh_key_id is set to an empty string.
940940
"""
941941

942+
dns: Optional[str] = None
943+
"""
944+
Public DNS of the server.
945+
"""
946+
942947

943948
@dataclass
944949
class VolumeTemplate:

scaleway/scaleway/instance/v1/marshalling.py

Lines changed: 66 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,36 +1016,6 @@ def unmarshal_Server(data: Any) -> Server:
10161016
else:
10171017
args["protected"] = False
10181018

1019-
field = data.get("routed_ip_enabled", None)
1020-
if field is not None:
1021-
args["routed_ip_enabled"] = field
1022-
else:
1023-
args["routed_ip_enabled"] = False
1024-
1025-
field = data.get("enable_ipv6", None)
1026-
if field is not None:
1027-
args["enable_ipv6"] = field
1028-
else:
1029-
args["enable_ipv6"] = False
1030-
1031-
field = data.get("image", None)
1032-
if field is not None:
1033-
args["image"] = unmarshal_Image(field)
1034-
else:
1035-
args["image"] = None
1036-
1037-
field = data.get("private_ip", None)
1038-
if field is not None:
1039-
args["private_ip"] = field
1040-
else:
1041-
args["private_ip"] = None
1042-
1043-
field = data.get("public_ip", None)
1044-
if field is not None:
1045-
args["public_ip"] = unmarshal_ServerIp(field)
1046-
else:
1047-
args["public_ip"] = None
1048-
10491019
field = data.get("public_ips", None)
10501020
if field is not None:
10511021
args["public_ips"] = (
@@ -1104,6 +1074,66 @@ def unmarshal_Server(data: Any) -> Server:
11041074
else:
11051075
args["arch"] = Arch.UNKNOWN_ARCH
11061076

1077+
field = data.get("private_nics", None)
1078+
if field is not None:
1079+
args["private_nics"] = (
1080+
[unmarshal_PrivateNIC(v) for v in field] if field is not None else None
1081+
)
1082+
else:
1083+
args["private_nics"] = []
1084+
1085+
field = data.get("zone", None)
1086+
if field is not None:
1087+
args["zone"] = field
1088+
else:
1089+
args["zone"] = None
1090+
1091+
field = data.get("filesystems", None)
1092+
if field is not None:
1093+
args["filesystems"] = (
1094+
[unmarshal_ServerFilesystem(v) for v in field]
1095+
if field is not None
1096+
else None
1097+
)
1098+
else:
1099+
args["filesystems"] = []
1100+
1101+
field = data.get("end_of_service", None)
1102+
if field is not None:
1103+
args["end_of_service"] = field
1104+
else:
1105+
args["end_of_service"] = False
1106+
1107+
field = data.get("routed_ip_enabled", None)
1108+
if field is not None:
1109+
args["routed_ip_enabled"] = field
1110+
else:
1111+
args["routed_ip_enabled"] = False
1112+
1113+
field = data.get("enable_ipv6", None)
1114+
if field is not None:
1115+
args["enable_ipv6"] = field
1116+
else:
1117+
args["enable_ipv6"] = False
1118+
1119+
field = data.get("image", None)
1120+
if field is not None:
1121+
args["image"] = unmarshal_Image(field)
1122+
else:
1123+
args["image"] = None
1124+
1125+
field = data.get("private_ip", None)
1126+
if field is not None:
1127+
args["private_ip"] = field
1128+
else:
1129+
args["private_ip"] = None
1130+
1131+
field = data.get("public_ip", None)
1132+
if field is not None:
1133+
args["public_ip"] = unmarshal_ServerIp(field)
1134+
else:
1135+
args["public_ip"] = None
1136+
11071137
field = data.get("modification_date", None)
11081138
if field is not None:
11091139
args["modification_date"] = (
@@ -1136,36 +1166,6 @@ def unmarshal_Server(data: Any) -> Server:
11361166
else:
11371167
args["placement_group"] = None
11381168

1139-
field = data.get("private_nics", None)
1140-
if field is not None:
1141-
args["private_nics"] = (
1142-
[unmarshal_PrivateNIC(v) for v in field] if field is not None else None
1143-
)
1144-
else:
1145-
args["private_nics"] = []
1146-
1147-
field = data.get("zone", None)
1148-
if field is not None:
1149-
args["zone"] = field
1150-
else:
1151-
args["zone"] = None
1152-
1153-
field = data.get("filesystems", None)
1154-
if field is not None:
1155-
args["filesystems"] = (
1156-
[unmarshal_ServerFilesystem(v) for v in field]
1157-
if field is not None
1158-
else None
1159-
)
1160-
else:
1161-
args["filesystems"] = []
1162-
1163-
field = data.get("end_of_service", None)
1164-
if field is not None:
1165-
args["end_of_service"] = field
1166-
else:
1167-
args["end_of_service"] = False
1168-
11691169
field = data.get("admin_password_encryption_ssh_key_id", None)
11701170
if field is not None:
11711171
args["admin_password_encryption_ssh_key_id"] = field
@@ -1178,6 +1178,12 @@ def unmarshal_Server(data: Any) -> Server:
11781178
else:
11791179
args["admin_password_encrypted_value"] = None
11801180

1181+
field = data.get("dns", None)
1182+
if field is not None:
1183+
args["dns"] = field
1184+
else:
1185+
args["dns"] = None
1186+
11811187
return Server(**args)
11821188

11831189

scaleway/scaleway/instance/v1/types.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,11 @@ class Server:
939939
This value is reset when admin_password_encryption_ssh_key_id is set to an empty string.
940940
"""
941941

942+
dns: Optional[str] = None
943+
"""
944+
Public DNS of the server.
945+
"""
946+
942947

943948
@dataclass
944949
class VolumeTemplate:

0 commit comments

Comments
 (0)