Skip to content

Adding ip pool id to view #5734

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 3 commits into from
May 10, 2024
Merged

Adding ip pool id to view #5734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e81e14f
initial attempt
charliepark May 10, 2024
2b085cb
Update tests
charliepark May 10, 2024
15048ff
regen OpenAPI schema
charliepark May 10, 2024
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
1 change: 1 addition & 0 deletions nexus/db-model/src/external_ip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ impl From<FloatingIp> for views::FloatingIp {

views::FloatingIp {
ip: ip.ip.ip(),
ip_pool_id: ip.ip_pool_id,
identity,
project_id: ip.project_id,
instance_id: ip.parent_id,
Expand Down
11 changes: 8 additions & 3 deletions nexus/tests/integration_tests/external_ips.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
let client = &cptestctx.external_client;

// automatically linked to current silo
create_default_ip_pool(&client).await;
let default_pool = create_default_ip_pool(&client).await;

assert_ip_pool_utilization(client, "default", 0, 65536, 0, 0).await;

Expand All @@ -162,7 +162,8 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
.unwrap(),
);
// not automatically linked to currently silo. see below
create_ip_pool(&client, "other-pool", Some(other_pool_range)).await;
let (other_pool, ..) =
create_ip_pool(&client, "other-pool", Some(other_pool_range)).await;

assert_ip_pool_utilization(client, "other-pool", 0, 5, 0, 0).await;

Expand All @@ -182,6 +183,7 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
assert_eq!(fip.project_id, project.identity.id);
assert_eq!(fip.instance_id, None);
assert_eq!(fip.ip, IpAddr::from(Ipv4Addr::new(10, 0, 0, 0)));
assert_eq!(fip.ip_pool_id, default_pool.identity.id);

assert_ip_pool_utilization(client, "default", 1, 65536, 0, 0).await;

Expand All @@ -200,6 +202,7 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
assert_eq!(fip.project_id, project.identity.id);
assert_eq!(fip.instance_id, None);
assert_eq!(fip.ip, ip_addr);
assert_eq!(fip.ip_pool_id, default_pool.identity.id);

assert_ip_pool_utilization(client, "default", 2, 65536, 0, 0).await;

Expand Down Expand Up @@ -230,10 +233,11 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
assert_eq!(fip.project_id, project.identity.id);
assert_eq!(fip.instance_id, None);
assert_eq!(fip.ip, IpAddr::from(Ipv4Addr::new(10, 1, 0, 1)));
assert_eq!(fip.ip_pool_id, other_pool.identity.id);

assert_ip_pool_utilization(client, "other-pool", 1, 5, 0, 0).await;

// Create with chosen IP from fleet-scoped named pool.
// Create with chosen IP from non-default pool.
let fip_name = FIP_NAMES[3];
let ip_addr = "10.1.0.5".parse().unwrap();
let fip = create_floating_ip(
Expand All @@ -248,6 +252,7 @@ async fn test_floating_ip_create(cptestctx: &ControlPlaneTestContext) {
assert_eq!(fip.project_id, project.identity.id);
assert_eq!(fip.instance_id, None);
assert_eq!(fip.ip, ip_addr);
assert_eq!(fip.ip_pool_id, other_pool.identity.id);

assert_ip_pool_utilization(client, "other-pool", 2, 5, 0, 0).await;
}
Expand Down
2 changes: 2 additions & 0 deletions nexus/types/src/external_api/views.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ pub struct FloatingIp {
pub identity: IdentityMetadata,
/// The IP address held by this resource.
pub ip: IpAddr,
/// The ID of the IP pool this resource belongs to.
pub ip_pool_id: Uuid,
/// The project this resource exists within.
pub project_id: Uuid,
/// The ID of the instance that this Floating IP is attached to,
Expand Down
12 changes: 12 additions & 0 deletions openapi/nexus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12420,6 +12420,11 @@
"type": "string",
"format": "ip"
},
"ip_pool_id": {
"description": "The ID of the IP pool this resource belongs to.",
"type": "string",
"format": "uuid"
},
"kind": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -12454,6 +12459,7 @@
"description",
"id",
"ip",
"ip_pool_id",
"kind",
"name",
"project_id",
Expand Down Expand Up @@ -12896,6 +12902,11 @@
"type": "string",
"format": "ip"
},
"ip_pool_id": {
"description": "The ID of the IP pool this resource belongs to.",
"type": "string",
"format": "uuid"
},
"name": {
"description": "unique, mutable, user-controlled identifier for each resource",
"allOf": [
Expand Down Expand Up @@ -12924,6 +12935,7 @@
"description",
"id",
"ip",
"ip_pool_id",
"name",
"project_id",
"time_created",
Expand Down