octavia 14.0.0__tar.gz → 14.0.1__tar.gz

{octavia-14.0.0 → octavia-14.0.1}/AUTHORS

@@ -69,6 +69,7 @@ Elena Ezhova <eezhova@mirantis.com>
 EranRaichstein <eranra@il.ibm.com>
 Erik Olof Gunnar Andersson <eandersson@blizzard.com>
 Evan Gray <evanscottgray@gmail.com>
+Evgeniy Bykov <chypakabre@gmail.com>
 Evgeny Fedoruk <evgenyf@radware.com>
 Fei Long Wang <flwang@catalyst.net.nz>
 Fernando Royo <froyo@redhat.com>
@@ -101,6 +102,7 @@ Hongbin Lu <hongbin.lu@huawei.com>
 Ian Wienand <iwienand@redhat.com>
 Ihar Hrachyshka <ihrachys@redhat.com>
 Ildar Iskhakov <iiskhako@cisco.com>
+Ilia Kerbs <ikerbs@protonmail.com>
 Itzik Brown <itzikb@redhat.com>
 Jacky Hu <hudayou@hotmail.com>
 James Arendt <james.arendt@hp.com>
@@ -145,6 +147,7 @@ Martin Chlumsky <martin.chlumsky@ubisoft.com>
 Masayuki Igawa <masayuki@igawa.io>
 Matt Alline <matt.alline@gmail.com>
 Maximilian Stinsky <maximilian.stinsky@gec.io>
+Michael Johnson <johnosmor@gmail.com>
 Michael Johnson <johnsom@hp.com>
 Michael Johnson <johnsomor@gmail.com>
 Michal Arbet <michal.arbet@ultimum.io>
@@ -188,6 +191,8 @@ Santhosh Fernandes <santhosh.fernandes@gmail.com>
 Sean McGinnis <sean.mcginnis@gmail.com>
 Selvakumar S <selvakumar.s2@hp.com>
 Sergey Belous <sbelous@mirantis.com>
+Sergey Kraynev <sergejyit@gmail.com>
+Seunghun Lee <seunghun@stackhpc.com>
 ShangXiao <shangxiaobj@inspur.com>
 Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
 Sherif Abdelwahab <sherif.abdelwahab@hp.com>

{octavia-14.0.0 → octavia-14.0.1}/ChangeLog

@@ -1,6 +1,35 @@
 CHANGES
 =======
 
+14.0.1
+------
+
+* Fix incorrect filtering when using bool attrs
+* Fix test\_prometheus\_proxy.test\_main
+* Fixed VRRP nopreempt option
+* Fix port abandonment on failover flow revert
+* Update stable/2024.1 to use 2024.1 tests
+* Fix verification of certificates signed by a private CA
+* Fix missing GARP with UDP listeners on SINGLE LB
+* curl-minimal conflicts with already installed curl
+* Don't install firewalld in the amphora
+* Remove amphora\_health record on revert CreateAmphoraInDB
+* Handle undefined protocol field in security group rules correctly
+* Do not fail on revert PlugVIPAmphora due undefined db\_lb
+* Fix amphora image builds to use DIB bindep
+* Fix SR-IOV when VIP interface is used for members
+* Fix failover when using SRIOV VIP
+* Fix loadbalancer stuck in cascade delete
+* Add check for duplicate members in batch update
+* Fix listener update when using SRIOV VIP
+* Pin pylint on 2024.1
+* Removing tips jobs on stable/2024.1
+* Fix fully-populated API with allowed\_cidrs
+* Fix negative or 0 limit parameter in pagination
+* Handle empty delay on update healthmonitor
+* Update TOX\_CONSTRAINTS\_FILE for stable/2024.1
+* Update .gitreview for stable/2024.1
+
 14.0.0
 ------
 

octavia-14.0.1/PKG-INFO

