Skip to content

feat(instance): expose ipam_id for ServerIp and Ip #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2023
Merged

feat(instance): expose ipam_id for ServerIp and Ip #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions scaleway-async/scaleway_async/instance/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@ def unmarshal_ServerIp(data: Any) -> ServerIp:
field = data.get("id", None)
args["id"] = field

field = data.get("ipam_id", None)
args["ipam_id"] = field

field = data.get("netmask", None)
args["netmask"] = field

Expand Down Expand Up @@ -828,6 +831,9 @@ def unmarshal_Ip(data: Any) -> Ip:
field = data.get("id", None)
args["id"] = field

field = data.get("ipam_id", None)
args["ipam_id"] = field

field = data.get("organization", None)
args["organization"] = field

Expand Down Expand Up @@ -2526,6 +2532,9 @@ def marshal_ServerIp(
if request.id is not None:
output["id"] = request.id

if request.ipam_id is not None:
output["ipam_id"] = request.ipam_id

if request.netmask is not None:
output["netmask"] = request.netmask

Expand Down
7 changes: 7 additions & 0 deletions scaleway-async/scaleway_async/instance/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,8 @@ class Ip:

prefix: str

ipam_id: str

zone: Zone


Expand Down Expand Up @@ -1310,6 +1312,11 @@ class ServerIp:

state: ServerIpState

ipam_id: str
"""
The ip_id of an IPAM ip if the ip is created from IPAM, null if not.
"""


@dataclass
class ServerIpv6:
Expand Down
9 changes: 9 additions & 0 deletions scaleway/scaleway/instance/v1/marshalling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,9 @@ def unmarshal_ServerIp(data: Any) -> ServerIp:
field = data.get("id", None)
args["id"] = field

field = data.get("ipam_id", None)
args["ipam_id"] = field

field = data.get("netmask", None)
args["netmask"] = field

Expand Down Expand Up @@ -828,6 +831,9 @@ def unmarshal_Ip(data: Any) -> Ip:
field = data.get("id", None)
args["id"] = field

field = data.get("ipam_id", None)
args["ipam_id"] = field

field = data.get("organization", None)
args["organization"] = field

Expand Down Expand Up @@ -2526,6 +2532,9 @@ def marshal_ServerIp(
if request.id is not None:
output["id"] = request.id

if request.ipam_id is not None:
output["ipam_id"] = request.ipam_id

if request.netmask is not None:
output["netmask"] = request.netmask

Expand Down
7 changes: 7 additions & 0 deletions scaleway/scaleway/instance/v1/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,8 @@ class Ip:

prefix: str

ipam_id: str

zone: Zone


Expand Down Expand Up @@ -1308,6 +1310,11 @@ class ServerIp:
Tags associated with the IP.
"""

ipam_id: str
"""
The ip_id of an IPAM ip if the ip is created from IPAM, null if not.
"""

state: ServerIpState


Expand Down