octavia 13.0.0.0rc1__py3-none-any.whl → 14.0.0__py3-none-any.whl

octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py

@@ -109,8 +109,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         vip = lb.vip
         sec_grp_id = 'lb-sec-grp1'
         show_port = self.driver.network_proxy.get_port
-        show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+        show_port.return_value = Port(device_owner=constants.OCTAVIA_OWNER)
         delete_port = self.driver.network_proxy.delete_port
         delete_sec_grp = self.driver.network_proxy.delete_security_group
         list_security_groups = self.driver.network_proxy.find_security_group
@@ -122,13 +121,35 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         delete_port.assert_has_calls(calls, any_order=True)
         delete_sec_grp.assert_called_once_with(sec_grp_id)
 
+    def test_deallocate_vip_no_vrrp_port(self):
+        lb = dmh.generate_load_balancer_tree()
+        lb.vip.load_balancer = lb
+        # amphora 0 doesn't have a vrrp_port_id
+        lb.amphorae[0].vrrp_port_id = None
+        vip = lb.vip
+        sec_grp_id = 'lb-sec-grp1'
+        show_port = self.driver.network_proxy.get_port
+        show_port.return_value = Port(
+            device_owner=constants.OCTAVIA_OWNER)
+        delete_port = self.driver.network_proxy.delete_port
+        delete_sec_grp = self.driver.network_proxy.delete_security_group
+        list_security_groups = self.driver.network_proxy.find_security_group
+        list_security_groups.return_value = SecurityGroup(id=sec_grp_id)
+        self.driver.deallocate_vip(vip)
+        # not called for lb.amphorae[0]
+        calls = [mock.call(vip.port_id),
+                 mock.call(lb.amphorae[1].vrrp_port_id)]
+        delete_port.assert_has_calls(calls, any_order=True)
+        self.assertEqual(2, delete_port.call_count)
+        delete_sec_grp.assert_called_once_with(sec_grp_id)
+
     def test_deallocate_vip_no_port(self):
         lb = dmh.generate_load_balancer_tree()
         lb.vip.load_balancer = lb
         vip = lb.vip
         sec_grp_id = 'lb-sec-grp1'
         show_port = self.driver.network_proxy.get_port
-        port = Port(device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+        port = Port(device_owner=constants.OCTAVIA_OWNER)
         show_port.side_effect = [port, Exception]
         list_security_groups = self.driver.network_proxy.find_security_group
         list_security_groups.return_value = SecurityGroup(id=sec_grp_id)
@@ -142,7 +163,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         sec_grp_id = 'lb-sec-grp1'
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+            device_owner=constants.OCTAVIA_OWNER)
         delete_port = self.driver.network_proxy.delete_port
         delete_port.side_effect = os_exceptions.ResourceNotFound
         delete_sec_grp = self.driver.network_proxy.delete_security_group
@@ -161,7 +182,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         vip = lb.vip
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+            device_owner=constants.OCTAVIA_OWNER)
         delete_port = self.driver.network_proxy.delete_port
         delete_sec_grp = self.driver.network_proxy.delete_security_group
         list_security_groups = self.driver.network_proxy.find_security_group
@@ -176,7 +197,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         vip.load_balancer = lb
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+            device_owner=constants.OCTAVIA_OWNER)
         delete_port = self.driver.network_proxy.delete_port
         delete_port.side_effect = [None, None, TypeError]
         self.assertRaises(network_base.DeallocateVIPException,
@@ -192,7 +213,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         vip = lb.vip
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+            device_owner=constants.OCTAVIA_OWNER)
         delete_port = self.driver.network_proxy.delete_port
         list_ports = self.driver.network_proxy.ports
         find_security_group = self.driver.network_proxy.find_security_group
@@ -234,7 +255,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         vip.load_balancer = lb
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = Port(
-            device_owner=allowed_address_pairs.OCTAVIA_OWNER)
+            device_owner=constants.OCTAVIA_OWNER)
         update_port = self.driver.network_proxy.update_port
         update_port.side_effect = os_exceptions.ResourceNotFound
         self.driver.deallocate_vip(vip)