@@ -0,0 +1,155 @@
+Metadata-Version: 2.1
+Name: octavia
+Version: 14.0.1
+Summary: OpenStack Octavia Scalable Load Balancer as a Service
+Home-page: https://docs.openstack.org/octavia/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.8
+License-File: LICENSE
+Requires-Dist: alembic>=0.9.6
+Requires-Dist: cotyledon>=1.3.0
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: SQLAlchemy>=1.2.19
+Requires-Dist: SQLAlchemy-Utils>=0.30.11
+Requires-Dist: futurist>=1.2.0
+Requires-Dist: requests>=2.23.0
+Requires-Dist: rfc3986>=1.2.0
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: keystonemiddleware>=9.5.0
+Requires-Dist: WebOb>=1.8.2
+Requires-Dist: stevedore>=1.20.0
+Requires-Dist: openstacksdk>=0.103.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.22.0
+Requires-Dist: oslo.db[mysql]>=8.4.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=4.3.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.middleware>=4.0.1
+Requires-Dist: oslo.policy>=3.7.0
+Requires-Dist: oslo.reports>=1.18.0
+Requires-Dist: oslo.serialization>=2.28.1
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=4.7.0
+Requires-Dist: psutil>=5.7.1
+Requires-Dist: pyasn1!=0.2.3,>=0.1.8
+Requires-Dist: pyasn1-modules>=0.0.6
+Requires-Dist: python-barbicanclient>=4.5.2
+Requires-Dist: python-glanceclient>=2.8.0
+Requires-Dist: python-novaclient>=9.1.0
+Requires-Dist: python-cinderclient>=3.3.0
+Requires-Dist: WSME>=0.8.0
+Requires-Dist: Jinja2>=2.10
+Requires-Dist: taskflow>=5.5.0
+Requires-Dist: castellan>=0.16.0
+Requires-Dist: tenacity>=5.0.4
+Requires-Dist: distro>=1.2.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: octavia-lib>=3.3.0
+Requires-Dist: simplejson>=3.13.2
+Requires-Dist: setproctitle>=1.1.10
+Requires-Dist: python-dateutil>=2.7.0
+Requires-Dist: Flask!=0.11,>=0.10
+Requires-Dist: cryptography>=3.0
+Requires-Dist: pyroute2>=0.5.14
+Requires-Dist: gunicorn>=19.9.0
+Requires-Dist: Werkzeug>=0.14.1
+Provides-Extra: redis
+Requires-Dist: redis>=3.4.0; extra == "redis"
+Provides-Extra: zookeeper
+Requires-Dist: kazoo>=2.6.0; extra == "zookeeper"
+Requires-Dist: zake>=0.1.6; extra == "zookeeper"
+Provides-Extra: test
+Requires-Dist: hacking<6.2.0,>=6.1.0; extra == "test"
+Requires-Dist: requests-mock>=1.2.0; extra == "test"
+Requires-Dist: coverage!=4.4,>=4.0; extra == "test"
+Requires-Dist: fixtures>=3.0.0; extra == "test"
+Requires-Dist: flake8-import-order<0.19.0,>=0.18.0; extra == "test"
+Requires-Dist: python-subunit>=1.0.0; extra == "test"
+Requires-Dist: oslotest>=3.2.0; extra == "test"
+Requires-Dist: pylint<3.2.0,>=2.5.3; extra == "test"
+Requires-Dist: testrepository>=0.0.18; extra == "test"
+Requires-Dist: testtools>=2.2.0; extra == "test"
+Requires-Dist: testresources>=2.0.0; extra == "test"
+Requires-Dist: testscenarios>=0.4; extra == "test"
+Requires-Dist: doc8>=0.6.0; extra == "test"
+Requires-Dist: bandit!=1.6.0,>=1.1.0; extra == "test"
+Requires-Dist: tempest>=23.0.0; extra == "test"
+Requires-Dist: sphinx!=2.1.0,>=2.0.0; extra == "test"
+Requires-Dist: bashate>=0.5.1; extra == "test"
+Requires-Dist: WebTest>=2.0.26; extra == "test"
+
+========================
+Team and repository tags
+========================
+
+.. image:: https://governance.openstack.org/tc/badges/octavia.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+=======
+Octavia
+=======
+
+.. image:: https://img.shields.io/pypi/v/octavia.svg
+    :target: https://pypi.org/project/octavia/
+    :alt: Latest Version
+
+Octavia is an operator-grade open source scalable load balancer for use in
+large OpenStack deployments.
+
+Octavia provides the load balancing API for OpenStack. It supports multiple
+"provider drivers" that implement load balancing, including the "amphora"
+reference driver included with Octavia.
+
+Octavia is distributed under the terms of the Apache License, Version 2.0.
+The full terms and conditions of this license are detailed in the LICENSE
+file.
+
+Project resources
+~~~~~~~~~~~~~~~~~
+
+Developer documentation for the Octavia project is available at
+https://docs.openstack.org/octavia/latest/
+
+Release notes for the Octavia project are available at
+https://docs.openstack.org/releasenotes/octavia/
+
+The project source code repository is located at
+https://opendev.org/openstack/octavia
+
+Project status, bugs, and requests for feature enhancements are tracked on
+https://launchpad.net/octavia
+
+For more information on project direction and guiding principles for
+contributors, please see the CONSTITUTION.rst file in this directory, or
+specifications in the specs/ sub-directory.
+
+The project roadmap is available at
+https://wiki.openstack.org/wiki/Octavia/Roadmap
+
+External Resources
+~~~~~~~~~~~~~~~~~~
+
+* Octavia Wiki: https://wiki.openstack.org/wiki/Octavia
+
+* For help on usage and hacking of Octavia, please send an email to
+  OpenStack-dev Mailing List <mailto:openstack-discuss@lists.openstack.org>
+  with **[Octavia]** tag.
+

