From a13758b4108482a5716ad631bbf96e45c5597a1e Mon Sep 17 00:00:00 2001 From: wangkuntian Date: Fri, 27 Oct 2023 10:40:16 +0800 Subject: [PATCH] Add distributed traffic feature --- ...-distributed-traffic-feature-support.patch | 214 ++++++++++++++++++ python-neutron-lib.spec | 41 +++- 2 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 0001-add-distributed-traffic-feature-support.patch diff --git a/0001-add-distributed-traffic-feature-support.patch b/0001-add-distributed-traffic-feature-support.patch new file mode 100644 index 0000000..548703e --- /dev/null +++ b/0001-add-distributed-traffic-feature-support.patch @@ -0,0 +1,214 @@ +Author: wangkuntian +Date: Mon Oct 16 13:27:10 2023 +0800 + + feat: add distributed traffic feature +--- + api/definitions/l3.py | 19 ++++++++ + api/definitions/rg_port_forwarding.py | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + exceptions/l3.py | 9 ++++ + plugins/constants.py | 1 + + 4 files changed, 167 insertions(+) + +diff --git a/api/definitions/l3.py b/api/definitions/l3.py +index fc66d378..06ab1d6f 100644 +--- a/api/definitions/l3.py ++++ b/api/definitions/l3.py +@@ -100,6 +100,25 @@ RESOURCE_ATTRIBUTE_MAP = { + 'required': False, + } + } ++ }}, ++ 'configurations': {'allow_post': True, 'allow_put': True, ++ 'is_visible': True, 'default': None, ++ 'enforce_policy': True, ++ 'validate': { ++ 'type:dict_or_nodata': { ++ 'preferred_agent': { ++ 'type:string': None, ++ 'required': False ++ }, ++ 'master_agent': { ++ 'type:string': None, ++ 'required': False ++ }, ++ 'slave_agents': { ++ 'type:list_of_unique_strings': None, ++ 'required': False ++ } ++ } + }} + }, + FLOATINGIPS: { +diff --git a/api/definitions/rg_port_forwarding.py b/api/definitions/rg_port_forwarding.py +new file mode 100644 +index 00000000..c26e6a42 +--- /dev/null ++++ b/api/definitions/rg_port_forwarding.py +@@ -0,0 +1,138 @@ ++# Copyright (c) 2023 UnionTech ++# All rights reserved ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); you may ++# not use this file except in compliance with the License. You may obtain ++# a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT ++# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the ++# License for the specific language governing permissions and limitations ++# under the License. ++ ++from neutron_lib import constants ++from neutron_lib.api import converters ++from neutron_lib.api.definitions import l3 ++from neutron_lib.db import constants as db_const ++ ++# The alias of the extension. ++ALIAS = 'router-gateway-port-forwarding' ++ ++# The name of the extension. ++NAME = 'Router Gateway Port Forwarding' ++ ++# A prefix for API resources. An empty prefix means that the API is going ++# to be exposed at the v2/ level as any other core resource. ++API_PREFIX = '/' + l3.ROUTERS ++ ++# The description of the extension. ++DESCRIPTION = "Allow port forwarding from router gateway port " \ ++ "to an internal port" ++ ++# A timestamp of when the extension was introduced. ++UPDATED_TIMESTAMP = "2023-06-30T15:00:00-00:00" ++ ++# The name of the resource. ++RESOURCE_NAME = 'gateway_port_forwarding' ++ ++# The plural for the resource. ++COLLECTION_NAME = 'gateway_port_forwardings' ++ ++# parent ++PARENT_RESOURCE_NAME = l3.ROUTER ++PARENT_COLLECTION_NAME = l3.ROUTERS ++ ++ID = 'id' ++PROJECT_ID = 'project_id' ++EXTERNAL_PORT = 'external_port' ++INTERNAL_PORT = 'internal_port' ++GW_IP_ADDRESS = 'gw_ip_address' ++INTERNAL_IP_ADDRESS = 'internal_ip_address' ++PROTOCOL = 'protocol' ++PROTOCOLS = constants.IPTABLES_PROTOCOL_MAP.keys() ++INTERNAL_PORT_ID = 'internal_port_id' ++RESOURCE_ATTRIBUTE_MAP = {} ++ ++# The subresource attribute map for the extension. It adds child resources ++# to main extension's resource. The subresource map must have a parent and ++# a parameters entry. If an extension does not need such a map, None can ++# be specified (mandatory). ++SUB_RESOURCE_ATTRIBUTE_MAP = { ++ COLLECTION_NAME: { ++ 'parent': { ++ 'collection_name': PARENT_COLLECTION_NAME, ++ 'member_name': PARENT_RESOURCE_NAME ++ }, ++ 'parameters': { ++ ID: { ++ 'allow_post': False, 'allow_put': False, ++ 'validate': {'type:uuid': None}, ++ 'is_visible': True, ++ 'primary_key': True, ++ 'is_sort_key': True, ++ 'is_filter': True ++ }, ++ PROJECT_ID: { ++ 'allow_post': True, 'allow_put': False, ++ 'validate': {'type:string': db_const.PROJECT_ID_FIELD_SIZE}, ++ 'required_by_policy': True, ++ 'is_visible': False ++ }, ++ EXTERNAL_PORT: { ++ 'allow_post': True, 'allow_put': True, ++ 'convert_to': converters.convert_to_int, ++ 'validate': {'type:range': [1, 65535]}, ++ 'is_visible': True, ++ 'is_sort_key': True, ++ 'is_filter': True ++ }, ++ INTERNAL_PORT: { ++ 'allow_post': True, 'allow_put': True, ++ 'convert_to': converters.convert_to_int, ++ 'validate': {'type:range': [1, 65535]}, ++ 'is_visible': True ++ }, ++ INTERNAL_IP_ADDRESS: { ++ 'allow_post': True, 'allow_put': True, ++ 'validate': {'type:ip_address': None}, ++ 'is_visible': True ++ }, ++ PROTOCOL: { ++ 'allow_post': True, 'allow_put': True, ++ 'validate': {'type:values': PROTOCOLS}, ++ 'is_visible': True, ++ 'convert_to': converters.convert_to_protocol, ++ 'is_sort_key': True, ++ 'is_filter': True ++ }, ++ INTERNAL_PORT_ID: { ++ 'allow_post': True, 'allow_put': True, ++ 'validate': {'type:uuid': None}, ++ 'is_visible': True, ++ 'is_sort_key': True, ++ 'is_filter': True ++ }, ++ GW_IP_ADDRESS: { ++ 'allow_post': False, 'allow_put': False, ++ 'validate': {'type:ip_address': None}, ++ 'is_visible': True, ++ }, ++ } ++ } ++} ++ ++# The action map: it associates verbs with methods to be performed on ++# the API resource. ++ACTION_MAP = {} ++ ++# The action status. ++ACTION_STATUS = {} ++ ++# The list of required extensions. ++REQUIRED_EXTENSIONS = [l3.ALIAS] ++ ++# The list of optional extensions. ++OPTIONAL_EXTENSIONS = [] +diff --git a/exceptions/l3.py b/exceptions/l3.py +index cfd46657..6c5b7a44 100644 +--- a/exceptions/l3.py ++++ b/exceptions/l3.py +@@ -96,3 +96,12 @@ class IpTablesApplyException(exceptions.NeutronException): + def __init__(self, message=None): + self.message = message + super(IpTablesApplyException, self).__init__() ++ ++ ++class RouterAgentNotGiven(exceptions.BadRequest): ++ message = _("Router network agent must be given at the same time " ++ "while creating.") ++ ++ ++class RouterAgentConflict(exceptions.Conflict): ++ message = _("Router master agent can not be same with slave agents.") +diff --git a/plugins/constants.py b/plugins/constants.py +index 6b6ca7e9..bba4a914 100644 +--- a/plugins/constants.py ++++ b/plugins/constants.py +@@ -24,6 +24,7 @@ CORE = 'CORE' + L3 = 'L3_ROUTER_NAT' + LOG_API = "LOGGING" + PORTFORWARDING = "PORTFORWARDING" ++ROUTER_GATEWAY_PORTFORWARDING = "ROUTER_GATEWAY_PORTFORWARDING" + FLOATINGIPPOOL = "FLOATINGIPPOOL" + NETWORK_SEGMENT_RANGE = "NETWORK_SEGMENT_RANGE" + CONNTRACKHELPER = "CONNTRACKHELPER" diff --git a/python-neutron-lib.spec b/python-neutron-lib.spec index fba2f44..2f17f82 100644 --- a/python-neutron-lib.spec +++ b/python-neutron-lib.spec @@ -1,13 +1,26 @@ +%define gitPatch() \ +cd %1; \ +git init && git config user.name "openstack-plugin" && git config user.email "openstack-plugin"; \ +git add . && git commit -m "openstack-plugin init"; \ +git apply --check %2 || exit 1 && git apply %2; \ +git add . && git commit -m "openstack-plugin patch" + +%define gitUnPatch() \ +cd %1;\ +git reset --hard HEAD~;\ +rm -rf %1/.git + %global _empty_manifest_terminate_build 0 %global with_doc 1 Name: python-neutron-lib Version: 1.29.2 -Release: 1 +Release: 2 Summary: OpenStack Neutron library License: Apache-2.0 URL: http://launchpad.net/neutron/ Source0: https://tarballs.openstack.org/neutron-lib/neutron-lib-%{version}.tar.gz +Source1: 0001-add-distributed-traffic-feature-support.patch BuildArch: noarch BuildRequires: python3-devel @@ -85,6 +98,14 @@ OpenStack Neutron library shared by all Neutron sub-projects. This package contains the Neutron library test files. +%package -n python3-neutron-lib-distributed-traffic +Summary: The plug-in package of python-neutron-lib for router gateway portforwarding feature +Requires: git +Requires: python-neutron-lib + +%description -n python3-neutron-lib-distributed-traffic +The plug-in package of python-neutron-lib for router gateway portforwarding feature + %if 0%{?with_doc} %package doc Summary: OpenStack Neutron library documentation @@ -114,6 +135,9 @@ rm -rf doc/build/html/.{doctrees,buildinfo} %install %{py3_install} +# Install router gateway portforwarding feature patch +install -D -p -m 644 %{SOURCE1} %{buildroot}%{python3_sitelib}/openstack-plugin/neutron-lib/$(basename %{SOURCE1}) + %check rm -f ./neutron_lib/tests/unit/hacking/test_checks.py export OS_TEST_PATH='./neutron_lib/tests/unit' @@ -131,6 +155,16 @@ PYTHON=python3 stestr --test-path $OS_TEST_PATH run %license LICENSE %{python3_sitelib}/neutron_lib/tests +%post -n python3-neutron-lib-distributed-traffic +export patch_name=$(basename %{SOURCE1}) +%gitPatch %{python3_sitelib}/neutron_lib %{python3_sitelib}/openstack-plugin/neutron-lib/$patch_name + +%preun -n python3-neutron-lib-distributed-traffic +%gitUnPatch %{python3_sitelib}/neutron_lib + +%files -n python3-neutron-lib-distributed-traffic +%{python3_sitelib}/openstack-plugin/neutron-lib/%{basename %{SOURCE1}} + %if 0%{?with_doc} %files doc %license LICENSE @@ -138,6 +172,9 @@ PYTHON=python3 stestr --test-path $OS_TEST_PATH run %endif %changelog +* Tue Oct 17 2023 wangkuntian - 1.29.2-2 +- Add distributed traffic feature package + * Mon Nov 15 2021 liusheng - 1.29.2-1 - Upgrade neutron-lib package to version 1.29.2 @@ -151,4 +188,4 @@ PYTHON=python3 stestr --test-path $OS_TEST_PATH run - Upgrade to 2.10.1 to support OpenStack-W * Wed Jan 13 2021 Python_Bot -- Package Spec generated +- Package Spec generated \ No newline at end of file -- Gitee