Skip to content

Commit b00a82a

Browse files
docs(ipam): unify wording (#651)
Co-authored-by: Rémy Léone <rleone@scaleway.com>
1 parent 2bd8d23 commit b00a82a

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

scaleway-async/scaleway_async/ipam/v1/api.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ async def book_ip(
5757
resource: Optional[CustomResource] = None,
5858
) -> IP:
5959
"""
60-
Book a new IP.
61-
Book a new IP from the specified source. Currently IPs can only be booked from a Private Network.
62-
:param source: Source in which to book the IP. Not all sources are available for booking.
60+
Reserve a new IP.
61+
Reserve a new IP from the specified source. Currently IPs can only be reserved from a Private Network.
62+
:param source: Source in which to reserve the IP. Not all sources are available for reservation.
6363
:param is_ipv6: Request an IPv6 instead of an IPv4.
6464
:param region: Region to target. If none is passed will use default region from the config.
6565
:param project_id: When creating an IP in a Private Network, the Project must match the Private Network's Project.
66-
:param address: The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already booked, then the call will fail.
66+
:param address: The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already reserved, then the call will fail.
6767
:param tags: Tags for the IP.
68-
:param resource: Custom resource to attach to the IP being booked. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
68+
:param resource: Custom resource to attach to the IP being reserved. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
6969
:return: :class:`IP <IP>`
7070
7171
Usage:
@@ -427,8 +427,8 @@ async def attach_ip(
427427
region: Optional[Region] = None,
428428
) -> IP:
429429
"""
430-
Attach existing IP to custom resource.
431-
Attach an existing IP from a Private Network subnet to a custom, named resource via its MAC address. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources as it will fail - see the relevant product API for an equivalent method.
430+
Attach IP to custom resource.
431+
Attach an existing reserved IP from a Private Network subnet to a custom, named resource via its MAC address. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources as it will fail - see the relevant product API for an equivalent method.
432432
:param ip_id: IP ID.
433433
:param resource: Custom resource to be attached to the IP.
434434
:param region: Region to target. If none is passed will use default region from the config.
@@ -472,8 +472,8 @@ async def detach_ip(
472472
region: Optional[Region] = None,
473473
) -> IP:
474474
"""
475-
Detach existing IP from a custom resource.
476-
Detach a private IP from a custom resource. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
475+
Detach IP from a custom resource.
476+
Detach a private IP from a custom resource. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for detaching IP addresses from standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
477477
:param ip_id: IP ID.
478478
:param resource: Custom resource currently attached to the IP.
479479
:param region: Region to target. If none is passed will use default region from the config.
@@ -518,8 +518,8 @@ async def move_ip(
518518
to_resource: Optional[CustomResource] = None,
519519
) -> IP:
520520
"""
521-
Move existing IP to a custom resource.
522-
Move an existing private IP from one custom resource (e.g. a virtual machine hosted on an Elastic Metal server) to another custom resource. This will detach it from the first resource, and attach it to the second. Do not use this method for moving IP addresses between standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
521+
Move IP to a custom resource.
522+
Move an existing reserved private IP from one custom resource (e.g. a virtual machine hosted on an Elastic Metal server) to another custom resource. This will detach it from the first resource, and attach it to the second. Do not use this method for moving IP addresses between standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
523523
:param ip_id: IP ID.
524524
:param from_resource: Custom resource currently attached to the IP.
525525
:param region: Region to target. If none is passed will use default region from the config.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class IP:
147147

148148
created_at: Optional[datetime]
149149
"""
150-
Date the IP was booked.
150+
Date the IP was reserved.
151151
"""
152152

153153
updated_at: Optional[datetime]
@@ -157,7 +157,7 @@ class IP:
157157

158158
source: Optional[Source]
159159
"""
160-
Source pool where the IP was booked in.
160+
Source pool where the IP was reserved in.
161161
"""
162162

163163
resource: Optional[Resource]
@@ -193,7 +193,7 @@ class AttachIPRequest:
193193
class BookIPRequest:
194194
source: Source
195195
"""
196-
Source in which to book the IP. Not all sources are available for booking.
196+
Source in which to reserve the IP. Not all sources are available for reservation.
197197
"""
198198

199199
is_ipv6: bool
@@ -213,7 +213,7 @@ class BookIPRequest:
213213

214214
address: Optional[str]
215215
"""
216-
The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already booked, then the call will fail.
216+
The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already reserved, then the call will fail.
217217
"""
218218

219219
tags: Optional[List[str]]
@@ -223,7 +223,7 @@ class BookIPRequest:
223223

224224
resource: Optional[CustomResource]
225225
"""
226-
Custom resource to attach to the IP being booked. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
226+
Custom resource to attach to the IP being reserved. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
227227
"""
228228

229229

scaleway/scaleway/ipam/v1/api.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ def book_ip(
5757
resource: Optional[CustomResource] = None,
5858
) -> IP:
5959
"""
60-
Book a new IP.
61-
Book a new IP from the specified source. Currently IPs can only be booked from a Private Network.
62-
:param source: Source in which to book the IP. Not all sources are available for booking.
60+
Reserve a new IP.
61+
Reserve a new IP from the specified source. Currently IPs can only be reserved from a Private Network.
62+
:param source: Source in which to reserve the IP. Not all sources are available for reservation.
6363
:param is_ipv6: Request an IPv6 instead of an IPv4.
6464
:param region: Region to target. If none is passed will use default region from the config.
6565
:param project_id: When creating an IP in a Private Network, the Project must match the Private Network's Project.
66-
:param address: The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already booked, then the call will fail.
66+
:param address: The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already reserved, then the call will fail.
6767
:param tags: Tags for the IP.
68-
:param resource: Custom resource to attach to the IP being booked. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
68+
:param resource: Custom resource to attach to the IP being reserved. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
6969
:return: :class:`IP <IP>`
7070
7171
Usage:
@@ -427,8 +427,8 @@ def attach_ip(
427427
region: Optional[Region] = None,
428428
) -> IP:
429429
"""
430-
Attach existing IP to custom resource.
431-
Attach an existing IP from a Private Network subnet to a custom, named resource via its MAC address. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources as it will fail - see the relevant product API for an equivalent method.
430+
Attach IP to custom resource.
431+
Attach an existing reserved IP from a Private Network subnet to a custom, named resource via its MAC address. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources as it will fail - see the relevant product API for an equivalent method.
432432
:param ip_id: IP ID.
433433
:param resource: Custom resource to be attached to the IP.
434434
:param region: Region to target. If none is passed will use default region from the config.
@@ -472,8 +472,8 @@ def detach_ip(
472472
region: Optional[Region] = None,
473473
) -> IP:
474474
"""
475-
Detach existing IP from a custom resource.
476-
Detach a private IP from a custom resource. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for attaching IP addresses to standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
475+
Detach IP from a custom resource.
476+
Detach a private IP from a custom resource. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this method for detaching IP addresses from standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
477477
:param ip_id: IP ID.
478478
:param resource: Custom resource currently attached to the IP.
479479
:param region: Region to target. If none is passed will use default region from the config.
@@ -518,8 +518,8 @@ def move_ip(
518518
to_resource: Optional[CustomResource] = None,
519519
) -> IP:
520520
"""
521-
Move existing IP to a custom resource.
522-
Move an existing private IP from one custom resource (e.g. a virtual machine hosted on an Elastic Metal server) to another custom resource. This will detach it from the first resource, and attach it to the second. Do not use this method for moving IP addresses between standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
521+
Move IP to a custom resource.
522+
Move an existing reserved private IP from one custom resource (e.g. a virtual machine hosted on an Elastic Metal server) to another custom resource. This will detach it from the first resource, and attach it to the second. Do not use this method for moving IP addresses between standard Scaleway resources (e.g. Instances, Load Balancers) as it will fail - see the relevant product API for an equivalent method.
523523
:param ip_id: IP ID.
524524
:param from_resource: Custom resource currently attached to the IP.
525525
:param region: Region to target. If none is passed will use default region from the config.

scaleway/scaleway/ipam/v1/types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class IP:
147147

148148
created_at: Optional[datetime]
149149
"""
150-
Date the IP was booked.
150+
Date the IP was reserved.
151151
"""
152152

153153
updated_at: Optional[datetime]
@@ -157,7 +157,7 @@ class IP:
157157

158158
source: Optional[Source]
159159
"""
160-
Source pool where the IP was booked in.
160+
Source pool where the IP was reserved in.
161161
"""
162162

163163
resource: Optional[Resource]
@@ -193,7 +193,7 @@ class AttachIPRequest:
193193
class BookIPRequest:
194194
source: Source
195195
"""
196-
Source in which to book the IP. Not all sources are available for booking.
196+
Source in which to reserve the IP. Not all sources are available for reservation.
197197
"""
198198

199199
is_ipv6: bool
@@ -213,7 +213,7 @@ class BookIPRequest:
213213

214214
address: Optional[str]
215215
"""
216-
The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already booked, then the call will fail.
216+
The requested address should not include the subnet mask (/suffix). Note that only the Private Network source allows you to pick a specific IP. If the requested IP is already reserved, then the call will fail.
217217
"""
218218

219219
tags: Optional[List[str]]
@@ -223,7 +223,7 @@ class BookIPRequest:
223223

224224
resource: Optional[CustomResource]
225225
"""
226-
Custom resource to attach to the IP being booked. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
226+
Custom resource to attach to the IP being reserved. An example of a custom resource is a virtual machine hosted on an Elastic Metal server. Do not use this for attaching IP addresses to standard Scaleway resources, as it will fail - instead, see the relevant product API for an equivalent method.
227227
"""
228228

229229

0 commit comments

Comments
 (0)