{octavia-14.0.0 → octavia-14.0.1}/elements/amphora-agent/package-installs.yaml

@@ -19,6 +19,10 @@ git-man:
   uninstall: True
 perl:
   uninstall: True
+# diskimage-builder installs firewalld in rockylinux, it's not needed as it
+# blocks management and tenant traffic by default and we use security groups
+firewalld:
+  uninstall: True
 
 libffi-dev:
   build-only: True

{octavia-14.0.0 → octavia-14.0.1}/elements/amphora-agent/pkg-map

@@ -26,7 +26,6 @@
     },
     "rocky": {
       "9": {
-        "curl": "curl-minimal",
         "isc-dhcp-client": "dhcp-client",
         "python3-dev": "platform-python-devel",
         "python3-venv": "",

octavia-14.0.1/elements/amphora-agent/source-repository-amphora-agent

@@ -0,0 +1,3 @@
+# This is used for source-based builds
+amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia stable/2024.1
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/2024.1

{octavia-14.0.0 → octavia-14.0.1}/elements/amphora-agent/static/usr/local/bin/lvs-masquerade.sh

@@ -19,7 +19,7 @@ set -e
 
 usage() {
     echo
-    echo "Usage: $(basename "$0") [add|delete] [ipv4|ipv6] <interface>"
+    echo "Usage: $(basename "$0") [add|delete] [ipv4|ipv6] <interface> [sriov]"
     echo
     exit 1
 }
@@ -38,10 +38,12 @@ if [ "$1" == "add" ]; then
             nft add rule ip octavia-ipv4 ip-udp-masq oifname "$3" meta l4proto udp masquerade
             nft add chain ip octavia-ipv4 ip-sctp-masq { type nat hook postrouting priority 100\;}
             nft add rule ip octavia-ipv4 ip-sctp-masq oifname "$3" meta l4proto sctp masquerade
-            nft -- add chain ip octavia-ipv4 prerouting { type filter hook prerouting priority -300 \; }
-            nft add rule ip octavia-ipv4 prerouting iifname "$3" meta l4proto tcp notrack
-            nft -- add chain ip octavia-ipv4 output { type filter hook output priority -300 \; }
-            nft add rule ip octavia-ipv4 output oifname "$3" meta l4proto tcp notrack
+            if ! [ "$4" == "sriov" ]; then
+                nft -- add chain ip octavia-ipv4 prerouting { type filter hook prerouting priority -300 \; }
+                nft add rule ip octavia-ipv4 prerouting iifname "$3" meta l4proto tcp notrack
+                nft -- add chain ip octavia-ipv4 output { type filter hook output priority -300 \; }
+                nft add rule ip octavia-ipv4 output oifname "$3" meta l4proto tcp notrack
+            fi
 
         elif [ "$2" == "ipv6" ]; then
             nft add table ip6 octavia-ipv6
@@ -49,10 +51,12 @@ if [ "$1" == "add" ]; then
             nft add rule ip6 octavia-ipv6 ip6-udp-masq oifname "$3" meta l4proto udp masquerade
             nft add chain ip6 octavia-ipv6 ip6-sctp-masq { type nat hook postrouting priority 100\;}
             nft add rule ip6 octavia-ipv6 ip6-sctp-masq oifname "$3" meta l4proto sctp masquerade
-            nft -- add chain ip6 octavia-ipv6 prerouting { type filter hook prerouting priority -300 \; }
-            nft add rule ip6 octavia-ipv6 prerouting iifname "$3" meta l4proto tcp notrack
-            nft -- add chain ip6 octavia-ipv6 output { type filter hook output priority -300 \; }
-            nft add rule ip6 octavia-ipv6 output oifname "$3" meta l4proto tcp notrack
+            if ! [ "$4" == "sriov" ]; then
+                nft -- add chain ip6 octavia-ipv6 prerouting { type filter hook prerouting priority -300 \; }
+                nft add rule ip6 octavia-ipv6 prerouting iifname "$3" meta l4proto tcp notrack
+                nft -- add chain ip6 octavia-ipv6 output { type filter hook output priority -300 \; }
+                nft add rule ip6 octavia-ipv6 output oifname "$3" meta l4proto tcp notrack
+            fi
         else
             usage
         fi
@@ -62,14 +66,18 @@ if [ "$1" == "add" ]; then
             /sbin/iptables -t nat -A POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/iptables -t nat -A POSTROUTING -p sctp -o $3 -j MASQUERADE
 
-            /sbin/iptables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/iptables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            if ! [ "$4" == "sriov" ]; then
+                /sbin/iptables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
+                /sbin/iptables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            fi
         elif [ "$2" == "ipv6" ]; then
             /sbin/ip6tables -t nat -A POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/ip6tables -t nat -A POSTROUTING -p sctp -o $3 -j MASQUERADE
 
-            /sbin/ip6tables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/ip6tables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            if ! [ "$4" == "sriov" ]; then
+                /sbin/ip6tables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
+                /sbin/ip6tables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            fi
         else
             usage
         fi
@@ -83,19 +91,21 @@ elif [ "$1" == "delete" ]; then
             nft delete chain ip octavia-ipv4 ip-udp-masq
             nft flush chain ip octavia-ipv4 ip-sctp-masq
             nft delete chain ip octavia-ipv4 ip-sctp-masq
-            nft flush chain ip octavia-ipv4 prerouting
-            nft delete chain ip octavia-ipv4 prerouting
-            nft flush chain ip octavia-ipv4 output
-            nft delete chain ip octavia-ipv4 output
+            # Don't abort the script if these chains don't exist
+            nft flush chain ip octavia-ipv4 prerouting || true
+            nft delete chain ip octavia-ipv4 prerouting || true
+            nft flush chain ip octavia-ipv4 output || true
+            nft delete chain ip octavia-ipv4 output || true
         elif [ "$2" == "ipv6" ]; then
             nft flush chain ip6 octavia-ipv6 ip6-udp-masq
             nft delete chain ip6 octavia-ipv6 ip6-udp-masq
             nft flush chain ip6 octavia-ipv6 ip6-sctp-masq
             nft delete chain ip6 octavia-ipv6 ip6-sctp-masq
-            nft flush chain ip6 octavia-ipv6 prerouting
-            nft delete chain ip6 octavia-ipv6 prerouting
-            nft flush chain ip6 octavia-ipv6 output
-            nft delete chain ip6 octavia-ipv6 output
+            # Don't abort the script if these chains don't exist
+            nft flush chain ip6 octavia-ipv6 prerouting || true
+            nft delete chain ip6 octavia-ipv6 prerouting || true
+            nft flush chain ip6 octavia-ipv6 output || true
+            nft delete chain ip6 octavia-ipv6 output || true
         else
             usage
         fi
@@ -104,13 +114,15 @@ elif [ "$1" == "delete" ]; then
         if [ "$2" == "ipv4" ]; then
             /sbin/iptables -t nat -D POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/iptables -t nat -D POSTROUTING -p sctp -o $3 -j MASQUERADE
-            /sbin/iptables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/iptables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK
+            # Don't abort the script if these chains don't exist
+            /sbin/iptables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK || true
+            /sbin/iptables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK || true
         elif [ "$2" == "ipv6" ]; then
             /sbin/ip6tables -t nat -D POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/ip6tables -t nat -D POSTROUTING -p sctp -o $3 -j MASQUERADE
-            /sbin/ip6tables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/ip6tables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK
+            # Don't abort the script if these chains don't exist
+            /sbin/ip6tables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK || true
+            /sbin/ip6tables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK || true
         else
             usage
         fi

{octavia-14.0.0 → octavia-14.0.1}/elements/amphora-agent/static/usr/local/bin/udp-masquerade.sh

@@ -19,7 +19,7 @@ set -e
 
 usage() {
     echo
-    echo "Usage: $(basename "$0") [add|delete] [ipv4|ipv6] <interface>"
+    echo "Usage: $(basename "$0") [add|delete] [ipv4|ipv6] <interface> [sriov]"
     echo
     exit 1
 }
@@ -38,10 +38,12 @@ if [ "$1" == "add" ]; then
             nft add rule ip octavia-ipv4 ip-udp-masq oifname "$3" meta l4proto udp masquerade
             nft add chain ip octavia-ipv4 ip-sctp-masq { type nat hook postrouting priority 100\;}
             nft add rule ip octavia-ipv4 ip-sctp-masq oifname "$3" meta l4proto sctp masquerade
-            nft -- add chain ip octavia-ipv4 prerouting { type filter hook prerouting priority -300 \; }
-            nft add rule ip octavia-ipv4 prerouting iifname "$3" meta l4proto tcp notrack
-            nft -- add chain ip octavia-ipv4 output { type filter hook output priority -300 \; }
-            nft add rule ip octavia-ipv4 output oifname "$3" meta l4proto tcp notrack
+            if ! [ "$4" == "sriov" ]; then
+                nft -- add chain ip octavia-ipv4 prerouting { type filter hook prerouting priority -300 \; }
+                nft add rule ip octavia-ipv4 prerouting iifname "$3" meta l4proto tcp notrack
+                nft -- add chain ip octavia-ipv4 output { type filter hook output priority -300 \; }
+                nft add rule ip octavia-ipv4 output oifname "$3" meta l4proto tcp notrack
+            fi
 
         elif [ "$2" == "ipv6" ]; then
             nft add table ip6 octavia-ipv6
@@ -49,10 +51,12 @@ if [ "$1" == "add" ]; then
             nft add rule ip6 octavia-ipv6 ip6-udp-masq oifname "$3" meta l4proto udp masquerade
             nft add chain ip6 octavia-ipv6 ip6-sctp-masq { type nat hook postrouting priority 100\;}
             nft add rule ip6 octavia-ipv6 ip6-sctp-masq oifname "$3" meta l4proto sctp masquerade
-            nft -- add chain ip6 octavia-ipv6 prerouting { type filter hook prerouting priority -300 \; }
-            nft add rule ip6 octavia-ipv6 prerouting iifname "$3" meta l4proto tcp notrack
-            nft -- add chain ip6 octavia-ipv6 output { type filter hook output priority -300 \; }
-            nft add rule ip6 octavia-ipv6 output oifname "$3" meta l4proto tcp notrack
+            if ! [ "$4" == "sriov" ]; then
+                nft -- add chain ip6 octavia-ipv6 prerouting { type filter hook prerouting priority -300 \; }
+                nft add rule ip6 octavia-ipv6 prerouting iifname "$3" meta l4proto tcp notrack
+                nft -- add chain ip6 octavia-ipv6 output { type filter hook output priority -300 \; }
+                nft add rule ip6 octavia-ipv6 output oifname "$3" meta l4proto tcp notrack
+            fi
         else
             usage
         fi
@@ -62,14 +66,18 @@ if [ "$1" == "add" ]; then
             /sbin/iptables -t nat -A POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/iptables -t nat -A POSTROUTING -p sctp -o $3 -j MASQUERADE
 
-            /sbin/iptables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/iptables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            if ! [ "$4" == "sriov" ]; then
+                /sbin/iptables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
+                /sbin/iptables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            fi
         elif [ "$2" == "ipv6" ]; then
             /sbin/ip6tables -t nat -A POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/ip6tables -t nat -A POSTROUTING -p sctp -o $3 -j MASQUERADE
 
-            /sbin/ip6tables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/ip6tables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            if ! [ "$4" == "sriov" ]; then
+                /sbin/ip6tables -t raw -A PREROUTING -p tcp -i $3 -j NOTRACK
+                /sbin/ip6tables -t raw -A OUTPUT -p tcp -o $3 -j NOTRACK
+            fi
         else
             usage
         fi
@@ -83,19 +91,21 @@ elif [ "$1" == "delete" ]; then
             nft delete chain ip octavia-ipv4 ip-udp-masq
             nft flush chain ip octavia-ipv4 ip-sctp-masq
             nft delete chain ip octavia-ipv4 ip-sctp-masq
-            nft flush chain ip octavia-ipv4 prerouting
-            nft delete chain ip octavia-ipv4 prerouting
-            nft flush chain ip octavia-ipv4 output
-            nft delete chain ip octavia-ipv4 output
+            # Don't abort the script if these chains don't exist
+            nft flush chain ip octavia-ipv4 prerouting || true
+            nft delete chain ip octavia-ipv4 prerouting || true
+            nft flush chain ip octavia-ipv4 output || true
+            nft delete chain ip octavia-ipv4 output || true
         elif [ "$2" == "ipv6" ]; then
             nft flush chain ip6 octavia-ipv6 ip6-udp-masq
             nft delete chain ip6 octavia-ipv6 ip6-udp-masq
             nft flush chain ip6 octavia-ipv6 ip6-sctp-masq
             nft delete chain ip6 octavia-ipv6 ip6-sctp-masq
-            nft flush chain ip6 octavia-ipv6 prerouting
-            nft delete chain ip6 octavia-ipv6 prerouting
-            nft flush chain ip6 octavia-ipv6 output
-            nft delete chain ip6 octavia-ipv6 output
+            # Don't abort the script if these chains don't exist
+            nft flush chain ip6 octavia-ipv6 prerouting || true
+            nft delete chain ip6 octavia-ipv6 prerouting || true
+            nft flush chain ip6 octavia-ipv6 output || true
+            nft delete chain ip6 octavia-ipv6 output || true
         else
             usage
         fi
@@ -104,13 +114,15 @@ elif [ "$1" == "delete" ]; then
         if [ "$2" == "ipv4" ]; then
             /sbin/iptables -t nat -D POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/iptables -t nat -D POSTROUTING -p sctp -o $3 -j MASQUERADE
-            /sbin/iptables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/iptables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK
+            # Don't abort the script if these chains don't exist
+            /sbin/iptables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK || true
+            /sbin/iptables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK || true
         elif [ "$2" == "ipv6" ]; then
             /sbin/ip6tables -t nat -D POSTROUTING -p udp -o $3 -j MASQUERADE
             /sbin/ip6tables -t nat -D POSTROUTING -p sctp -o $3 -j MASQUERADE
-            /sbin/ip6tables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK
-            /sbin/ip6tables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK
+            # Don't abort the script if these chains don't exist
+            /sbin/ip6tables -t raw -D PREROUTING -p tcp -i $3 -j NOTRACK || true
+            /sbin/ip6tables -t raw -D OUTPUT -p tcp -o $3 -j NOTRACK || true
         else
             usage
         fi

{octavia-14.0.0 → octavia-14.0.1}/elements/octavia-lib/source-repository-octavia-lib

@@ -1,2 +1,2 @@
 # This is used for source-based builds
-octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib
+octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib stable/2024.1

{octavia-14.0.0 → octavia-14.0.1}/octavia/amphorae/backends/agent/api_server/keepalivedlvs.py

@@ -230,6 +230,15 @@ class KeepalivedLvs(lvs_listener_base.LvsListenerApiServerBase):
                             .format(action, listener_id)),
                 'details': e.output}, status=500)
 