@@ -295,25 +316,6 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                           self.driver.plug_aap_port, lb, lb.vip,
                           lb.amphorae[0], subnet)
 
-    @mock.patch('octavia.network.drivers.neutron.allowed_address_pairs.'
-                'AllowedAddressPairsDriver.update_vip_sg')
-    @mock.patch('octavia.network.drivers.neutron.allowed_address_pairs.'
-                'AllowedAddressPairsDriver.get_subnet')
-    @mock.patch('octavia.network.drivers.neutron.allowed_address_pairs.'
-                'AllowedAddressPairsDriver.plug_aap_port')
-    def test_plug_vip(self, mock_plug_aap, mock_get_subnet,
-                      mock_update_vip_sg):
-        lb = dmh.generate_load_balancer_tree()
-        subnet = mock.MagicMock()
-        mock_get_subnet.return_value = subnet
-        mock_plug_aap.side_effect = lb.amphorae
-        amps = self.driver.plug_vip(lb, lb.vip)
-
-        mock_update_vip_sg.assert_called_with(lb, lb.vip)
-        mock_get_subnet.assert_called_with(lb.vip.subnet_id)
-        for amp in amps:
-            mock_plug_aap.assert_any_call(lb, lb.vip, amp, subnet)
-
     @mock.patch('octavia.common.utils.get_vip_security_group_name')
     def test_update_vip_sg(self, mock_get_sg_name):
         LB_ID = uuidutils.generate_uuid()
@@ -554,8 +556,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         show_port = self.driver.network_proxy.get_port
         show_port.return_value = bad_existing_port
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -575,7 +576,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'project_id': 'test-project',
             'fixed_ips': [{'subnet_id': t_constants.MOCK_SUBNET_ID}]
@@ -597,8 +598,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
     def test_allocate_vip_when_port_not_found(self, mock_check_ext,
                                               mock_get_port):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -617,7 +617,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'project_id': 'test-project',
             'fixed_ips': [{'subnet_id': t_constants.MOCK_SUBNET_ID}]
@@ -657,8 +657,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                 '_check_extension_enabled', return_value=True)
     def test_allocate_vip_when_no_port_provided(self, mock_check_ext):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -677,7 +676,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'project_id': 'test-project',
             'fixed_ips': [{'ip_address': t_constants.MOCK_IP_ADDRESS,
@@ -695,8 +694,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                 '_check_extension_enabled', return_value=True)
     def test_allocate_vip_when_no_port_fixed_ip(self, mock_check_ext):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -715,7 +713,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'project_id': 'test-project',
             'fixed_ips': [{'subnet_id': t_constants.MOCK_SUBNET_ID,
@@ -733,8 +731,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                 '_check_extension_enabled', return_value=True)
     def test_allocate_vip_when_no_port_no_fixed_ip(self, mock_check_ext):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -751,7 +748,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'project_id': 'test-project'}
         create_port.assert_called_once_with(**exp_create_port_call)
@@ -764,8 +761,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                 '_check_extension_enabled', return_value=False)
     def test_allocate_vip_when_no_port_provided_tenant(self, mock_check_ext):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -784,7 +780,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'tenant_id': 'test-project',
             'fixed_ips': [{'ip_address': t_constants.MOCK_IP_ADDRESS,
@@ -802,8 +798,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                 '_check_extension_enabled', return_value=False)
     def test_allocate_vip_with_additional_vips(self, mock_check_ext):
         port_create_dict = Port(**t_constants.MOCK_NEUTRON_PORT.to_dict())
-        port_create_dict['device_owner'] = (
-            allowed_address_pairs.OCTAVIA_OWNER)
+        port_create_dict['device_owner'] = constants.OCTAVIA_OWNER
         port_create_dict['device_id'] = 'lb-1'
         create_port = self.driver.network_proxy.create_port
         create_port.return_value = port_create_dict
@@ -827,7 +822,7 @@ class TestAllowedAddressPairsDriver(base.TestCase):
             'name': 'octavia-lb-1',
             'network_id': t_constants.MOCK_NETWORK_ID,
             'device_id': 'lb-1',
-            'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+            'device_owner': constants.OCTAVIA_OWNER,
             'admin_state_up': False,
             'tenant_id': 'test-project',
             'fixed_ips': [
@@ -1576,7 +1571,8 @@ class TestAllowedAddressPairsDriver(base.TestCase):
                                'project_id': t_constants.MOCK_PROJECT_ID,
                                'qos_policy_id': QOS_POLICY_ID,
                                'security_group_ids': [],
-                               'status': t_constants.MOCK_STATUS}
+                               'status': t_constants.MOCK_STATUS,
+                               'vnic_type': constants.VNIC_TYPE_NORMAL}
 
         self.driver.network_proxy.create_port.side_effect = [
             MOCK_NEUTRON_PORT, MOCK_NEUTRON_PORT, Exception('boom')]
