octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

octavia/db/migration/alembic_migrations/versions/bf171d0d91c3_amphora_add_cached_zone.py

@@ -29,5 +29,5 @@ down_revision = '4aeb9e23ad43'
 
 
 def upgrade():
-    op.add_column(u'amphora', sa.Column(u'cached_zone', sa.String(255),
-                                        nullable=True))
+    op.add_column('amphora', sa.Column('cached_zone', sa.String(255),
+                                       nullable=True))

octavia/db/migration/alembic_migrations/versions/c761c8a71579_add_availability_zone_table.py

@@ -32,12 +32,12 @@ down_revision = 'e37941b010db'
 
 def upgrade():
     azp_table = op.create_table(
-        u'availability_zone_profile',
-        sa.Column(u'id', sa.String(36), nullable=False),
-        sa.Column(u'name', sa.String(255), nullable=False),
-        sa.Column(u'provider_name', sa.String(255), nullable=False),
-        sa.Column(u'availability_zone_data', sa.String(4096), nullable=False),
-        sa.PrimaryKeyConstraint(u'id'))
+        'availability_zone_profile',
+        sa.Column('id', sa.String(36), nullable=False),
+        sa.Column('name', sa.String(255), nullable=False),
+        sa.Column('provider_name', sa.String(255), nullable=False),
+        sa.Column('availability_zone_data', sa.String(4096), nullable=False),
+        sa.PrimaryKeyConstraint('id'))
 
     op.bulk_insert(
         azp_table,
@@ -48,16 +48,16 @@ def upgrade():
     )
 
     az_table = op.create_table(
-        u'availability_zone',
-        sa.Column(u'name', sa.String(255), nullable=False),
-        sa.Column(u'description', sa.String(255), nullable=True),
-        sa.Column(u'enabled', sa.Boolean(), nullable=False),
-        sa.Column(u'availability_zone_profile_id', sa.String(36),
+        'availability_zone',
+        sa.Column('name', sa.String(255), nullable=False),
+        sa.Column('description', sa.String(255), nullable=True),
+        sa.Column('enabled', sa.Boolean(), nullable=False),
+        sa.Column('availability_zone_profile_id', sa.String(36),
                   nullable=False),
-        sa.ForeignKeyConstraint([u'availability_zone_profile_id'],
-                                [u'availability_zone_profile.id'],
-                                name=u'fk_az_az_profile_id'),
-        sa.PrimaryKeyConstraint(u'name'),)
+        sa.ForeignKeyConstraint(['availability_zone_profile_id'],
+                                ['availability_zone_profile.id'],
+                                name='fk_az_az_profile_id'),
+        sa.PrimaryKeyConstraint('name'),)
 
     op.bulk_insert(
         az_table,

octavia/db/migration/alembic_migrations/versions/d85ca7258d21_modernize_l7rule.py

@@ -33,39 +33,39 @@ down_revision = '034b2dc2f3e0'
 def upgrade():
     # Add timing data
     op.add_column(
-        u'l7rule',
-        sa.Column(u'created_at', sa.DateTime(), nullable=True)
+        'l7rule',
+        sa.Column('created_at', sa.DateTime(), nullable=True)
     )
     op.add_column(
-        u'l7rule',
-        sa.Column(u'updated_at', sa.DateTime(), nullable=True)
+        'l7rule',
+        sa.Column('updated_at', sa.DateTime(), nullable=True)
     )
 
     # Add project_id
     op.add_column(
-        u'l7rule',
-        sa.Column(u'project_id', sa.String(36), nullable=True)
+        'l7rule',
+        sa.Column('project_id', sa.String(36), nullable=True)
     )
 
     # Add enabled
     op.add_column(
-        u'l7rule',
-        sa.Column(u'enabled', sa.Boolean(),
+        'l7rule',
+        sa.Column('enabled', sa.Boolean(),
                   server_default=sa.sql.expression.true(),
                   nullable=False)
     )
 
     # Add new operating_status column, setting existing rows to ONLINE
     op.add_column(
-        u'l7rule',
-        sa.Column(u'operating_status', sa.String(16),
+        'l7rule',
+        sa.Column('operating_status', sa.String(16),
                   nullable=False, server_default=constants.ONLINE)
     )
     # Remove the default, as we don't actually want one
-    op.alter_column(u'l7rule', u'operating_status',
+    op.alter_column('l7rule', 'operating_status',
                     existing_type=sa.String(16), server_default=None)
     # Add the foreign key for operating_status_name
     op.create_foreign_key(
-        u'fk_l7rule_operating_status_name', u'l7rule',
-        u'operating_status', [u'operating_status'], [u'name']
+        'fk_l7rule_operating_status_name', 'l7rule',
+        'operating_status', ['operating_status'], ['name']
     )

octavia/db/migration/alembic_migrations/versions/da371b422669_allowed_cidr_for_listeners.py

@@ -29,12 +29,12 @@ down_revision = 'a5762a99609a'
 
 def upgrade():
     op.create_table(
-        u'listener_cidr',
-        sa.Column(u'listener_id', sa.String(36), nullable=False),
-        sa.Column(u'cidr', sa.String(64), nullable=False),
+        'listener_cidr',
+        sa.Column('listener_id', sa.String(36), nullable=False),
+        sa.Column('cidr', sa.String(64), nullable=False),
 
-        sa.ForeignKeyConstraint([u'listener_id'],
-                                [u'listener.id'],
-                                name=u'fk_listener_cidr_listener_id'),
-        sa.PrimaryKeyConstraint(u'listener_id', u'cidr')
+        sa.ForeignKeyConstraint(['listener_id'],
+                                ['listener.id'],
+                                name='fk_listener_cidr_listener_id'),
+        sa.PrimaryKeyConstraint('listener_id', 'cidr')
     )

octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py

@@ -43,7 +43,7 @@ def migrate_pools():
 
     j = pool_table.join(lb_table,
                         pool_table.c.load_balancer_id == lb_table.c.id)
-    stmt = sa.select([pool_table.c.id]).select_from(j).where(
+    stmt = sa.select(pool_table.c.id).select_from(j).where(
         lb_table.c.provider == 'ovn')
     result = conn.execute(stmt)
 
@@ -55,8 +55,8 @@ def migrate_pools():
 
 def upgrade():
     insert_table = sa.table(
-        u'algorithm',
-        sa.column(u'name', sa.String(255)),
+        'algorithm',
+        sa.column('name', sa.String(255)),
     )
     op.bulk_insert(
         insert_table,

octavia/db/migration/alembic_migrations/versions/e37941b010db_add_lb_flavor_constraint.py

@@ -32,11 +32,11 @@ down_revision = 'dcf88e59aae4'
 
 def upgrade():
     insert_table = sql.table(
-        u'flavor_profile',
-        sa.Column(u'id', sa.String(36), nullable=False),
-        sa.Column(u'name', sa.String(255), nullable=False),
-        sa.Column(u'provider_name', sa.String(255), nullable=False),
-        sa.Column(u'flavor_data', sa.String(4096), nullable=False),
+        'flavor_profile',
+        sa.Column('id', sa.String(36), nullable=False),
+        sa.Column('name', sa.String(255), nullable=False),
+        sa.Column('provider_name', sa.String(255), nullable=False),
+        sa.Column('flavor_data', sa.String(4096), nullable=False),
     )
 
     op.bulk_insert(
@@ -48,12 +48,12 @@ def upgrade():
     )
 
     insert_table = sql.table(
-        u'flavor',
-        sa.Column(u'id', sa.String(36), nullable=False),
-        sa.Column(u'name', sa.String(255), nullable=False),
-        sa.Column(u'description', sa.String(255), nullable=True),
-        sa.Column(u'enabled', sa.Boolean(), nullable=False),
-        sa.Column(u'flavor_profile_id', sa.String(36), nullable=False),
+        'flavor',
+        sa.Column('id', sa.String(36), nullable=False),
+        sa.Column('name', sa.String(255), nullable=False),
+        sa.Column('description', sa.String(255), nullable=True),
+        sa.Column('enabled', sa.Boolean(), nullable=False),
+        sa.Column('flavor_profile_id', sa.String(36), nullable=False),
     )
 
     op.bulk_insert(

octavia/db/migration/alembic_migrations/versions/e6672bda93bf_add_ping_and_tlshello_monitor_types.py

@@ -31,9 +31,9 @@ down_revision = '27e54d00c3cd'
 
 def upgrade():
     insert_table = sql.table(
-        u'health_monitor_type',
-        sql.column(u'name', sa.String),
-        sql.column(u'description', sa.String)
+        'health_monitor_type',
+        sql.column('name', sa.String),
+        sql.column('description', sa.String)
     )
 
     op.bulk_insert(

octavia/db/migration/alembic_migrations/versions/e6ee84f0abf3_add_proxy_v2_pool_protocol.py

@@ -30,9 +30,9 @@ down_revision = '2ab994dd3ec2'
 
 def upgrade():
     insert_table = sql.table(
-        u'protocol',
-        sql.column(u'name', sa.String),
-        sql.column(u'description', sa.String)
+        'protocol',
+        sql.column('name', sa.String),
+        sql.column('description', sa.String)
     )
 
     op.bulk_insert(

octavia/db/migration/alembic_migrations/versions/ebbcc72b4e5e_add_octavia_owned_vip_column_to_vip_.py

@@ -29,6 +29,6 @@ down_revision = '0f242cf02c74'
 
 def upgrade():
     op.add_column(
-        u'vip',
-        sa.Column(u'octavia_owned', sa.Boolean(), nullable=True)
+        'vip',
+        sa.Column('octavia_owned', sa.Boolean(), nullable=True)
     )

octavia/db/migration/alembic_migrations/versions/f21ae3f21adc_add_client_auth_option.py

@@ -34,14 +34,14 @@ down_revision = '2ad093f6353f'
 
 def upgrade():
     op.create_table(
-        u'client_authentication_mode',
-        sa.Column(u'name', sa.String(10), primary_key=True),
+        'client_authentication_mode',
+        sa.Column('name', sa.String(10), primary_key=True),
     )
 
     # Create temporary table for table data seeding
     insert_table = sa.table(
-        u'client_authentication_mode',
-        sa.column(u'name', sa.String),
+        'client_authentication_mode',
+        sa.column('name', sa.String),
     )
 
     op.bulk_insert(
@@ -54,8 +54,8 @@ def upgrade():
     )
 
     op.add_column(
-        u'listener',
-        sa.Column(u'client_authentication', sa.String(10),
+        'listener',
+        sa.Column('client_authentication', sa.String(10),
                   sa.ForeignKey('client_authentication_mode.name'),
                   server_default=constants.CLIENT_AUTH_NONE, nullable=False)
     )

octavia/db/migration/alembic_migrations/versions/fc5582da7d8a_create_amphora_build_rate_limit_tables.py

@@ -31,16 +31,16 @@ down_revision = '443fe6676637'
 
 def upgrade():
     op.create_table(
-        u'amphora_build_slots',
-        sa.Column(u'id', sa.Integer(), primary_key=True),
-        sa.Column(u'slots_used', sa.Integer(), default=0)
+        'amphora_build_slots',
+        sa.Column('id', sa.Integer(), primary_key=True),
+        sa.Column('slots_used', sa.Integer(), default=0)
     )
 
     # Create temporary table for table data seeding
     insert_table = sql.table(
-        u'amphora_build_slots',
-        sql.column(u'id', sa.Integer),
-        sql.column(u'slots_used', sa.Integer)
+        'amphora_build_slots',
+        sql.column('id', sa.Integer),
+        sql.column('slots_used', sa.Integer)
     )
 
     op.bulk_insert(
@@ -51,12 +51,12 @@ def upgrade():
     )
 
     op.create_table(
-        u'amphora_build_request',
-        sa.Column(u'amphora_id', sa.String(36), nullable=True,
+        'amphora_build_request',
+        sa.Column('amphora_id', sa.String(36), nullable=True,
                   primary_key=True),
-        sa.Column(u'priority', sa.Integer()),
-        sa.Column(u'created_time', sa.DateTime(timezone=True), nullable=False),
-        sa.Column(u'status', sa.String(16), default='WAITING', nullable=False)
+        sa.Column('priority', sa.Integer()),
+        sa.Column('created_time', sa.DateTime(timezone=True), nullable=False),
+        sa.Column('status', sa.String(16), default='WAITING', nullable=False)
     )
 
 

octavia/db/migration/alembic_migrations/versions/ffad172e98c1_add_certificate_revoke_list_option.py

@@ -31,6 +31,6 @@ down_revision = 'f21ae3f21adc'
 
 
 def upgrade():
-    op.add_column(u'listener',
-                  sa.Column(u'client_crl_container_id', sa.String(255),
+    op.add_column('listener',
+                  sa.Column('client_crl_container_id', sa.String(255),
                             nullable=True))

octavia/db/models.py

@@ -185,7 +185,7 @@ class ListenerStatistics(base_models.BASE):
             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/db/repositories.py

@@ -49,7 +49,7 @@ CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
-class BaseRepository(object):
+class BaseRepository:
     model_class = None
 
     def count(self, session, **filters):
@@ -209,7 +209,7 @@ class BaseRepository(object):
         return id_list
 
 
-class Repositories(object):
+class Repositories:
     def __init__(self):
         self.load_balancer = LoadBalancerRepository()
         self.vip = VipRepository()
@@ -1943,7 +1943,7 @@ class QuotasRepository(BaseRepository):
         session.flush()
 
 
-class _GetALLExceptDELETEDIdMixin(object):
+class _GetALLExceptDELETEDIdMixin:
 
     def get_all(self, session, pagination_helper=None,
                 query_options=None, **filters):

octavia/distributor/drivers/driver_base.py

@@ -20,7 +20,7 @@ import abc
 # a single amphora, or multiple amphora among other options.
 
 
-class DistributorDriver(object, metaclass=abc.ABCMeta):
+class DistributorDriver(metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def get_create_distributor_subflow(self):
         """Get a subflow to create a distributor

octavia/distributor/drivers/noop_driver/driver.py

@@ -38,7 +38,7 @@ class NoopProvidesRequiresTask(task.Task):
         return self.provides_dict.values()
 
 
-class NoopManager(object):
+class NoopManager:
     def __init__(self):
         super().__init__()
 

octavia/hacking/checks.py

@@ -37,10 +37,10 @@ _all_log_levels = {'critical', 'error', 'exception', 'info', 'warning'}
 _all_hints = {'_LC', '_LE', '_LI', '_', '_LW'}
 
 _log_translation_hint = re.compile(
-    r".*LOG\.(%(levels)s)\(\s*(%(hints)s)\(" % {
-        'levels': '|'.join(_all_log_levels),
-        'hints': '|'.join(_all_hints),
-    })
+    r".*LOG\.({levels})\(\s*({hints})\(".format(
+        levels='|'.join(_all_log_levels),
+        hints='|'.join(_all_hints),
+    ))
 
 assert_trueinst_re = re.compile(
     r"(.)*assertTrue\(isinstance\((\w|\.|\'|\"|\[|\])+, "

octavia/image/drivers/noop_driver/driver.py

@@ -19,7 +19,7 @@ from octavia.image import image_base as driver_base
 LOG = logging.getLogger(__name__)
 
 
-class NoopManager(object):
+class NoopManager:
     def __init__(self):
         super().__init__()
         self.imageconfig = {}

octavia/image/image_base.py

@@ -15,7 +15,7 @@
 import abc
 
 
-class ImageBase(object, metaclass=abc.ABCMeta):
+class ImageBase(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def get_image_id_by_tag(self, image_tag, image_owner=None):

octavia/network/base.py

@@ -86,7 +86,7 @@ class CreatePortException(NetworkException):
     pass
 
 
-class AbstractNetworkDriver(object, metaclass=abc.ABCMeta):
+class AbstractNetworkDriver(metaclass=abc.ABCMeta):
     """This class defines the methods for a fully functional network driver.
 
     Implementations of this interface can expect a rollback to occur if any of

octavia/network/drivers/neutron/allowed_address_pairs.py

@@ -475,7 +475,9 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         :param load_balancer: octavia.common.data_models.LoadBalancer instance
         :return: octavia.common.data_models.Vip,
                  list(octavia.common.data_models.AdditionalVip)
-        :raises: AllocateVIPException, PortNotFound, SubnetNotFound
+        :raises AllocateVIPException: generic error allocating the VIP
+        :raises PortNotFound: port was not found
+        :raises SubnetNotFound: subnet was not found
         """
         if load_balancer.vip.port_id:
             try:
@@ -500,7 +502,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
                     self.delete_port(load_balancer.vip.port_id)
                 else:
                     raise base.AllocateVIPException(
-                        'VIP port {0} is broken, but is owned by project {1} '
+                        'VIP port {} is broken, but is owned by project {} '
                         'so will not be recreated. Aborting VIP allocation.'
                         .format(port.id, port.project_id))
             except base.AllocateVIPException as e:
@@ -552,7 +554,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
             constants.NAME: 'octavia-lb-' + load_balancer.id,
             constants.NETWORK_ID: load_balancer.vip.network_id,
             constants.ADMIN_STATE_UP: False,
-            'device_id': 'lb-{0}'.format(load_balancer.id),
+            'device_id': f'lb-{load_balancer.id}',
             constants.DEVICE_OWNER: constants.OCTAVIA_OWNER,
             project_id_key: load_balancer.project_id}
 
@@ -615,8 +617,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         try:
             subnet = self.get_subnet(vip.subnet_id)
         except base.SubnetNotFound as e:
-            msg = ("Can't unplug vip because vip subnet {0} was not "
-                   "found").format(vip.subnet_id)
+            msg = (f"Can't unplug vip because vip subnet {vip.subnet_id} "
+                   f"was not found")
             LOG.exception(msg)
             raise base.PluggedVIPNotFound(msg) from e
         for amphora in filter(
@@ -637,8 +639,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         except Exception as e:
             message = _('Error plugging amphora (compute_id: {compute_id}) '
                         'into network {network_id}.').format(
-                            compute_id=compute_id,
-                            network_id=network_id)
+                compute_id=compute_id,
+                network_id=network_id)
             LOG.exception(message)
             raise base.PlugNetworkException(message) from e
 
@@ -647,8 +649,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
     def unplug_network(self, compute_id, network_id):
         interfaces = self.get_plugged_networks(compute_id)
         if not interfaces:
-            msg = ('Amphora with compute id {compute_id} does not have any '
-                   'plugged networks').format(compute_id=compute_id)
+            msg = (f'Amphora with compute id {compute_id} does not have any '
+                   f'plugged networks')
             raise base.NetworkNotFound(msg)
 
         unpluggers = self._get_interfaces_to_unplug(interfaces, network_id)

octavia/network/drivers/neutron/base.py

@@ -188,8 +188,8 @@ class BaseNeutronDriver(base.AbstractNetworkDriver):
         try:
             resource = getattr(
                 network, f"get_{resource_type}")(resource_id)
-            return getattr(utils, 'convert_%s_to_model' %
-                           resource_type)(resource)
+            return getattr(
+                utils, f'convert_{resource_type}_to_model')(resource)
         except os_exceptions.ResourceNotFound as e:
             message = _('{resource_type} not found '
                         '({resource_type} id: {resource_id}).').format(
@@ -215,7 +215,7 @@ class BaseNeutronDriver(base.AbstractNetworkDriver):
                 self.network_proxy, f"{resource_type}s")(**filters)
             conversion_function = getattr(
                 utils,
-                'convert_%s_to_model' % resource_type)
+                f'convert_{resource_type}_to_model')
             try:
                 # get first item to see if there is at least one resource
                 res_list = [conversion_function(next(resources))]

octavia/network/drivers/noop_driver/driver.py

@@ -31,7 +31,7 @@ _NOOP_MANAGER_VARS = {
 }
 
 
-class NoopManager(object):
+class NoopManager:
 
     def __init__(self):
         super().__init__()

octavia/policies/amphora.py

@@ -17,45 +17,39 @@ from octavia.common import constants
 
 rules = [
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_GET_ALL),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_GET_ALL}',
         constants.RULE_API_ADMIN,
         "List Amphorae",
         [{'method': 'GET', 'path': '/v2/octavia/amphorae'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_GET_ONE),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_GET_ONE}',
         constants.RULE_API_ADMIN,
         "Show Amphora details",
         [{'method': 'GET', 'path': '/v2/octavia/amphorae/{amphora_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_DELETE),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_DELETE}',
         constants.RULE_API_ADMIN,
         "Delete an Amphora",
         [{'method': 'DELETE', 'path': '/v2/octavia/amphorae/{amphora_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_PUT_CONFIG),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_PUT_CONFIG}',
         constants.RULE_API_ADMIN,
         "Update Amphora Agent Configuration",
         [{'method': 'PUT',
           'path': '/v2/octavia/amphorae/{amphora_id}/config'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_PUT_FAILOVER),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_PUT_FAILOVER}',
         constants.RULE_API_ADMIN,
         "Failover Amphora",
         [{'method': 'PUT',
           'path': '/v2/octavia/amphorae/{amphora_id}/failover'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AMPHORA,
-                                    action=constants.RBAC_GET_STATS),
+        f'{constants.RBAC_AMPHORA}{constants.RBAC_GET_STATS}',
         constants.RULE_API_ADMIN,
         "Show Amphora statistics",
         [{'method': 'GET', 'path': '/v2/octavia/amphorae/{amphora_id}/stats'}]

octavia/policies/availability_zone.py

@@ -18,38 +18,33 @@ from octavia.common import constants
 
 rules = [
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AVAILABILITY_ZONE,
-                                    action=constants.RBAC_GET_ALL),
+        f'{constants.RBAC_AVAILABILITY_ZONE}{constants.RBAC_GET_ALL}',
         constants.RULE_API_READ,
         "List Availability Zones",
         [{'method': 'GET', 'path': '/v2.0/lbaas/availabilityzones'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AVAILABILITY_ZONE,
-                                    action=constants.RBAC_POST),
+        f'{constants.RBAC_AVAILABILITY_ZONE}{constants.RBAC_POST}',
         constants.RULE_API_ADMIN,
         "Create an Availability Zone",
         [{'method': 'POST', 'path': '/v2.0/lbaas/availabilityzones'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AVAILABILITY_ZONE,
-                                    action=constants.RBAC_PUT),
+        f'{constants.RBAC_AVAILABILITY_ZONE}{constants.RBAC_PUT}',
         constants.RULE_API_ADMIN,
         "Update an Availability Zone",
         [{'method': 'PUT',
           'path': '/v2.0/lbaas/availabilityzones/{availability_zone_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AVAILABILITY_ZONE,
-                                    action=constants.RBAC_GET_ONE),
+        f'{constants.RBAC_AVAILABILITY_ZONE}{constants.RBAC_GET_ONE}',
         constants.RULE_API_READ,
         "Show Availability Zone details",
         [{'method': 'GET',
           'path': '/v2.0/lbaas/availabilityzones/{availability_zone_id}'}]
     ),
     policy.DocumentedRuleDefault(
-        '{rbac_obj}{action}'.format(rbac_obj=constants.RBAC_AVAILABILITY_ZONE,
-                                    action=constants.RBAC_DELETE),
+        f'{constants.RBAC_AVAILABILITY_ZONE}{constants.RBAC_DELETE}',
         constants.RULE_API_ADMIN,
         "Remove an Availability Zone",
         [{'method': 'DELETE',