+        is_vrrp = (CONF.controller_worker.loadbalancer_topology ==
+                   consts.TOPOLOGY_ACTIVE_STANDBY)
+        # TODO(gthiemonge) remove RESTART from the list (same as previous todo
+        # in this function)
+        if not is_vrrp and action in [consts.AMP_ACTION_START,
+                                      consts.AMP_ACTION_RESTART,
+                                      consts.AMP_ACTION_RELOAD]:
+            util.send_vip_advertisements(listener_id=listener_id)
+
         return webob.Response(
             json={'message': 'OK',
                   'details': 'keepalivedlvs listener {listener_id} '

{octavia-14.0.0 → octavia-14.0.1}/octavia/amphorae/backends/agent/api_server/osutils.py

@@ -75,11 +75,13 @@ class BaseOS(object):
             is_sriov=is_sriov)
         vip_interface.write()
 
-    def write_port_interface_file(self, interface, fixed_ips, mtu):
+    def write_port_interface_file(self, interface, fixed_ips, mtu,
+                                  is_sriov=False):
         port_interface = interface_file.PortInterfaceFile(
             name=interface,
             mtu=mtu,
-            fixed_ips=fixed_ips)
+            fixed_ips=fixed_ips,
+            is_sriov=is_sriov)
         port_interface.write()
 
     @classmethod