@@ -1592,13 +1588,14 @@ class TestAllowedAddressPairsDriver(base.TestCase):
         self.driver.network_proxy.create_port.assert_called_once_with(
             **{
                 'network_id': NETWORK_ID, 'admin_state_up': ADMIN_STATE_UP,
-                'device_owner': allowed_address_pairs.OCTAVIA_OWNER,
+                'device_owner': constants.OCTAVIA_OWNER,
                 'allowed_address_pairs': [
                     {'ip_address': IP_ADDRESS2}, {'ip_address': IP_ADDRESS3}],
                 'fixed_ips': [{
                     'subnet_id': SUBNET1_ID, 'ip_address': IP_ADDRESS1}],
                 'name': FAKE_NAME, 'qos_policy_id': QOS_POLICY_ID,
-                'security_groups': [SECURITY_GROUP_ID]})
+                'security_groups': [SECURITY_GROUP_ID],
+                'binding_vnic_type': constants.VNIC_TYPE_NORMAL})
 
         # Test minimal successful path
         result = self.driver.create_port(NETWORK_ID)

octavia/tests/unit/network/drivers/neutron/test_utils.py

@@ -11,6 +11,7 @@
 #    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 octavia.common import constants
 from octavia.network.drivers.neutron import utils
 from octavia.tests.common import constants as t_constants
 from octavia.tests.unit import base
@@ -67,6 +68,7 @@ class TestNeutronUtils(base.TestCase):
             admin_state_up=t_constants.MOCK_ADMIN_STATE_UP,
             fixed_ips=[],
             security_group_ids=[],
+            vnic_type=constants.VNIC_TYPE_NORMAL,
         )
         self._compare_ignore_value_none(model_obj.to_dict(), assert_dict)
         fixed_ips = t_constants.MOCK_NEUTRON_PORT['fixed_ips']

octavia/tests/unit/network/drivers/noop_driver/test_driver.py

@@ -88,13 +88,6 @@ class TestNoopNetworkDriver(base.TestCase):
                          self.driver.driver.networkconfigconfig[
                              self.vip.ip_address])
 
