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

octavia/common/clients.py

@@ -31,7 +31,7 @@ NOVA_VERSION = '2.15'
 CINDER_VERSION = '3'
 
 
-class NovaAuth(object):
+class NovaAuth:
     nova_client = None
 
     @classmethod
@@ -70,7 +70,7 @@ class NovaAuth(object):
         return cls.nova_client
 
 
-class NeutronAuth(object):
+class NeutronAuth:
     neutron_client = None
 
     @classmethod
@@ -127,7 +127,7 @@ class NeutronAuth(object):
         return conn.network
 
 
-class GlanceAuth(object):
+class GlanceAuth:
     glance_client = None
 
     @classmethod
@@ -166,7 +166,7 @@ class GlanceAuth(object):
         return cls.glance_client
 
 
-class CinderAuth(object):
+class CinderAuth:
     cinder_client = None
 
     @classmethod

octavia/common/config.py

@@ -148,14 +148,6 @@ amphora_agent_opts = [
     cfg.StrOpt('agent_server_network_dir',
                help=_("The directory where new network interfaces "
                       "are located")),
-    cfg.StrOpt('agent_server_network_file',
-               help=_("The file where the network interfaces are located. "
-                      "Specifying this will override any value set for "
-                      "agent_server_network_dir."),
-               deprecated_for_removal=True,
-               deprecated_reason=_('New amphora interface management '
-                                   'does not support single interface file.'),
-               deprecated_since='Xena'),
     cfg.IntOpt('agent_request_read_timeout', default=180,
                help=_("The time in seconds to allow a request from the "
                       "controller to run before terminating the socket.")),
@@ -317,13 +309,6 @@ health_manager_opts = [
                default=10,
                mutable=True,
                help=_('Sleep time between sending heartbeats.')),
-
-    # Used for updating health
-    cfg.StrOpt('health_update_driver', default='health_db',
-               help=_('Driver for updating amphora health system.'),
-               deprecated_for_removal=True,
-               deprecated_reason=_('This driver interface was removed.'),
-               deprecated_since='Victoria'),
 ]
 
 oslo_messaging_opts = [
@@ -396,8 +381,14 @@ haproxy_amphora_opts = [
     cfg.StrOpt('haproxy_cmd', default='/usr/sbin/haproxy',
                help=_("The full path to haproxy")),
     cfg.IntOpt('respawn_count', default=2,
+               deprecated_for_removal=True,
+               deprecated_reason='upstart support has been removed and this '
+                                 'option is no longer used.',
                help=_("The respawn count for haproxy's upstart script")),
     cfg.IntOpt('respawn_interval', default=2,
+               deprecated_for_removal=True,
+               deprecated_reason='upstart support has been removed and this '
+                                 'option is no longer used.',
                help=_("The respawn interval for haproxy's upstart script")),
     cfg.FloatOpt('rest_request_conn_timeout', default=10,
                  help=_("The time in seconds to wait for a REST API "
@@ -422,11 +413,6 @@ haproxy_amphora_opts = [
                help=_("The client certificate to talk to the agent")),
     cfg.StrOpt('server_ca', default='/etc/octavia/certs/server_ca.pem',
                help=_("The ca which signed the server certificates")),
-    cfg.BoolOpt('use_upstart', default=True,
-                deprecated_for_removal=True,
-                deprecated_reason='This is now automatically discovered '
-                                  ' and configured.',
-                help=_("If False, use sysvinit.")),
     cfg.IntOpt('api_db_commit_retry_attempts', default=15,
                help=_('The number of times the database action will be '
                       'attempted.')),
@@ -507,9 +493,6 @@ controller_worker_opts = [
                default='distributor_noop_driver',
                help=_('Name of the distributor driver to use')),
     cfg.ListOpt('statistics_drivers', default=['stats_db'],
-                deprecated_name='stats_update_driver',
-                deprecated_group='health_manager',
-                deprecated_since='Victoria',
                 help=_('List of drivers for updating amphora statistics.')),
     cfg.StrOpt('loadbalancer_topology',
                default=constants.TOPOLOGY_SINGLE,
@@ -588,6 +571,10 @@ task_flow_opts = [
                     'job id and claims for it.'),
     cfg.StrOpt('jobboard_redis_sentinel', default=None,
                help='Sentinel name if it is used for Redis.'),
+    cfg.StrOpt('jobboard_redis_sentinel_username',
+               help='Redis Sentinel server user name'),
+    cfg.StrOpt('jobboard_redis_sentinel_password', secret=True,
+               help='Redis Sentinel server password'),
     cfg.DictOpt('jobboard_redis_backend_ssl_options',
                 help='Redis jobboard backend ssl configuration options.',
                 default={'ssl': False,
@@ -595,6 +582,13 @@ task_flow_opts = [
                          'ssl_certfile': None,
                          'ssl_ca_certs': None,
                          'ssl_cert_reqs': 'required'}),
+    cfg.DictOpt('jobboard_redis_sentinel_ssl_options',
+                help='Redis sentinel ssl configuration options.',
+                default={'ssl': False,
+                         'ssl_keyfile': None,
+                         'ssl_certfile': None,
+                         'ssl_ca_certs': None,
+                         'ssl_cert_reqs': 'required'}),
     cfg.DictOpt('jobboard_zookeeper_ssl_options',
                 help='Zookeeper jobboard backend ssl configuration options.',
                 default={'use_ssl': False,
@@ -967,7 +961,7 @@ def handle_neutron_deprecations():
 def init(args, **kwargs):
     register_cli_opts()
     cfg.CONF(args=args, project='octavia',
-             version='%%prog %s' % version.version_info.release_string(),
+             version=f'%prog {version.version_info.release_string()}',
              **kwargs)
     validate.check_default_tls_versions_min_conflict()
     setup_remote_debugger()

octavia/common/constants.py

@@ -694,9 +694,7 @@ MIN_QUOTA = QUOTA_UNLIMITED
 MAX_QUOTA = 2000000000
 
 HAPROXY_BASE_PEER_PORT = 1025
-KEEPALIVED_JINJA2_UPSTART = 'keepalived.upstart.j2'
 KEEPALIVED_JINJA2_SYSTEMD = 'keepalived.systemd.j2'
-KEEPALIVED_JINJA2_SYSVINIT = 'keepalived.sysvinit.j2'
 CHECK_SCRIPT_CONF = 'keepalived_check_script.conf.j2'
 KEEPALIVED_CHECK_SCRIPT = 'keepalived_lvs_check_script.sh.j2'
 
@@ -722,26 +720,17 @@ AMP_ACTION_RELOAD = 'reload'
 AMP_ACTION_RESTART = 'restart'
 GLANCE_IMAGE_ACTIVE = 'active'
 
-INIT_SYSTEMD = 'systemd'
-INIT_UPSTART = 'upstart'
-INIT_SYSVINIT = 'sysvinit'
-INIT_UNKOWN = 'unknown'
-VALID_INIT_SYSTEMS = (INIT_SYSTEMD, INIT_SYSVINIT, INIT_UPSTART)
 INIT_PATH = '/sbin/init'
 
 SYSTEMD_DIR = '/usr/lib/systemd/system'
-SYSVINIT_DIR = '/etc/init.d'
-UPSTART_DIR = '/etc/init'
 
 INIT_PROC_COMM_PATH = '/proc/1/comm'
 
+LOADBALANCER_SYSTEMD = 'haproxy-%s.service'
+
 KEEPALIVED_SYSTEMD = 'octavia-keepalived.service'
-KEEPALIVED_SYSVINIT = 'octavia-keepalived'
-KEEPALIVED_UPSTART = 'octavia-keepalived.conf'
 
-KEEPALIVED_SYSTEMD_PREFIX = 'octavia-keepalivedlvs-%s.service'
-KEEPALIVED_SYSVINIT_PREFIX = 'octavia-keepalivedlvs-%s'
-KEEPALIVED_UPSTART_PREFIX = 'octavia-keepalivedlvs-%s.conf'
+KEEPALIVEDLVS_SYSTEMD = 'octavia-keepalivedlvs-%s.service'
 
 # Authentication
 KEYSTONE = 'keystone'
@@ -773,24 +762,24 @@ RULE_API_READ_QUOTA = 'rule:load-balancer:read-quota'
 RULE_API_READ_QUOTA_GLOBAL = 'rule:load-balancer:read-quota-global'
 RULE_API_WRITE_QUOTA = 'rule:load-balancer:write-quota'
 
-RBAC_LOADBALANCER = '{}:loadbalancer:'.format(LOADBALANCER_API)
-RBAC_LISTENER = '{}:listener:'.format(LOADBALANCER_API)
-RBAC_POOL = '{}:pool:'.format(LOADBALANCER_API)
-RBAC_MEMBER = '{}:member:'.format(LOADBALANCER_API)
-RBAC_HEALTHMONITOR = '{}:healthmonitor:'.format(LOADBALANCER_API)
-RBAC_L7POLICY = '{}:l7policy:'.format(LOADBALANCER_API)
-RBAC_L7RULE = '{}:l7rule:'.format(LOADBALANCER_API)
-RBAC_QUOTA = '{}:quota:'.format(LOADBALANCER_API)
-RBAC_AMPHORA = '{}:amphora:'.format(LOADBALANCER_API)
-RBAC_PROVIDER = '{}:provider:'.format(LOADBALANCER_API)
-RBAC_PROVIDER_FLAVOR = '{}:provider-flavor:'.format(LOADBALANCER_API)
-RBAC_PROVIDER_AVAILABILITY_ZONE = '{}:provider-availability-zone:'.format(
-    LOADBALANCER_API)
-RBAC_FLAVOR = '{}:flavor:'.format(LOADBALANCER_API)
-RBAC_FLAVOR_PROFILE = '{}:flavor-profile:'.format(LOADBALANCER_API)
-RBAC_AVAILABILITY_ZONE = '{}:availability-zone:'.format(LOADBALANCER_API)
-RBAC_AVAILABILITY_ZONE_PROFILE = '{}:availability-zone-profile:'.format(
-    LOADBALANCER_API)
+RBAC_LOADBALANCER = f'{LOADBALANCER_API}:loadbalancer:'
+RBAC_LISTENER = f'{LOADBALANCER_API}:listener:'
+RBAC_POOL = f'{LOADBALANCER_API}:pool:'
+RBAC_MEMBER = f'{LOADBALANCER_API}:member:'
+RBAC_HEALTHMONITOR = f'{LOADBALANCER_API}:healthmonitor:'
+RBAC_L7POLICY = f'{LOADBALANCER_API}:l7policy:'
+RBAC_L7RULE = f'{LOADBALANCER_API}:l7rule:'
+RBAC_QUOTA = f'{LOADBALANCER_API}:quota:'
+RBAC_AMPHORA = f'{LOADBALANCER_API}:amphora:'
+RBAC_PROVIDER = f'{LOADBALANCER_API}:provider:'
+RBAC_PROVIDER_FLAVOR = f'{LOADBALANCER_API}:provider-flavor:'
+RBAC_PROVIDER_AVAILABILITY_ZONE = (f'{LOADBALANCER_API}:'
+                                   f'provider-availability-zone:')
+RBAC_FLAVOR = f'{LOADBALANCER_API}:flavor:'
+RBAC_FLAVOR_PROFILE = f'{LOADBALANCER_API}:flavor-profile:'
+RBAC_AVAILABILITY_ZONE = f'{LOADBALANCER_API}:availability-zone:'
+RBAC_AVAILABILITY_ZONE_PROFILE = (f'{LOADBALANCER_API}:'
+                                  f'availability-zone-profile:')
 
 RBAC_POST = 'post'
 RBAC_PUT = 'put'
@@ -821,6 +810,10 @@ AMPHORAV2 = 'amphorav2'
 # systemctl commands
 DISABLE = 'disable'
 ENABLE = 'enable'
+STOP = 'stop'
+START = 'start'
+RESTART = 'restart'
+RELOAD = 'reload'
 
 # systemd amphora netns service prefix
 AMP_NETNS_SVC_PREFIX = 'amphora-netns'
@@ -979,8 +972,8 @@ AMP_NET_DIR_TEMPLATE = '/etc/octavia/interfaces/'
 NFT_ADD = 'add'
 NFT_CMD = '/usr/sbin/nft'
 NFT_FAMILY = 'inet'
-NFT_VIP_RULES_FILE = '/var/lib/octavia/nftables-vip.rules'
-NFT_VIP_TABLE = 'amphora_vip'
+NFT_RULES_FILE = '/var/lib/octavia/nftables-vip.rules'
+NFT_TABLE = 'amphora_table'
+NFT_CHAIN = 'amphora_chain'
 NFT_VIP_CHAIN = 'amphora_vip_chain'
-NFT_SRIOV_PRIORITY = '-310'
 PROTOCOL = 'protocol'

octavia/common/data_models.py

@@ -26,7 +26,7 @@ from octavia.common import constants
 LOG = logging.getLogger(__name__)
 
 
-class BaseDataModel(object):
+class BaseDataModel:
     def _to_dict(self, value, calling_classes=None, recurse=False):
         calling_classes = calling_classes or []
         # We need to have json convertible data for storing it in
@@ -228,7 +228,7 @@ class ListenerStatistics(BaseDataModel):
             self.total_connections += other.total_connections
         else:
             raise TypeError(  # noqa: O342
-                "unsupported operand type(s) for +=: '{0}' and '{1}'".format(
+                "unsupported operand type(s) for +=: '{}' and '{}'".format(
                     type(self), type(other)))
 
         return self

octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py

@@ -60,7 +60,7 @@ CONF = cfg.CONF
 JINJA_ENV = None
 
 
-class JinjaTemplater(object):
+class JinjaTemplater:
 
     def __init__(self,
                  base_amp_path=None,
@@ -175,9 +175,9 @@ class JinjaTemplater(object):
             tls_certs,
             feature_compatibility)
         if not socket_path:
-            socket_path = '%s/%s.sock' % (self.base_amp_path,
-                                          listeners[0].load_balancer.id)
-        state_file_path = '%s/%s/servers-state' % (
+            socket_path = (f'{self.base_amp_path}/'
+                           f'{listeners[0].load_balancer.id}.sock')
+        state_file_path = '{}/{}/servers-state'.format(
             self.base_amp_path,
             listeners[0].load_balancer.id) if feature_compatibility.get(
             constants.SERVER_STATE_FILE) else ''
@@ -341,7 +341,7 @@ class JinjaTemplater(object):
         if listener.tls_certificate_id:
             ret_value['crt_list_filename'] = os.path.join(
                 CONF.haproxy_amphora.base_cert_dir,
-                loadbalancer.id, '{}.pem'.format(listener.id))
+                loadbalancer.id, f'{listener.id}.pem')
 
         if tls_certs is not None:
             if listener.client_ca_tls_certificate_id:

octavia/common/jinja/logging/logging_jinja_cfg.py

@@ -25,7 +25,7 @@ TEMPLATES_DIR = (os.path.dirname(os.path.realpath(__file__)) +
                  constants.LOGGING_TEMPLATES + '/')
 
 
-class LoggingJinjaTemplater(object):
+class LoggingJinjaTemplater:
 
     def __init__(self, logging_templates=None):
         self.logging_templates = logging_templates or TEMPLATES_DIR

octavia/common/jinja/lvs/jinja_cfg.py

@@ -47,7 +47,7 @@ KEEPALIVED_LVS_TEMPLATE = os.path.abspath(
 JINJA_ENV = None
 
 
-class LvsJinjaTemplater(object):
+class LvsJinjaTemplater:
 
     def __init__(self, base_amp_path=None, keepalivedlvs_template=None):
         """Keepalived LVS configuration generation

octavia/common/jinja/user_data_jinja_cfg.py

@@ -25,7 +25,7 @@ TEMPLATES_DIR = (os.path.dirname(os.path.realpath(__file__)) +
                  constants.TEMPLATES + '/')
 
 
-class UserDataJinjaCfg(object):
+class UserDataJinjaCfg:
 
     def __init__(self):
         template_loader = jinja2.FileSystemLoader(searchpath=os.path.dirname(

octavia/common/keystone.py

@@ -26,7 +26,7 @@ _NOAUTH_PATHS = ['/', '/load-balancer/', '/healthcheck',
                  '/load-balancer/healthcheck']
 
 
-class KeystoneSession(object):
+class KeystoneSession:
 
     def __init__(self, section=constants.SERVICE_AUTH):
         self._session = None

octavia/common/policy.py

@@ -137,9 +137,8 @@ class Policy(oslo_policy.Enforcer):
         try:
             result = self.enforce('context_is_admin', credentials, credentials)
         except oslo_policy.InvalidScope as e:
-            # This will happen if the token being used is not system scoped
-            # which is required for the admin roles when scope checking is
-            # enabled.
+            # This will happen if the token being used is system scoped
+            # when scope checking is enabled.
             LOG.warning(str(e))
             return False
         return result

octavia/common/stats.py

@@ -21,7 +21,7 @@ from octavia.db import repositories as repo
 LOG = logging.getLogger(__name__)
 
 
-class StatsMixin(object):
+class StatsMixin:
 
     def __init__(self):
         super().__init__()

octavia/common/tls_utils/cert_parser.py

@@ -193,6 +193,7 @@ def _read_pem_blocks(data):
     state = stSpam
     if isinstance(data, bytes):
         data = data.decode('utf-8')
+    certLines = []
     for certLine in data.replace('\r', '').split('\n'):
         if not certLine:
             continue
@@ -299,7 +300,7 @@ def get_cert_expiration(certificate_pem):
     try:
         cert = x509.load_pem_x509_certificate(certificate_pem,
                                               backends.default_backend())
-        return cert.not_valid_after
+        return cert.not_valid_after_utc
     except Exception as e:
         LOG.exception('Unreadable Certificate.')
         raise exceptions.UnreadableCert from e

octavia/common/utils.py

@@ -104,8 +104,8 @@ def ip_port_str(ip_address, port):
     """Return IP port as string representation depending on address family."""
     ip = ipaddress.ip_address(ip_address)
     if ip.version == 4:
-        return "{ip}:{port}".format(ip=ip, port=port)
-    return "[{ip}]:{port}".format(ip=ip, port=port)
+        return f"{ip}:{port}"
+    return f"[{ip}]:{port}"
 
 
 def netmask_to_prefix(netmask):
@@ -166,7 +166,7 @@ def expand_expected_codes(codes):
     return retval
 
 
-class exception_logger(object):
+class exception_logger:
     """Wrap a function and log raised exception
 
     :param logger: the logger to log the exception default is LOG.exception

octavia/common/validate.py

@@ -198,26 +198,22 @@ def validate_l7rule_ssl_types(l7rule):
         # key and value are not allowed
         if req_key:
             # log error or raise
-            msg = 'L7rule type {0} does not use the "key" field.'.format(
-                rule_type)
+            msg = f'L7rule type {rule_type} does not use the "key" field.'
         elif req_value.lower() != 'true':
-            msg = 'L7rule value {0} is not a boolean True string.'.format(
-                req_value)
+            msg = f'L7rule value {req_value} is not a boolean True string.'
         elif compare_type != constants.L7RULE_COMPARE_TYPE_EQUAL_TO:
-            msg = 'L7rule type {0} only supports the {1} compare type.'.format(
+            msg = 'L7rule type {} only supports the {} compare type.'.format(
                 rule_type, constants.L7RULE_COMPARE_TYPE_EQUAL_TO)
 
     if rule_type == constants.L7RULE_TYPE_SSL_VERIFY_RESULT:
         if req_key:
             # log or raise req_key not used
-            msg = 'L7rule type {0} does not use the "key" field.'.format(
-                rule_type)
+            msg = f'L7rule type {rule_type} does not use the "key" field.'
         elif not req_value.isdigit() or int(req_value) < 0:
             # log or raise req_value must be int
-            msg = 'L7rule type {0} needs a int value, which is >= 0'.format(
-                rule_type)
+            msg = f'L7rule type {rule_type} needs a int value, which is >= 0'
         elif compare_type != constants.L7RULE_COMPARE_TYPE_EQUAL_TO:
-            msg = 'L7rule type {0} only supports the {1} compare type.'.format(
+            msg = 'L7rule type {} only supports the {} compare type.'.format(
                 rule_type, constants.L7RULE_COMPARE_TYPE_EQUAL_TO)
 
     if rule_type == constants.L7RULE_TYPE_SSL_DN_FIELD:
@@ -227,9 +223,9 @@ def validate_l7rule_ssl_types(l7rule):
 
         if not req_key or not req_value:
             # log or raise key and value must be specified.
-            msg = 'L7rule type {0} needs to specify a key and a value.'.format(
-                rule_type)
-        # log or raise the key must be split by '-'
+            msg = (f'L7rule type {rule_type} needs to specify a '
+                   f'key and a value.')
+        # log or raise the key must be splited by '-'
         elif not dn_regex.match(req_key):
             msg = 'Invalid L7rule distinguished name field.'
 

octavia/compute/compute_base.py

@@ -15,7 +15,7 @@
 import abc
 
 
-class ComputeBase(object, metaclass=abc.ABCMeta):
+class ComputeBase(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def build(self, name="amphora_name", amphora_flavor=None,

octavia/compute/drivers/noop_driver/driver.py

@@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
 NoopServerGroup = namedtuple('ServerGroup', ['id'])
 
 
-class NoopManager(object):
+class NoopManager:
     def __init__(self):
         super().__init__()
         self.computeconfig = {}

octavia/compute/drivers/nova_driver.py

@@ -135,7 +135,7 @@ class VirtualMachineManager(compute_base.ComputeBase):
                 # device id = volume_id, device type and size unspecified,
                 # delete-on-terminate = true (volume will be deleted by Nova
                 # on instance termination)
-                block_device_mapping = {'vda': '%s:::true' % volume_id}
+                block_device_mapping = {'vda': f'{volume_id}:::true'}
             amphora = self.manager.create(
                 name=name, image=image_id, flavor=amphora_flavor,
                 block_device_mapping=block_device_mapping,

octavia/controller/healthmanager/health_manager.py

@@ -55,7 +55,7 @@ def update_stats_on_done(stats, fut):
         stats['failover_failed'] += 1
 
 
-class HealthManager(object):
+class HealthManager:
     def __init__(self, exit_event):
         self.cw = cw2.ControllerWorker()
         self.threads = CONF.health_manager.failover_threads

octavia/controller/housekeeping/house_keeping.py

@@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 
-class DatabaseCleanup(object):
+class DatabaseCleanup:
     def __init__(self):
         self.amp_repo = repo.AmphoraRepository()
         self.amp_health_repo = repo.AmphoraHealthRepository()
@@ -76,7 +76,7 @@ class DatabaseCleanup(object):
                 LOG.info('Deleted load balancer id : %s', lb_id)
 
 
-class CertRotation(object):
+class CertRotation:
     def __init__(self):
         self.threads = CONF.house_keeping.cert_rotate_threads
         self.cw = cw2.ControllerWorker()

octavia/controller/queue/v2/consumer.py

@@ -53,8 +53,7 @@ class ConsumerService(cotyledon.Service):
         if CONF.task_flow.jobboard_enabled:
             for e in self.endpoints:
                 e.worker.services_controller.run_conductor(
-                    'octavia-task-flow-conductor-%s' %
-                    uuidutils.generate_uuid())
+                    f'octavia-task-flow-conductor-{uuidutils.generate_uuid()}')
 
     def terminate(self):
         if self.message_listener:

octavia/controller/queue/v2/endpoints.py

@@ -24,7 +24,7 @@ CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
-class Endpoints(object):
+class Endpoints:
 
     # API version history:
     #   1.0 - Initial version.

octavia/controller/worker/amphora_rate_limit.py

@@ -28,7 +28,7 @@ CONF = cfg.CONF
 CONF.import_group('haproxy_amphora', 'octavia.common.config')
 
 
-class AmphoraBuildRateLimit(object):
+class AmphoraBuildRateLimit:
 
     def __init__(self):
         self.amp_build_slots_repo = repo.AmphoraBuildSlotsRepository()
@@ -48,7 +48,7 @@ class AmphoraBuildRateLimit(object):
     def has_build_slot(self):
         build_rate_limit = CONF.haproxy_amphora.build_rate_limit
         session = db_apis.get_session()
-        with session.begin(subtransactions=True):
+        with session.begin():
             used_build_slots = (self.amp_build_slots_repo
                                 .get_used_build_slots_count(session))
             available_build_slots = build_rate_limit - used_build_slots
@@ -57,7 +57,7 @@ class AmphoraBuildRateLimit(object):
 
     def has_highest_priority(self, amphora_id):
         session = db_apis.get_session()
-        with session.begin(subtransactions=True):
+        with session.begin():
             highest_priority_build_req = (
                 self.amp_build_req_repo.get_highest_priority_build_req(
                     session))
@@ -67,13 +67,13 @@ class AmphoraBuildRateLimit(object):
 
     def update_build_status_and_available_build_slots(self, amphora_id):
         session = db_apis.get_session()
-        with session.begin(subtransactions=True):
+        with session.begin():
             self.amp_build_slots_repo.update_count(session, action='increment')
             self.amp_build_req_repo.update_req_status(session, amphora_id)
 
     def remove_from_build_req_queue(self, amphora_id):
         session = db_apis.get_session()
-        with session.begin(subtransactions=True):
+        with session.begin():
             self.amp_build_req_repo.delete(session, amphora_id=amphora_id)
             self.amp_build_slots_repo.update_count(session, action='decrement')
             LOG.debug("Removed request for %s from queue"
@@ -81,7 +81,7 @@ class AmphoraBuildRateLimit(object):
 
     def remove_all_from_build_req_queue(self):
         session = db_apis.get_session()
-        with session.begin(subtransactions=True):
+        with session.begin():
             self.amp_build_req_repo.delete_all(session)
             self.amp_build_slots_repo.update_count(session, action='reset')
             LOG.debug("Removed all the build requests and "

octavia/controller/worker/task_utils.py

@@ -27,7 +27,7 @@ CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
-class TaskUtils(object):
+class TaskUtils:
     """Class of helper/utility methods used by tasks."""
 
     status_update_retry = tenacity.retry(

octavia/controller/worker/v2/controller_worker.py

@@ -55,7 +55,7 @@ def _is_provisioning_status_pending_update(lb_obj):
     return not lb_obj.provisioning_status == constants.PENDING_UPDATE
 
 
-class ControllerWorker(object):
+class ControllerWorker:
 
     def __init__(self):
 
@@ -431,8 +431,8 @@ class ControllerWorker(object):
                  constants.SERVER_GROUP_ID: db_lb.server_group_id,
                  constants.PROJECT_ID: db_lb.project_id}
         if cascade:
-            listeners = flow_utils.get_listeners_on_lb(db_lb)
-            pools = flow_utils.get_pools_on_lb(db_lb)
+            listeners = flow_utils.get_listeners_on_lb(db_lb, True)
+            pools = flow_utils.get_pools_on_lb(db_lb, True)
 
             self.run_flow(
                 flow_utils.get_cascade_delete_load_balancer_flow,

octavia/controller/worker/v2/flows/amphora_flows.py

@@ -34,7 +34,7 @@ CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
-class AmphoraFlows(object):
+class AmphoraFlows:
 
     def get_create_amphora_flow(self):
         """Creates a flow to create an amphora.
@@ -404,7 +404,7 @@ class AmphoraFlows(object):
     def get_amphora_for_lb_failover_subflow(
             self, prefix, role=constants.ROLE_STANDALONE,
             failed_amp_vrrp_port_id=None, is_vrrp_ipv6=False,
-            flavor_dict=None):
+            flavor_dict=None, timeout_dict=None):
         """Creates a new amphora that will be used in a failover flow.
 
         :requires: loadbalancer_id, flavor, vip, vip_sg_id, loadbalancer
@@ -488,13 +488,24 @@ class AmphoraFlows(object):
                 rebind={constants.AMPHORAE: constants.NEW_AMPHORAE},
                 provides=constants.AMPHORA_FIREWALL_RULES,
                 inject={constants.AMPHORA_INDEX: 0}))
+            amp_for_failover_flow.add(
+                amphora_driver_tasks.AmphoraeGetConnectivityStatus(
+                    name=(prefix + '-' +
+                          constants.AMPHORAE_GET_CONNECTIVITY_STATUS),
+                    requires=constants.AMPHORAE,
+                    rebind={constants.AMPHORAE: constants.NEW_AMPHORAE},
+                    inject={constants.TIMEOUT_DICT: timeout_dict,
+                            constants.NEW_AMPHORA_ID: constants.NIL_UUID},
+                    provides=constants.AMPHORAE_STATUS))
             amp_for_failover_flow.add(
                 amphora_driver_tasks.SetAmphoraFirewallRules(
                     name=prefix + '-' + constants.SET_AMPHORA_FIREWALL_RULES,
                     requires=(constants.AMPHORAE,
-                              constants.AMPHORA_FIREWALL_RULES),
+                              constants.AMPHORA_FIREWALL_RULES,
+                              constants.AMPHORAE_STATUS),
                     rebind={constants.AMPHORAE: constants.NEW_AMPHORAE},
-                    inject={constants.AMPHORA_INDEX: 0}))
+                    inject={constants.AMPHORA_INDEX: 0,
+                            constants.TIMEOUT_DICT: timeout_dict}))
 
         # Plug member ports
         amp_for_failover_flow.add(network_tasks.CalculateAmphoraDelta(