commit cbcc8d78bb5a525a5c12ac92fdfa0210dc90a4aa
author Hanna Arhipova <harhipova@mirantis.com> Thu Oct 02 15:09:13 2025 +0000
committer Gerrit Code Review <gerrit@172.18.228.132> Thu Oct 02 15:09:13 2025 +0000
tree 9c2e4bc875117574b000768487d258d0366d73e5
parent f7a60ab580cabbb2a2cf9a0ec982609a8e04e3a7
parent 98275cdb41dcfe5035d0851b3b56e698be7bb75f

Merge "[bgpvpn] Extend delete scenarious" into mcp/epoxy

neutron_tempest_plugin/api/base.py

diff --git a/neutron_tempest_plugin/api/base.py b/neutron_tempest_plugin/api/base.py
index 7ea22e6..532fa43 100644
--- a/neutron_tempest_plugin/api/base.py
+++ b/neutron_tempest_plugin/api/base.py
@@ -546,8 +546,7 @@
         """
 
         if not cls.try_reserve_subnet_cidr(addr, **ipnetwork_kwargs):
-            raise ValueError('Subnet CIDR already reserved: {0!r}'.format(
-                addr))
+            LOG.info("Subnet CIDR already reserved: %r", addr)
 
     @classmethod
     def try_reserve_subnet_cidr(cls, addr, **ipnetwork_kwargs):

neutron_tempest_plugin/api/test_timestamp.py

diff --git a/neutron_tempest_plugin/api/test_timestamp.py b/neutron_tempest_plugin/api/test_timestamp.py
index c39c523..0cf28d5 100644
--- a/neutron_tempest_plugin/api/test_timestamp.py
+++ b/neutron_tempest_plugin/api/test_timestamp.py
@@ -15,7 +15,6 @@
 
 from neutron_lib import constants
 from tempest.common import utils
-from tempest import config as tempestconf
 from tempest.lib.common.utils import data_utils
 from tempest.lib import decorators
 
@@ -307,7 +306,7 @@
             security_group['id'], name=security_group['name'] + 'new')[
                 'security_group']
         # Workaround for PRODX-7986
-        if tempestconf.is_tungstenfabric_backend_enabled():
+        if CONF.service_available.contrail:
             updated_security_group = self.client.show_security_group(
                 security_group['id'])['security_group']