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

octavia/api/v2/controllers/load_balancer.py

@@ -558,6 +558,13 @@ class LoadBalancersController(base.BaseController):
                     subnet_id=add_vip.subnet_id)
 
             if listeners or pools:
+                # expire_all is required here, it ensures that the loadbalancer
+                # will be re-fetched with its associated vip in _graph_create.
+                # without expire_all the vip attributes that have been updated
+                # just before this call may not be set correctly in the
+                # loadbalancer object.
+                lock_session.expire_all()
+
                 db_pools, db_lists = self._graph_create(
                     lock_session, db_lb, listeners, pools)
 

octavia/api/v2/controllers/member.py

@@ -31,6 +31,7 @@ from octavia.common import data_models
 from octavia.common import exceptions
 from octavia.common import validate
 from octavia.db import prepare as db_prepare
+from octavia.i18n import _
 
 
 LOG = logging.getLogger(__name__)
@@ -365,12 +366,21 @@ class MembersController(MemberController):
             # Find members that are brand new or updated
             new_members = []
             updated_members = []
+            updated_member_uniques = set()
             for m in members:
-                if (m.address, m.protocol_port) not in old_member_uniques:
+                key = (m.address, m.protocol_port)
+                if key not in old_member_uniques:
                     validate.ip_not_reserved(m.address)
                     new_members.append(m)
                 else:
-                    m.id = old_member_uniques[(m.address, m.protocol_port)]
+                    m.id = old_member_uniques[key]
+                    if key in updated_member_uniques:
+                        LOG.error("Member %s is updated multiple times in "
+                                  "the same batch request.", m.id)
+                        raise exceptions.ValidationException(
+                            detail=_("Member must be updated only once in the "
+                                     "same request."))
+                    updated_member_uniques.add(key)
                     updated_members.append(m)
 
             # Find members that are deleted

octavia/api/v2/types/amphora.py

