From d1d02d59cc105f6092c1c1f555cb2d7a7a54182e Mon Sep 17 00:00:00 2001 From: Ivan Anfimov Date: Wed, 17 Sep 2025 17:52:16 +0000 Subject: [PATCH] Migrate setup configuration to pyproject.toml Change-Id: Ic520cb730df9325fcf41d99f69b004fe631209ac Co-authored-by: Stephen Finucane Signed-off-by: Ivan Anfimov --- pyproject.toml | 81 +++++++++++++++++++++++++++++++++++++++++++++++++- setup.cfg | 58 ------------------------------------ 2 files changed, 80 insertions(+), 59 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0e9793e6a..e6ad1c6b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,83 @@ [build-system] -requires = ["pbr>=5.7.0", "setuptools>=64.0.0", "wheel"] +requires = ["pbr>=6.1.1"] build-backend = "pbr.build" +[project] +name = "neutron-fwaas" +description = "OpenStack Networking FWaaS" +authors = [ + {name = "OpenStack", email = "openstack-discuss@lists.openstack.org"}, +] +readme = {file = "README.rst", content-type = "text/x-rst"} +license = {text = "Apache-2.0"} +dynamic = ["version", "dependencies"] +requires-python = ">=3.10" +classifiers = [ + "Environment :: OpenStack", + "Intended Audience :: Information Technology", + "Intended Audience :: System Administrators", + "License :: OSI Approved :: Apache Software License", + "Operating System :: POSIX :: Linux", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: Implementation :: CPython", +] + +[project.urls] +Homepage = "https://docs.openstack.org/neutron-fwaas/latest/" +Repository = "https://opendev.org/openstack/neutron-fwaas" + +[tool.setuptools] +packages = [ + "neutron_fwaas" +] + +[tool.setuptools.data-files] +"etc/neutron/rootwrap.d" = [ + "etc/neutron/rootwrap.d/fwaas-privsep.filters", +] + +[project.entry-points."oslo.config.opts"] +"neutron.fwaas" = "neutron_fwaas.opts:list_opts" +"firewall.agent" = "neutron_fwaas.opts:list_agent_opts" + +[project.entry-points."firewall_drivers"] +iptables_v2 = "neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.iptables_fwaas_v2:IptablesFwaasDriver" + +[project.entry-points."neutron.service_plugins"] +firewall_v2 = "neutron_fwaas.services.firewall.fwaas_plugin_v2:FirewallPluginV2" + +[project.entry-points."neutron.db.alembic_migrations"] +neutron-fwaas = "neutron_fwaas.db.migration:alembic_migrations" + +[project.entry-points."oslo.policy.policies"] +neutron-fwaas = "neutron_fwaas.policies:list_rules" + +[project.entry-points."neutron.policies"] +neutron-fwaas = "neutron_fwaas.policies:list_rules" + +[project.entry-points."neutron.agent.l2.extensions"] +fwaas_v2 = "neutron_fwaas.services.firewall.service_drivers.agents.l2.fwaas_v2:FWaaSV2AgentExtension" + +[project.entry-points."neutron.agent.l2.firewall_drivers"] +noop = "neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.noop.noop_driver:NoopFirewallL2Driver" +ovs = "neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.openvswitch_firewall.firewall:OVSFirewallDriver" + +[project.entry-points."neutron.agent.l3.extensions"] +fwaas_v2 = "neutron_fwaas.services.firewall.service_drivers.agents.l3reference.firewall_l3_agent_v2:L3WithFWaaS" +fwaas_v2_log = "neutron_fwaas.services.logapi.agents.l3.fwg_log:FWaaSL3LoggingExtension" + +[project.entry-points."neutron.agent.l3.firewall_drivers"] +conntrack = "neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.legacy_conntrack:ConntrackLegacy" +netlink_conntrack = "neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.netlink_conntrack:ConntrackNetlink" + +[project.entry-points."neutron.services.logapi.drivers"] +fwaas_v2_log = "neutron_fwaas.services.logapi.agents.drivers.iptables.log:IptablesLoggingDriver" + +[project.entry-points."neutron.status.upgrade.checks"] +neutron_fwaas = "neutron_fwaas.cmd.upgrade_checks.checks:Checks" diff --git a/setup.cfg b/setup.cfg index de3eebca9..dd2d9d5ce 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,60 +1,2 @@ [metadata] name = neutron-fwaas -summary = OpenStack Networking FWaaS -description_file = - README.rst -author = OpenStack -author_email = openstack-discuss@lists.openstack.org -home_page = https://docs.openstack.org/neutron-fwaas/latest/ -python_requires = >=3.10 -classifier = - Environment :: OpenStack - Intended Audience :: Information Technology - Intended Audience :: System Administrators - License :: OSI Approved :: Apache Software License - Operating System :: POSIX :: Linux - Programming Language :: Python - Programming Language :: Python :: 3 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 - Programming Language :: Python :: 3 :: Only - -[files] -packages = - neutron_fwaas - -data_files = - etc/neutron/rootwrap.d = - etc/neutron/rootwrap.d/fwaas-privsep.filters - -[entry_points] -firewall_drivers = - iptables_v2 = neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.iptables_fwaas_v2:IptablesFwaasDriver -neutron.service_plugins = - firewall_v2 = neutron_fwaas.services.firewall.fwaas_plugin_v2:FirewallPluginV2 - -neutron.db.alembic_migrations = - neutron-fwaas = neutron_fwaas.db.migration:alembic_migrations -oslo.config.opts = - neutron.fwaas = neutron_fwaas.opts:list_opts - firewall.agent = neutron_fwaas.opts:list_agent_opts -oslo.policy.policies = - neutron-fwaas = neutron_fwaas.policies:list_rules -neutron.policies = - neutron-fwaas = neutron_fwaas.policies:list_rules -neutron.agent.l2.extensions = - fwaas_v2 = neutron_fwaas.services.firewall.service_drivers.agents.l2.fwaas_v2:FWaaSV2AgentExtension -neutron.agent.l2.firewall_drivers = - noop = neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.noop.noop_driver:NoopFirewallL2Driver - ovs = neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.l2.openvswitch_firewall.firewall:OVSFirewallDriver -neutron.agent.l3.extensions = - fwaas_v2 = neutron_fwaas.services.firewall.service_drivers.agents.l3reference.firewall_l3_agent_v2:L3WithFWaaS - fwaas_v2_log = neutron_fwaas.services.logapi.agents.l3.fwg_log:FWaaSL3LoggingExtension -neutron.agent.l3.firewall_drivers = - conntrack = neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.legacy_conntrack:ConntrackLegacy - netlink_conntrack = neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.netlink_conntrack:ConntrackNetlink -neutron.services.logapi.drivers = - fwaas_v2_log = neutron_fwaas.services.logapi.agents.drivers.iptables.log:IptablesLoggingDriver -neutron.status.upgrade.checks = - neutron_fwaas = neutron_fwaas.cmd.upgrade_checks.checks:Checks