{octavia-14.0.0 → octavia-14.0.1}/octavia/amphorae/backends/agent/api_server/plug.py

@@ -152,7 +152,7 @@ class Plug(object):
                     socket.inet_pton(socket.AF_INET6, ip.get('ip_address'))
 
     def plug_network(self, mac_address, fixed_ips, mtu=None,
-                     vip_net_info=None):
+                     vip_net_info=None, is_sriov=False):
         try:
             self._check_ip_addresses(fixed_ips=fixed_ips)
         except socket.error:
@@ -189,7 +189,8 @@ class Plug(object):
                     vips=rendered_vips,
                     mtu=mtu,
                     vrrp_info=vrrp_info,
-                    fixed_ips=fixed_ips)
+                    fixed_ips=fixed_ips,
+                    is_sriov=is_sriov)
                 self._osutils.bring_interface_up(existing_interface, 'vip')
             # Otherwise, we are just plugging a run-of-the-mill network
             else:
@@ -197,7 +198,7 @@ class Plug(object):
                 self._osutils.write_port_interface_file(
                     interface=existing_interface,
                     fixed_ips=fixed_ips,
-                    mtu=mtu)
+                    mtu=mtu, is_sriov=is_sriov)
                 self._osutils.bring_interface_up(existing_interface, 'network')
 
             util.send_member_advertisements(fixed_ips)