@@ -47,7 +47,7 @@ class AmphoraResponse(BaseAmphoraType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        amphorae = super(AmphoraResponse, cls).from_data_model(
+        amphorae = super().from_data_model(
             data_model, children=children)
 
         return amphorae

octavia/api/v2/types/availability_zone_profile.py

@@ -31,8 +31,7 @@ class AvailabilityZoneProfileResponse(BaseAvailabilityZoneProfileType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        availability_zone_profile = super(
-            AvailabilityZoneProfileResponse, cls).from_data_model(
+        availability_zone_profile = super().from_data_model(
             data_model, children=children)
         return availability_zone_profile
 

octavia/api/v2/types/availability_zones.py

@@ -31,8 +31,7 @@ class AvailabilityZoneResponse(BaseAvailabilityZoneType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        availability_zone = super(
-            AvailabilityZoneResponse, cls).from_data_model(
+        availability_zone = super().from_data_model(
             data_model, children=children)
         return availability_zone
 

octavia/api/v2/types/flavor_profile.py

@@ -31,7 +31,7 @@ class FlavorProfileResponse(BaseFlavorProfileType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        flavorprofile = super(FlavorProfileResponse, cls).from_data_model(
+        flavorprofile = super().from_data_model(
             data_model, children=children)
         return flavorprofile
 

octavia/api/v2/types/flavors.py

@@ -32,7 +32,7 @@ class FlavorResponse(BaseFlavorType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        flavor = super(FlavorResponse, cls).from_data_model(
+        flavor = super().from_data_model(
             data_model, children=children)
         return flavor
 

octavia/api/v2/types/health_monitor.py

@@ -50,7 +50,7 @@ class HealthMonitorResponse(BaseHealthMonitorType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        healthmonitor = super(HealthMonitorResponse, cls).from_data_model(
+        healthmonitor = super().from_data_model(
             data_model, children=children)
 
         if cls._full_response():

octavia/api/v2/types/l7policy.py

@@ -48,7 +48,7 @@ class L7PolicyResponse(BaseL7PolicyType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        policy = super(L7PolicyResponse, cls).from_data_model(
+        policy = super().from_data_model(
             data_model, children=children)
 
         if cls._full_response():

octavia/api/v2/types/l7rule.py

@@ -41,7 +41,7 @@ class L7RuleResponse(BaseL7Type):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        rule = super(L7RuleResponse, cls).from_data_model(
+        rule = super().from_data_model(
             data_model, children=children)
         return rule
 

octavia/api/v2/types/listener.py

@@ -69,7 +69,7 @@ class ListenerResponse(BaseListenerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        listener = super(ListenerResponse, cls).from_data_model(
+        listener = super().from_data_model(
             data_model, children=children)
 
         listener.sni_container_refs = [
@@ -274,7 +274,7 @@ class ListenerStatusResponse(BaseListenerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        listener = super(ListenerStatusResponse, cls).from_data_model(
+        listener = super().from_data_model(
             data_model, children=children)
 
         pool_model = pool.PoolStatusResponse
@@ -297,7 +297,7 @@ class ListenerStatisticsResponse(BaseListenerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        result = super(ListenerStatisticsResponse, cls).from_data_model(
+        result = super().from_data_model(
             data_model, children=children)
         return result
 

octavia/api/v2/types/load_balancer.py

@@ -69,7 +69,7 @@ class LoadBalancerResponse(BaseLoadBalancerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        result = super(LoadBalancerResponse, cls).from_data_model(
+        result = super().from_data_model(
             data_model, children=children)
         if data_model.vip:
             result.vip_subnet_id = data_model.vip.subnet_id
@@ -169,7 +169,7 @@ class LoadBalancerStatusResponse(BaseLoadBalancerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        result = super(LoadBalancerStatusResponse, cls).from_data_model(
+        result = super().from_data_model(
             data_model, children=children)
         listener_model = listener.ListenerStatusResponse
         result.listeners = [
@@ -198,7 +198,7 @@ class LoadBalancerStatisticsResponse(BaseLoadBalancerType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        result = super(LoadBalancerStatisticsResponse, cls).from_data_model(
+        result = super().from_data_model(
             data_model, children=children)
         return result
 

octavia/api/v2/types/member.py

@@ -45,7 +45,7 @@ class MemberResponse(BaseMemberType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        member = super(MemberResponse, cls).from_data_model(
+        member = super().from_data_model(
             data_model, children=children)
         return member
 
@@ -142,7 +142,7 @@ class MemberStatusResponse(BaseMemberType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        member = super(MemberStatusResponse, cls).from_data_model(
+        member = super().from_data_model(
             data_model, children=children)
 
         if not member.name:

octavia/api/v2/types/pool.py

@@ -96,7 +96,7 @@ class PoolResponse(BasePoolType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        pool = super(PoolResponse, cls).from_data_model(
+        pool = super().from_data_model(
             data_model, children=children)
         if data_model.session_persistence:
             pool.session_persistence = (
@@ -240,7 +240,7 @@ class PoolStatusResponse(BasePoolType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        pool = super(PoolStatusResponse, cls).from_data_model(
+        pool = super().from_data_model(
             data_model, children=children)
 
         member_model = member.MemberStatusResponse

octavia/api/v2/types/quotas.py

@@ -56,7 +56,7 @@ class QuotaResponse(base.BaseType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        quotas = super(QuotaResponse, cls).from_data_model(
+        quotas = super().from_data_model(
             data_model, children=children)
         quotas.quota = QuotaBase.from_data_model(data_model)
         return quotas
@@ -83,7 +83,7 @@ class QuotaAllBase(base.BaseType):
 
     @classmethod
     def from_data_model(cls, data_model, children=False):
-        quotas = super(QuotaAllBase, cls).from_data_model(
+        quotas = super().from_data_model(
             data_model, children=children)
         # For backwards compatibility, remove in T
         quotas.load_balancer = quotas.loadbalancer

octavia/certificates/common/barbican.py

@@ -61,7 +61,7 @@ class BarbicanCert(cert.Cert):
         return None
 
 
-class BarbicanAuth(object, metaclass=abc.ABCMeta):
+class BarbicanAuth(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def get_barbican_client(self, project_id):
         """Creates a Barbican client object.

octavia/certificates/common/cert.py

@@ -16,7 +16,7 @@
 import abc
 
 
-class Cert(object, metaclass=abc.ABCMeta):
+class Cert(metaclass=abc.ABCMeta):
     """Base class to represent all certificates."""
 
     @abc.abstractmethod

octavia/certificates/generator/cert_gen.py

@@ -19,7 +19,7 @@ Certificate Generator API
 import abc
 
 
-class CertGenerator(object, metaclass=abc.ABCMeta):
+class CertGenerator(metaclass=abc.ABCMeta):
     """Base Cert Generator Interface
 
     A Certificate Generator is responsible for generating private keys,

octavia/certificates/generator/local.py

@@ -47,9 +47,9 @@ class LocalCertGenerator(cert_gen.CertGenerator):
             try:
                 with open(CONF.certificates.ca_certificate, 'rb') as fp:
                     fp.read()
-            except IOError as e:
+            except OSError as e:
                 raise exceptions.CertificateGenerationException(
-                    msg="Failed to load CA Certificate {0}."
+                    msg="Failed to load CA Certificate {}."
                         .format(CONF.certificates.ca_certificate)
                 ) from e
         if not ca_key:
@@ -57,9 +57,9 @@ class LocalCertGenerator(cert_gen.CertGenerator):
             try:
                 with open(CONF.certificates.ca_private_key, 'rb') as fp:
                     fp.read()
-            except IOError as e:
+            except OSError as e:
                 raise exceptions.CertificateGenerationException(
-                    msg="Failed to load CA Private Key {0}."
+                    msg="Failed to load CA Private Key {}."
                         .format(CONF.certificates.ca_private_key)
                 ) from e
         if not ca_key_pass:
@@ -96,7 +96,7 @@ class LocalCertGenerator(cert_gen.CertGenerator):
             algorithm = getattr(hashes, ca_digest.upper())()
         except AttributeError as e:
             raise crypto_exceptions.UnsupportedAlgorithm(
-                "Supplied digest method not found: %s" % ca_digest
+                f"Supplied digest method not found: {ca_digest}"
             ) from e
 
         if not ca_cert:

octavia/certificates/manager/cert_mgr.py

@@ -19,7 +19,7 @@ Certificate manager API
 import abc
 
 
-class CertManager(object, metaclass=abc.ABCMeta):
+class CertManager(metaclass=abc.ABCMeta):
     """Base Cert Manager Interface
 
     A Cert Manager is responsible for managing certificates for TLS.

octavia/certificates/manager/local.py

@@ -57,20 +57,20 @@ class LocalCertManager(cert_mgr.CertManager):
 
         LOG.info("Storing certificate data on the local filesystem.")
         try:
-            filename_certificate = "{0}.crt".format(filename_base)
+            filename_certificate = f"{filename_base}.crt"
             flags = os.O_WRONLY | os.O_CREAT
             mode = stat.S_IRUSR | stat.S_IWUSR  # mode 0600
             with os.fdopen(os.open(
                     filename_certificate, flags, mode), 'w') as cert_file:
                 cert_file.write(certificate)
 
-            filename_private_key = "{0}.key".format(filename_base)
+            filename_private_key = f"{filename_base}.key"
             with os.fdopen(os.open(
                     filename_private_key, flags, mode), 'w') as key_file:
                 key_file.write(private_key)
 
             if intermediates:
-                filename_intermediates = "{0}.int".format(filename_base)
+                filename_intermediates = f"{filename_base}.int"
                 if isinstance(intermediates, bytes):
                     intermediates = intermediates.decode('utf-8')
                 with os.fdopen(os.open(
@@ -78,14 +78,14 @@ class LocalCertManager(cert_mgr.CertManager):
                     int_file.write(intermediates)
 
             if private_key_passphrase:
-                filename_pkp = "{0}.pass".format(filename_base)
+                filename_pkp = f"{filename_base}.pass"
                 if isinstance(private_key_passphrase, bytes):
                     private_key_passphrase = private_key_passphrase.decode(
                         'utf-8')
                 with os.fdopen(os.open(
                         filename_pkp, flags, mode), 'w') as pass_file:
                     pass_file.write(private_key_passphrase)
-        except IOError as ioe:
+        except OSError as ioe:
             LOG.error("Failed to store certificate.")
             raise exceptions.CertificateStorageException(message=ioe.message)
 
@@ -106,10 +106,10 @@ class LocalCertManager(cert_mgr.CertManager):
 
         filename_base = os.path.join(CONF.certificates.storage_path, cert_ref)
 
-        filename_certificate = "{0}.crt".format(filename_base)
-        filename_private_key = "{0}.key".format(filename_base)
-        filename_intermediates = "{0}.int".format(filename_base)
-        filename_pkp = "{0}.pass".format(filename_base)
+        filename_certificate = f"{filename_base}.crt"
+        filename_private_key = f"{filename_base}.key"
+        filename_intermediates = f"{filename_base}.int"
+        filename_pkp = f"{filename_base}.pass"
 
         cert_data = {}
 
@@ -117,14 +117,14 @@ class LocalCertManager(cert_mgr.CertManager):
         try:
             with os.fdopen(os.open(filename_certificate, flags)) as cert_file:
                 cert_data['certificate'] = cert_file.read()
-        except IOError as e:
+        except OSError as e:
             LOG.error("Failed to read certificate for %s.", cert_ref)
             raise exceptions.CertificateStorageException(
                 msg="Certificate could not be read.") from e
         try:
             with os.fdopen(os.open(filename_private_key, flags)) as key_file:
                 cert_data['private_key'] = key_file.read()
-        except IOError as e:
+        except OSError as e:
             LOG.error("Failed to read private key for %s", cert_ref)
             raise exceptions.CertificateStorageException(
                 msg="Private Key could not be read.") from e
@@ -134,13 +134,13 @@ class LocalCertManager(cert_mgr.CertManager):
                 cert_data['intermediates'] = int_file.read()
             cert_data['intermediates'] = list(
                 cert_parser.get_intermediates_pems(cert_data['intermediates']))
-        except IOError:
+        except OSError:
             pass
 
         try:
             with os.fdopen(os.open(filename_pkp, flags)) as pass_file:
                 cert_data['private_key_passphrase'] = pass_file.read()
-        except IOError:
+        except OSError:
             pass
 
         return local_common.LocalCert(**cert_data)
@@ -159,17 +159,17 @@ class LocalCertManager(cert_mgr.CertManager):
 
         filename_base = os.path.join(CONF.certificates.storage_path, cert_ref)
 
-        filename_certificate = "{0}.crt".format(filename_base)
-        filename_private_key = "{0}.key".format(filename_base)
-        filename_intermediates = "{0}.int".format(filename_base)
-        filename_pkp = "{0}.pass".format(filename_base)
+        filename_certificate = f"{filename_base}.crt"
+        filename_private_key = f"{filename_base}.key"
+        filename_intermediates = f"{filename_base}.int"
+        filename_pkp = f"{filename_base}.pass"
 
         try:
             os.remove(filename_certificate)
             os.remove(filename_private_key)
             os.remove(filename_intermediates)
             os.remove(filename_pkp)
-        except IOError as ioe:
+        except OSError as ioe:
             LOG.error("Failed to delete certificate %s", cert_ref)
             raise exceptions.CertificateStorageException(message=ioe.message)
 
@@ -196,7 +196,7 @@ class LocalCertManager(cert_mgr.CertManager):
         filename_base = os.path.join(CONF.certificates.storage_path,
                                      secret_ref)
 
-        filename_secret = "{0}.crt".format(filename_base)
+        filename_secret = f"{filename_base}.crt"
 
         secret_data = None
 
@@ -204,7 +204,7 @@ class LocalCertManager(cert_mgr.CertManager):
         try:
             with os.fdopen(os.open(filename_secret, flags)) as secret_file:
                 secret_data = secret_file.read()
-        except IOError as e:
+        except OSError as e:
             LOG.error("Failed to read secret for %s.", secret_ref)
             raise exceptions.CertificateRetrievalException(
                 ref=secret_ref) from e

octavia/cmd/agent.py

@@ -75,14 +75,14 @@ def main():
         'certfile': CONF.amphora_agent.agent_server_cert,
         'ca_certs': CONF.amphora_agent.agent_server_ca,
         'cert_reqs': ssl.CERT_REQUIRED,
-        'ssl_version': getattr(ssl, "PROTOCOL_%s" % proto),
+        'ssl_version': getattr(ssl, f"PROTOCOL_{proto}"),
         'preload_app': True,
         'accesslog': '/var/log/amphora-agent.log',
         'errorlog': '/var/log/amphora-agent.log',
         'loglevel': 'debug',
         'syslog': True,
-        'syslog_facility': 'local{}'.format(
-            CONF.amphora_agent.administrative_log_facility),
+        'syslog_facility': (
+            f'local{CONF.amphora_agent.administrative_log_facility}'),
         'syslog_addr': 'unix://run/rsyslog/octavia/log#dgram',
 
     }

octavia/cmd/driver_agent.py

@@ -55,10 +55,9 @@ def _process_wrapper(exit_event, proc_name, function, agent_name=None):
     signal.signal(signal.SIGINT, signal.SIG_IGN)
     signal.signal(signal.SIGHUP, _mutate_config)
     if agent_name:
-        process_title = 'octavia-driver-agent - {} -- {}'.format(
-            proc_name, agent_name)
+        process_title = f'octavia-driver-agent - {proc_name} -- {agent_name}'
     else:
-        process_title = 'octavia-driver-agent - {}'.format(proc_name)
+        process_title = f'octavia-driver-agent - {proc_name}'
     setproctitle.setproctitle(process_title)
     while not exit_event.is_set():
         try:

octavia/cmd/health_checker.py

@@ -186,7 +186,7 @@ def sctp_health_check(ip_address, port, timeout=2):
 
     data = _sctp_build_init_packet(src_port, port, tag)
 
-    print("Sending INIT packet to {}:{}".format(ip_address, port))
+    print(f"Sending INIT packet to {ip_address}:{port}")
     s.send(data)
 
     start = time.time()
@@ -211,13 +211,13 @@ def sctp_health_check(ip_address, port, timeout=2):
             print("Received ABORT")
             ret = 1
         else:  # Others: unknown error
-            print("Received {} Type chunk".format(response_type))
+            print(f"Received {response_type} Type chunk")
             send_abort = True
             ret = 3
 
         break
     else:
-        print("Timeout after {} seconds.".format(timeout))
+        print(f"Timeout after {timeout} seconds.")
         # Timeout
         ret = 2
 
@@ -260,5 +260,5 @@ def main():
         ret = sctp_health_check(destination, port, timeout=default_timeout)
         sys.exit(ret)
     else:
-        print("Unsupported protocol '{}'".format(protocol))
+        print(f"Unsupported protocol '{protocol}'")
         sys.exit(1)

octavia/cmd/interface.py

@@ -34,7 +34,7 @@ def interfaces_find(interface_controller, name):
     if name in all_interfaces:
         return [all_interfaces[name]]
 
-    msg = "Could not find interface '{}'.".format(name)
+    msg = f"Could not find interface '{name}'."
     raise InterfaceException(msg=msg)
 
 
@@ -61,7 +61,7 @@ def interface_cmd(interface_name, action):
         action_fn = interface_controller.down
     else:
         raise InterfaceException(
-            msg="Unknown action '{}'".format(action))
+            msg=f"Unknown action '{action}'")
 
     interfaces = interfaces_find(interface_controller,
                                  interface_name)
@@ -76,11 +76,11 @@ def main():
         action = sys.argv[-2]
         interface_name = sys.argv[-1]
     except IndexError:
-        print("usage: {} [up|down] <interface>".format(sys.argv[0]))
+        print(f"usage: {sys.argv[0]} [up|down] <interface>")
         sys.exit(1)
 
     try:
         interface_cmd(interface_name, action)
     except Exception as e:
-        print("Error: {}".format(e))
+        print(f"Error: {e}")
         sys.exit(2)

octavia/cmd/prometheus_proxy.py

@@ -99,8 +99,8 @@ METRIC_MAP = {
         ("octavia_loadbalancer_current_frontend_ssl_key_rate ", None, None),
     "haproxy_process_max_frontend_ssl_key_rate ":
         ("octavia_loadbalancer_max_frontend_ssl_key_rate ", None, None),
-    "haproxy_process_frontent_ssl_reuse ":
-        ("octavia_loadbalancer_frontent_ssl_reuse ", None, None),
+    "haproxy_process_frontend_ssl_reuse ":
+        ("octavia_loadbalancer_frontend_ssl_reuse ", None, None),
     "haproxy_process_current_backend_ssl_key_rate ":
         ("octavia_loadbalancer_current_backend_ssl_key_rate ", None, None),
     "haproxy_process_max_backend_ssl_key_rate ":
@@ -123,8 +123,8 @@ METRIC_MAP = {
     # Listener metrics
     "haproxy_frontend_status ":
         ("octavia_listener_status ",
-         "# HELP octavia_listener_status Current status of the listener. "
-         "0=OFFLINE, 1=ONLINE, 2=DEGRADED.\n", None),
+         "# HELP octavia_listener_status Current status of the listener.\n",
+         None),
     "haproxy_frontend_status{":
         ("octavia_listener_status{", None, {"proxy=": "listener="}),
     "haproxy_frontend_current_sessions ":
@@ -263,8 +263,7 @@ METRIC_MAP = {
     # Pool Metrics
     "haproxy_backend_status ":
         ("octavia_pool_status ",
-         "# HELP octavia_pool_status Current status of the pool. 0=OFFLINE, "
-         "1=ONLINE.\n", None),
+         "# HELP octavia_pool_status Current status of the pool.\n", None),
     "haproxy_backend_status{":
         ("octavia_pool_status{", None, {"proxy=": "pool="}),
     "haproxy_backend_current_sessions ":
@@ -475,8 +474,7 @@ METRIC_MAP = {
     # Member Metrics
     "haproxy_server_status ":
         ("octavia_member_status ",
-         "# HELP octavia_member_status Current status of the member. "
-         "0=ERROR, 1=ONLINE, 2=OFFLINE, 3=DRAIN.\n", None),
+         "# HELP octavia_member_status Current status of the member.\n", None),
     "haproxy_server_status{":
         ("octavia_member_status{", None,
          {"proxy=": "pool=", "server=": "member="}),
@@ -682,14 +680,14 @@ METRIC_MAP = {
     "haproxy_server_http_responses_total{":
         ("octavia_member_http_responses_total{", None,
          {"proxy=": "pool=", "server=": "member="}),
-    "haproxy_server_server_idle_connections_current ":
+    "haproxy_server_idle_connections_current ":
         ("octavia_member_idle_connections_current ", None, None),
-    "haproxy_server_server_idle_connections_current{":
+    "haproxy_server_idle_connections_current{":
         ("octavia_member_idle_connections_current{", None,
          {"proxy=": "pool=", "server=": "member="}),
-    "haproxy_server_server_idle_connections_limit ":
+    "haproxy_server_idle_connections_limit ":
         ("octavia_member_idle_connections_limit ", None, None),
-    "haproxy_server_server_idle_connections_limit{":
+    "haproxy_server_idle_connections_limit{":
         ("octavia_member_idle_connections_limit{", None,
          {"proxy=": "pool=", "server=": "member="}),
 }
@@ -751,7 +749,7 @@ class PrometheusProxy(SimpleHTTPRequestHandler):
                             metrics_buffer += line.replace(match,
                                                            map_tuple[0])
                     elif PRINT_REJECTED:
-                        print("REJECTED: %s" % line)
+                        print(f"REJECTED: {line}")
         except Exception as e:
             print(str(e), flush=True)
             traceback.print_tb(e.__traceback__)

octavia/common/base_taskflow.py

@@ -75,7 +75,7 @@ class FilteredJob(Job):
         # filter out private information from details
         cls_name = type(self).__name__
         details = _details_filter(self.details)
-        return "%s: %s (priority=%s, uuid=%s, details=%s)" % (
+        return "{}: {} (priority={}, uuid={}, details={})".format(
             cls_name, self.name, self.priority,
             self.uuid, details)
 
@@ -90,7 +90,7 @@ class JobDetailsFilter(log.logging.Filter):
         return True
 
 
-class BaseTaskFlowEngine(object):
+class BaseTaskFlowEngine:
     """This is the task flow engine
 
     Use this engine to start/load flows in the
@@ -164,7 +164,7 @@ class RedisDynamicLoggingConductor(DynamicLoggingConductor):
         return listeners
 
 
-class TaskFlowServiceController(object):
+class TaskFlowServiceController:
 
     def __init__(self, driver):
         self.driver = driver