-    def test_plug_vip(self):
-        self.driver.plug_vip(self.load_balancer, self.vip)
-        self.assertEqual((self.load_balancer, self.vip,
-                          'plug_vip'),
-                         self.driver.driver.networkconfigconfig[(
-                             self.load_balancer.id, self.vip.ip_address)])
-
     def test_update_vip_sg(self):
         self.driver.update_vip_sg(self.load_balancer, self.vip)
         self.assertEqual((self.load_balancer, self.vip,

{octavia-13.0.0.0rc1.data → octavia-14.0.0.data}/data/share/octavia/diskimage-create/README.rst

@@ -107,7 +107,7 @@ Command syntax:
             [-f]
             [-g **repository branch** | stable/train | stable/stein | ... ]
             [-h]
-            [-i **ubuntu-minimal** | fedora | centos-minimal | rhel ]
+            [-i **ubuntu-minimal** | fedora | centos-minimal | rhel | rocky ]
             [-k <kernel package name> ]
             [-l <log file> ]
             [-m]
@@ -274,6 +274,11 @@ OCTAVIA_REPO_PATH
     - Default: <directory above the script location>
     - Reference: https://github.com/openstack/octavia
 
+DIB_OCTAVIA_AMP_USE_NFTABLES
+    - Boolean that configures nftables inside the amphora image
+    - Required for SR-IOV enabled amphora
+    - Default: True
+
 Using distribution packages for amphora agent
 ---------------------------------------------
 By default, amphora agent is installed from Octavia Git repository.

{octavia-13.0.0.0rc1.data → octavia-14.0.0.data}/data/share/octavia/diskimage-create/diskimage-create.sh

@@ -28,7 +28,7 @@ usage() {
     echo "            [-f]"
     echo "            [-g **repository branch** | stable/train | stable/stein | ... ]"
     echo "            [-h]"
-    echo "            [-i **ubuntu-minimal** | fedora | centos-minimal | rhel ]"
+    echo "            [-i **ubuntu-minimal** | fedora | centos-minimal | rhel | rocky ]"
     echo "            [-k <kernel package name> ]"
     echo "            [-l <log file> ]"
     echo "            [-m]"
@@ -150,6 +150,7 @@ while getopts "a:b:c:d:efg:hi:k:l:mno:pt:r:s:vw:xy" opt; do
                 [ "$AMP_BASEOS" != "fedora" ] && \
                 [ "$AMP_BASEOS" != "centos" ] && \
                 [ "$AMP_BASEOS" != "centos-minimal" ] && \
+                [ "$AMP_BASEOS" != "rocky" ] && \
                 [ "$AMP_BASEOS" != "rhel" ]; then
                 echo "Error: Unsupported base OS $AMP_BASEOS specified"
                 exit 3
@@ -160,6 +161,9 @@ while getopts "a:b:c:d:efg:hi:k:l:mno:pt:r:s:vw:xy" opt; do
             if [ "$AMP_BASEOS" == "centos" ]; then
                 AMP_BASEOS="centos-minimal"
             fi
+            if [ "$AMP_BASEOS" == "rocky" ]; then
+                AMP_BASEOS="rocky-container"
+            fi
         ;;
         k)
             AMP_KERNEL=$OPTARG
@@ -245,6 +249,8 @@ elif [ "${AMP_BASEOS}" = "centos-minimal" ]; then
     export DIB_RELEASE=${AMP_DIB_RELEASE:-"9-stream"}
 elif [ "${AMP_BASEOS}" = "fedora" ]; then
     export DIB_RELEASE=${AMP_DIB_RELEASE:-"28"}
+elif [ "${AMP_BASEOS}" = "rocky-container" ]; then
+    export DIB_RELEASE=${AMP_DIB_RELEASE:-"9"}
 fi
 
 AMP_OUTPUTFILENAME=${AMP_OUTPUTFILENAME:-"$PWD/amphora-x64-haproxy.qcow2"}
@@ -304,7 +310,7 @@ else
 fi
 
 # Make sure we have a value set for DIB_OCTAVIA_AMP_USE_NFTABLES
-export DIB_OCTAVIA_AMP_USE_NFTABLES=${DIB_OCTAVIA_AMP_USE_NFTABLES:-False}
+export DIB_OCTAVIA_AMP_USE_NFTABLES=${DIB_OCTAVIA_AMP_USE_NFTABLES:-True}
 
 export CLOUD_INIT_DATASOURCES=${CLOUD_INIT_DATASOURCES:-"ConfigDrive"}
 
@@ -454,7 +460,7 @@ AMP_element_sequence="$AMP_element_sequence cloud-init-datasources"
 AMP_element_sequence="$AMP_element_sequence remove-default-ints"
 
 # SELinux systems
-if [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "fedora" ] || [ "${AMP_BASEOS}" = "rhel" ]; then
+if [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "fedora" ] || [ "${AMP_BASEOS}" = "rhel" ] || [ "${AMP_BASEOS}" = "rocky-container" ]; then
     if [ "$AMP_ENABLE_FULL_MAC_SECURITY" -ne 1 ]; then
         AMP_element_sequence="$AMP_element_sequence selinux-permissive"
     else
@@ -464,7 +470,7 @@ if [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "fedora" ] || [
 fi
 
 # Disable the dnf makecache timer
-if [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "fedora" ] || [ "${AMP_BASEOS}" = "rhel" ]; then
+if [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "fedora" ] || [ "${AMP_BASEOS}" = "rhel" ] || [ "${AMP_BASEOS}" = "rocky-container" ]; then
     AMP_element_sequence="$AMP_element_sequence disable-makecache"
 fi
 

{octavia-13.0.0.0rc1.data → octavia-14.0.0.data}/data/share/octavia/diskimage-create/requirements.txt

@@ -1,3 +1 @@
 diskimage-builder>=2.24.0
-PyYAML
-six>=1.9.0

{octavia-13.0.0.0rc1.data → octavia-14.0.0.data}/data/share/octavia/diskimage-create/tox.ini

@@ -1,36 +1,53 @@
 [tox]
-minversion = 1.8
+minversion = 3.18
 envlist = bashate,docs,build,test
-skipsdist = True
 
 [testenv]
 basepython = python3
 envdir = {toxworkdir}/venv
 setenv = VIRTUAL_ENV={envdir}
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY DIB_* CLOUD_INIT_DATASOURCES OCTAVIA_REPO_PATH
+passenv =
+    http_proxy
+    HTTP_PROXY
+    https_proxy
+    HTTPS_PROXY
+    no_proxy
+    NO_PROXY
+    DIB_*
+    CLOUD_INIT_DATASOURCES
+    OCTAVIA_REPO_PATH
 install_command = pip install -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-whitelist_externals =   virt-filesystems
-                        virt-inspector
-                        awk
-                        mkdir
-                        rm
+allowlist_externals =
+    virt-filesystems
+    virt-inspector
+    awk
+    mkdir
+    rm
 
 [testenv:docs]
 commands = doc8 README.rst ../elements/haproxy-octavia/README.rst ../elements/root-passwd/README.rst
 
 [testenv:bashate]
-commands = bashate diskimage-create.sh
-            bashate image-tests.sh
+commands =
+    bashate diskimage-create.sh
+    bashate image-tests.sh
 
 [testenv:build]
 # NOTE: specify cache directory explicitly with -c as the `diskimage-create.sh`
 # default is based off of `$HOME` which is not passed on in a `tox` environment.
-commands =  ./diskimage-create.sh -o {toxinidir}/amphora-x64-haproxy -w {toxworkdir} -c {toxworkdir}/.cache
+commands =
+    ./diskimage-create.sh -o {toxinidir}/amphora-x64-haproxy -w {toxworkdir} -c {toxworkdir}/.cache
+allowlist_externals =
+    ./diskimage-create.sh
+
 
 [testenv:test]
 # Work around tox limitations with command pipes
 # https://bitbucket.org/hpk42/tox/issue/73/pipe-output-of-command-into-file
-commands =  ./image-tests.sh {toxinidir}/.amp_tox_test
-            rm -rf {toxinidir}/.amp_tox_test
+commands =
+    ./image-tests.sh {toxinidir}/.amp_tox_test
+    rm -rf {toxinidir}/.amp_tox_test
+allowlist_externals =
+    ./image-tests.sh

{octavia-13.0.0.0rc1.dist-info → octavia-14.0.0.dist-info}/AUTHORS

@@ -105,6 +105,7 @@ Itzik Brown <itzikb@redhat.com>
 Jacky Hu <hudayou@hotmail.com>
 James Arendt <james.arendt@hp.com>
 James E. Blair <jeblair@redhat.com>
+James Page <james.page@canonical.com>
 James Page <james.page@ubuntu.com>
 Jamie Lennox <jamielennox@gmail.com>
 Jason Niesz <Jason.Niesz@walmart.com>
@@ -157,8 +158,10 @@ Mohammed Naser <mnaser@vexxhost.com>
 Monty Taylor <mordred@inaugust.com>
 Nakul Dahiwade <nakul.dahiwade@intel.com>
 Nam Nguyen Hoai <namnh@vn.fujitsu.com>
+Natzcheng <chenggang01@inspur.com>
 Ngo Quoc Cuong <cuongnq@vn.fujitsu.com>
 Nguyen Hai <nguyentrihai93@gmail.com>
+Nguyen Ngoc Hieu <hieunn23@fpt.com>
 Nguyen Van Trung <trungnv@vn.fujitsu.com>
 Nir Magnezi <nmagnezi@redhat.com>
 Noboru Iwamatsu <n_iwamatsu@jp.fujitsu.com>
@@ -198,6 +201,7 @@ Stephen Balukoff <stephen@balukoff.com>
 Stephen Finucane <stephenfin@redhat.com>
 Susanne Balle <sleipnir012@gmail.com>
 Sven Wegener <sven.wegener@inovex.de>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>
 Takashi Natsume <takanattie@gmail.com>
 Tatsuma Matsuki <matsuki.tatsuma@jp.fujitsu.com>
@@ -214,6 +218,7 @@ Tuan Do Anh <tuanda@vn.fujitsu.com>
 Vadim Ponomarev <velizarx@gmail.com>
 Valeria Perelman <perelman@il.ibm.com>
 Van Hung Pham <hungpv@vn.fujitsu.com>
+Vasyl Saienko <vsaienko@mirantis.com>
 Vieri <15050873171@163.com>
 Vlad Gusev <vlad.esten@gmail.com>
 Vu Cong Tuan <tuanvc@vn.fujitsu.com>

{octavia-13.0.0.0rc1.dist-info → octavia-14.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: octavia
-Version: 13.0.0.0rc1
+Version: 14.0.0
 Summary: OpenStack Octavia Scalable Load Balancer as a Service
 Home-page: https://docs.openstack.org/octavia/latest/
 Author: OpenStack
@@ -19,6 +19,7 @@ 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
 Requires-Dist: Flask (!=0.11,>=0.10)
 Requires-Dist: Jinja2 (>=2.10)
@@ -54,7 +55,6 @@ Requires-Dist: oslo.utils (>=4.7.0)
 Requires-Dist: pbr (>=3.1.1)
 Requires-Dist: pecan (>=1.3.2)
 Requires-Dist: psutil (>=5.7.1)
-Requires-Dist: pyOpenSSL (>=19.1.0)
 Requires-Dist: pyasn1 (!=0.2.3,>=0.1.8)
 Requires-Dist: pyasn1-modules (>=0.0.6)
 Requires-Dist: python-barbicanclient (>=4.5.2)
@@ -67,11 +67,11 @@ Requires-Dist: rfc3986 (>=1.2.0)
 Requires-Dist: setproctitle (>=1.1.10)
 Requires-Dist: simplejson (>=3.13.2)
 Requires-Dist: stevedore (>=1.20.0)
-Requires-Dist: taskflow (>=4.4.0)
+Requires-Dist: taskflow (>=5.5.0)
 Requires-Dist: tenacity (>=5.0.4)
 Requires-Dist: pyroute2 (>=0.5.14) ; (sys_platform!='win32')
 Provides-Extra: redis
-Requires-Dist: redis (>=2.10.0) ; extra == 'redis'
+Requires-Dist: redis (>=3.4.0) ; extra == 'redis'
 Provides-Extra: test
 Requires-Dist: WebTest (>=2.0.26) ; extra == 'test'
 Requires-Dist: bandit (!=1.6.0,>=1.1.0) ; extra == 'test'
@@ -79,8 +79,8 @@ Requires-Dist: bashate (>=0.5.1) ; extra == 'test'
 Requires-Dist: coverage (!=4.4,>=4.0) ; extra == 'test'
 Requires-Dist: doc8 (>=0.6.0) ; extra == 'test'
 Requires-Dist: fixtures (>=3.0.0) ; extra == 'test'
-Requires-Dist: flake8-import-order (==0.12) ; extra == 'test'
-Requires-Dist: hacking (>=3.0) ; extra == 'test'
+Requires-Dist: flake8-import-order (<0.19.0,>=0.18.0) ; extra == 'test'
+Requires-Dist: hacking (<6.2.0,>=6.1.0) ; extra == 'test'
 Requires-Dist: oslotest (>=3.2.0) ; extra == 'test'
 Requires-Dist: pylint (>=2.5.3) ; extra == 'test'
 Requires-Dist: python-subunit (>=1.0.0) ; extra == 'test'