@@ -222,7 +223,7 @@ class Plug(object):
         self._osutils.write_port_interface_file(
             interface=netns_interface,
             fixed_ips=fixed_ips,
-            mtu=mtu)
+            mtu=mtu, is_sriov=is_sriov)
 
         # Update the list of interfaces to add to the namespace
         self._update_plugged_interfaces_file(netns_interface, mac_address)

{octavia-14.0.0 → octavia-14.0.1}/octavia/amphorae/backends/agent/api_server/server.py

@@ -223,7 +223,8 @@ class Server(object):
         return self._plug.plug_network(port_info['mac_address'],
                                        port_info.get('fixed_ips'),
                                        port_info.get('mtu'),
-                                       port_info.get('vip_net_info'))
+                                       port_info.get('vip_net_info'),
+                                       port_info.get('is_sriov'))
 
     def upload_cert(self):
         return certificate_update.upload_server_cert()
@@ -278,7 +279,7 @@ class Server(object):
             raise exceptions.BadRequest(
                 description='Invalid rules information') from e
 
-        nftable_utils.write_nftable_vip_rules_file(interface, rules_info)
+        nftable_utils.write_nftable_rules_file(interface, rules_info)
 
         nftable_utils.load_nftables_file()
 

{octavia-14.0.0 → octavia-14.0.1}/octavia/amphorae/backends/agent/api_server/util.py

