Skip to content

Use number of fip also for internal network #428

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

Draft
jose-caballero wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Use number of fip also for internal network #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa7fd4a
Set the number of Floating IPs for all networks
jose-caballero Feb 5, 2026
4af85dd
refactor unittest
jose-caballero Feb 5, 2026
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
51 changes: 37 additions & 14 deletions lib/workflows/create_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,14 @@ def create_project(
refresh_security_groups(conn, project["id"])

network_type = Networks.from_string(network)

set_floating_ips(conn, project, network_type, number_of_floating_ips)

if network_type in (Networks.EXTERNAL, Networks.JASMIN):
setup_external_networking(
conn,
project,
network_type,
number_of_floating_ips,
number_of_security_group_rules,
)
elif network_type == Networks.INTERNAL:
Expand Down Expand Up @@ -148,7 +150,6 @@ def setup_external_networking(
conn: Connection,
project: Project,
external_network: Networks,
number_of_floating_ips: int,
number_of_security_group_rules: int,
):
"""
Expand All @@ -159,8 +160,6 @@ def setup_external_networking(
:type project: Project
:param external_network: External Cloud network
:type external_network: Networks
:param number_of_floating_ips: Floating IP quota for project
:type number_of_floating_ips: int
:param number_of_security_group_rules: Security group quota for project
:type number_of_security_group_rules: int
"""
Expand Down Expand Up @@ -234,7 +233,6 @@ def setup_external_networking(
conn,
QuotaDetails(
project_identifier=project.id,
floating_ips=number_of_floating_ips,
security_group_rules=number_of_security_group_rules,
),
)
Expand All @@ -253,15 +251,6 @@ def setup_external_networking(

logger.info("Created default security group")

allocate_floating_ips(
conn,
network_identifier=external_network.value,
project_identifier=project.id,
number_to_create=number_of_floating_ips,
)

logger.info("Allocated %s floating ips", number_of_floating_ips)


def setup_internal_networking(conn: Connection, project: Project):
"""
Expand All @@ -282,3 +271,37 @@ def setup_internal_networking(conn: Connection, project: Project):

# create default security group rules
create_internal_security_group_rules(conn, project["id"], "default")


def set_floating_ips(
conn: Connection,
project: Project,
network: Networks,
number_of_floating_ips: int,
):
"""
Set the Floating IPs

:param conn: OpenStack connection object
:type conn: Connection
:param project: OpenStack project object
:type project: Project
:param network: type of network
:type network: Networks
:param number_of_floating_ips: Floating IP quota for project
:type number_of_floating_ips: int
"""
set_quota(
conn,
QuotaDetails(
project_identifier=project.id,
floating_ips=number_of_floating_ips,
),
)
allocate_floating_ips(
conn,
network_identifier=network.value,
Copy link
Collaborator

@gmatthews20 gmatthews20 Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will attempt to allocate floating IPs from the Internal network which we don't want, only from External or Jasmin

project_identifier=project.id,
number_to_create=number_of_floating_ips,
Copy link
Collaborator

@gmatthews20 gmatthews20 Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will max out their quota when the project is created?

Copy link
Member

@khalford khalford Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we should not do this. Let users allocate their own FIPs. Otherwise we are wasting FIPs

)
logger.info("Allocated %s floating ips", number_of_floating_ips)
Loading