@@ -392,7 +392,37 @@ def get_haproxy_vip_addresses(lb_id):
     return vips
 
 
-def send_vip_advertisements(lb_id):
+def get_lvs_vip_addresses(listener_id: str) -> tp.List[str]:
+    """Get the VIP addresses for a LVS load balancer.
+
+    :param listener_id: The listener ID to get VIP addresses from.
+    :returns: List of VIP addresses (IPv4 and IPv6)
+    """
+    vips = []
+    # Extract the VIP addresses from keepalived configuration
+    # Format is
+    # virtual_server_group ipv<n>-group {
+    #     vip_address1 port1
+    #     vip_address2 port2
+    # }
+    # it can be repeated in case of dual-stack LBs
+    with open(keepalived_lvs_cfg_path(listener_id), encoding='utf-8') as file:
+        vsg_section = False
+        for line in file:
+            current_line = line.strip()
+            if vsg_section:
+                if current_line.startswith('}'):
+                    vsg_section = False
+                else:
+                    vip_address = current_line.split(' ')[0]
+                    vips.append(vip_address)
+            elif line.startswith('virtual_server_group '):
+                vsg_section = True
+    return vips
+
+
+def send_vip_advertisements(lb_id: tp.Optional[str] = None,
+                            listener_id: tp.Optional[str] = None):
     """Sends address advertisements for each load balancer VIP.
 
     This method will send either GARP (IPv4) or neighbor advertisements (IPv6)
@@ -402,7 +432,10 @@ def send_vip_advertisements(lb_id):
     :returns: None
     """
     try:
-        vips = get_haproxy_vip_addresses(lb_id)
+        if lb_id:
+            vips = get_haproxy_vip_addresses(lb_id)
+        else:
+            vips = get_lvs_vip_addresses(listener_id)
 
         for vip in vips:
             interface = network_utils.get_interface_name(