octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0__py3-none-any.whl

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

@@ -1,4 +1,3 @@
-
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
 #    a copy of the License at
@@ -41,29 +40,31 @@ def get_delete_load_balancer_flow(lb):
     return LB_FLOWS.get_delete_load_balancer_flow(lb)
 
 
-def get_listeners_on_lb(db_lb):
+def get_listeners_on_lb(db_lb, for_delete=False):
     """Get a list of the listeners on a load balancer.
 
     :param db_lb: A load balancer database model object.
+    :param for_delete: Skip errors on tls certs loading.
     :returns: A list of provider dict format listeners.
     """
     listener_dicts = []
     for listener in db_lb.listeners:
         prov_listener = provider_utils.db_listener_to_provider_listener(
-            listener)
+            listener, for_delete)
         listener_dicts.append(prov_listener.to_dict())
     return listener_dicts
 
 
-def get_pools_on_lb(db_lb):
+def get_pools_on_lb(db_lb, for_delete=False):
     """Get a list of the pools on a load balancer.
 
     :param db_lb: A load balancer database model object.
+    :param for_delete: Skip errors on tls certs loading.
     :returns: A list of provider dict format pools.
     """
     pool_dicts = []
     for pool in db_lb.pools:
-        prov_pool = provider_utils.db_pool_to_provider_pool(pool)
+        prov_pool = provider_utils.db_pool_to_provider_pool(pool, for_delete)
         pool_dicts.append(prov_pool.to_dict())
     return pool_dicts
 

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

@@ -21,7 +21,7 @@ from octavia.controller.worker.v2.tasks import database_tasks
 from octavia.controller.worker.v2.tasks import lifecycle_tasks
 
 
-class HealthMonitorFlows(object):
+class HealthMonitorFlows:
 
     def get_create_health_monitor_flow(self):
         """Create a flow to create a health monitor

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

@@ -21,7 +21,7 @@ from octavia.controller.worker.v2.tasks import database_tasks
 from octavia.controller.worker.v2.tasks import lifecycle_tasks
 
 
-class L7PolicyFlows(object):
+class L7PolicyFlows:
 
     def get_create_l7policy_flow(self):
         """Create a flow to create an L7 policy

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

@@ -21,7 +21,7 @@ from octavia.controller.worker.v2.tasks import database_tasks
 from octavia.controller.worker.v2.tasks import lifecycle_tasks
 
 
-class L7RuleFlows(object):
+class L7RuleFlows:
 
     def get_create_l7rule_flow(self):
         """Create a flow to create an L7 rule

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

@@ -23,7 +23,7 @@ from octavia.controller.worker.v2.tasks import lifecycle_tasks
 from octavia.controller.worker.v2.tasks import network_tasks
 
 
-class ListenerFlows(object):
+class ListenerFlows:
 
     def get_create_listener_flow(self, flavor_dict=None):
         """Create a flow to create a listener
@@ -161,7 +161,7 @@ class ListenerFlows(object):
 
         return update_listener_flow
 
-    def _get_firewall_rules_subflow(self, flavor_dict):
+    def _get_firewall_rules_subflow(self, flavor_dict, timeout_dict=None):
         """Creates a subflow that updates the firewall rules in the amphorae.
 
         :returns: The subflow for updating firewall rules in the amphorae.
@@ -174,6 +174,14 @@ class ListenerFlows(object):
             requires=constants.LOADBALANCER_ID,
             provides=constants.AMPHORAE))
 
+        fw_rules_subflow.add(
+            amphora_driver_tasks.AmphoraeGetConnectivityStatus(
+                name=constants.AMPHORAE_GET_CONNECTIVITY_STATUS,
+                requires=constants.AMPHORAE,
+                inject={constants.TIMEOUT_DICT: timeout_dict,
+                        constants.NEW_AMPHORA_ID: constants.NIL_UUID},
+                provides=constants.AMPHORAE_STATUS))
+
         fw_rules_subflow.add(network_tasks.GetAmphoraeNetworkConfigs(
             name=sf_name + '-' + constants.GET_AMP_NETWORK_CONFIG,
             requires=constants.LOADBALANCER_ID,
@@ -192,8 +200,10 @@ class ListenerFlows(object):
 
         amp_0_subflow.add(amphora_driver_tasks.SetAmphoraFirewallRules(
             name=sf_name + '-0-' + constants.SET_AMPHORA_FIREWALL_RULES,
-            requires=(constants.AMPHORAE, constants.AMPHORA_FIREWALL_RULES),
-            inject={constants.AMPHORA_INDEX: 0}))
+            requires=(constants.AMPHORAE, constants.AMPHORA_FIREWALL_RULES,
+                      constants.AMPHORAE_STATUS),
+            inject={constants.AMPHORA_INDEX: 0,
+                    constants.TIMEOUT_DICT: timeout_dict}))
 
         update_amps_subflow.add(amp_0_subflow)
 
@@ -212,8 +222,10 @@ class ListenerFlows(object):
             amp_1_subflow.add(amphora_driver_tasks.SetAmphoraFirewallRules(
                 name=sf_name + '-1-' + constants.SET_AMPHORA_FIREWALL_RULES,
                 requires=(constants.AMPHORAE,
-                          constants.AMPHORA_FIREWALL_RULES),
-                inject={constants.AMPHORA_INDEX: 1}))
+                          constants.AMPHORA_FIREWALL_RULES,
+                          constants.AMPHORAE_STATUS),
+                inject={constants.AMPHORA_INDEX: 1,
+                        constants.TIMEOUT_DICT: timeout_dict}))
 
             update_amps_subflow.add(amp_1_subflow)
 

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

@@ -37,7 +37,7 @@ CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
 
-class LoadBalancerFlows(object):
+class LoadBalancerFlows:
 
     def __init__(self):
         self.amp_flows = amphora_flows.AmphoraFlows()

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

@@ -23,7 +23,7 @@ from octavia.controller.worker.v2.tasks import lifecycle_tasks
 from octavia.controller.worker.v2.tasks import network_tasks
 
 
-class MemberFlows(object):
+class MemberFlows:
 
     def get_create_member_flow(self):
         """Create a flow to create a member
@@ -148,49 +148,42 @@ class MemberFlows(object):
         unordered_members_flow.add(
             lifecycle_tasks.MembersToErrorOnRevertTask(
                 inject={constants.MEMBERS: old_members},
-                name='{flow}-deleted'.format(
-                    flow=constants.MEMBER_TO_ERROR_ON_REVERT_FLOW)))
+                name=f'{constants.MEMBER_TO_ERROR_ON_REVERT_FLOW}-deleted'))
         for m in old_members:
             unordered_members_flow.add(database_tasks.DeleteMemberInDB(
                 inject={constants.MEMBER: m},
-                name='{flow}-{id}'.format(
-                    id=m[constants.MEMBER_ID],
-                    flow=constants.DELETE_MEMBER_INDB)))
+                name=f'{constants.DELETE_MEMBER_INDB}-'
+                     f'{m[constants.MEMBER_ID]}'))
             unordered_members_flow.add(database_tasks.DecrementMemberQuota(
                 requires=constants.PROJECT_ID,
-                name='{flow}-{id}'.format(
-                    id=m[constants.MEMBER_ID],
-                    flow=constants.DECREMENT_MEMBER_QUOTA_FLOW)))
+                name=f'{constants.DECREMENT_MEMBER_QUOTA_FLOW}-'
+                     f'{m[constants.MEMBER_ID]}'))
 
         # Create new members
         unordered_members_flow.add(
             lifecycle_tasks.MembersToErrorOnRevertTask(
                 inject={constants.MEMBERS: new_members},
-                name='{flow}-created'.format(
-                    flow=constants.MEMBER_TO_ERROR_ON_REVERT_FLOW)))
+                name=f'{constants.MEMBER_TO_ERROR_ON_REVERT_FLOW}-created'))
         for m in new_members:
             unordered_members_active_flow.add(
                 database_tasks.MarkMemberActiveInDB(
                     inject={constants.MEMBER: m},
-                    name='{flow}-{id}'.format(
-                        id=m[constants.MEMBER_ID],
-                        flow=constants.MARK_MEMBER_ACTIVE_INDB)))
+                    name=f'{constants.MARK_MEMBER_ACTIVE_INDB}-'
+                         f'{m[constants.MEMBER_ID]}'))
 
         # Update existing members
         unordered_members_flow.add(
             lifecycle_tasks.MembersToErrorOnRevertTask(
                 # updated_members is a list of (obj, dict), only pass `obj`
                 inject={constants.MEMBERS: [m[0] for m in updated_members]},
-                name='{flow}-updated'.format(
-                    flow=constants.MEMBER_TO_ERROR_ON_REVERT_FLOW)))
+                name=f'{constants.MEMBER_TO_ERROR_ON_REVERT_FLOW}-updated'))
         for m, um in updated_members:
             um.pop(constants.ID, None)
             unordered_members_active_flow.add(
                 database_tasks.MarkMemberActiveInDB(
                     inject={constants.MEMBER: m},
-                    name='{flow}-{id}'.format(
-                        id=m[constants.MEMBER_ID],
-                        flow=constants.MARK_MEMBER_ACTIVE_INDB)))
+                    name=f'{constants.MARK_MEMBER_ACTIVE_INDB}-'
+                         f'{m[constants.MEMBER_ID]}'))
 
         batch_update_members_flow.add(unordered_members_flow)
 

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

@@ -21,7 +21,7 @@ from octavia.controller.worker.v2.tasks import database_tasks
 from octavia.controller.worker.v2.tasks import lifecycle_tasks
 
 
-class PoolFlows(object):
+class PoolFlows:
 
     def get_create_pool_flow(self):
         """Create a flow to create a pool

octavia/controller/worker/v2/taskflow_jobboard_driver.py

@@ -15,6 +15,7 @@ import contextlib
 
 from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import strutils
 from taskflow.jobs import backends as job_backends
 from taskflow.persistence import backends as persistence_backends
 
@@ -22,7 +23,7 @@ LOG = log.getLogger(__name__)
 CONF = cfg.CONF
 
 
-class JobboardTaskFlowDriver(object, metaclass=abc.ABCMeta):
+class JobboardTaskFlowDriver(metaclass=abc.ABCMeta):
 
     @abc.abstractmethod
     def job_board(self, persistence):
@@ -33,7 +34,7 @@ class JobboardTaskFlowDriver(object, metaclass=abc.ABCMeta):
         """
 
 
-class MysqlPersistenceDriver(object):
+class MysqlPersistenceDriver:
 
     def __init__(self):
         self.persistence_conf = {
@@ -68,7 +69,7 @@ class ZookeeperTaskFlowDriver(JobboardTaskFlowDriver):
 
     def job_board(self, persistence):
         job_backends_hosts = ','.join(
-            ['%s:%s' % (host, CONF.task_flow.jobboard_backend_port)
+            [f'{host}:{CONF.task_flow.jobboard_backend_port}'
              for host in CONF.task_flow.jobboard_backend_hosts])
         jobboard_backend_conf = {
             'board': 'zookeeper',
@@ -113,6 +114,19 @@ class RedisTaskFlowDriver(JobboardTaskFlowDriver):
                 CONF.task_flow.jobboard_backend_password)
         jobboard_backend_conf.update(
             CONF.task_flow.jobboard_redis_backend_ssl_options)
+
+        sentinel_kwargs = CONF.task_flow.jobboard_redis_sentinel_ssl_options
+        if 'ssl' in sentinel_kwargs:
+            sentinel_kwargs['ssl'] = strutils.bool_from_string(
+                sentinel_kwargs['ssl'])
+        if CONF.task_flow.jobboard_redis_sentinel_username is not None:
+            sentinel_kwargs['username'] = (
+                CONF.task_flow.jobboard_redis_sentinel_username)
+        if CONF.task_flow.jobboard_redis_sentinel_password is not None:
+            sentinel_kwargs['password'] = (
+                CONF.task_flow.jobboard_redis_sentinel_password)
+        jobboard_backend_conf['sentinel_kwargs'] = sentinel_kwargs
+
         return job_backends.backend(
             CONF.task_flow.jobboard_backend_namespace,
             jobboard_backend_conf,

octavia/controller/worker/v2/tasks/compute_tasks.py

@@ -187,7 +187,7 @@ class CertComputeCreate(ComputeCreate):
 
         # load client certificate
         with open(CONF.controller_worker.client_ca,
-                  'r', encoding='utf-8') as client_ca:
+                  encoding='utf-8') as client_ca:
             ca = client_ca.read()
 
         key = utils.get_compatible_server_certs_key_passphrase()
@@ -342,8 +342,6 @@ class NovaServerGroupDelete(BaseComputeTask):
     def execute(self, server_group_id):
         if server_group_id is not None:
             self.compute.delete_server_group(server_group_id)
-        else:
-            return
 
 
 class AttachPort(BaseComputeTask):

octavia/controller/worker/v2/tasks/network_tasks.py

@@ -984,10 +984,9 @@ class CreateVIPBasePort(BaseNetworkTask):
             return
         try:
             port_name = constants.AMP_BASE_PORT_PREFIX + amphora_id
-            for port in result:
-                self.network_driver.delete_port(port.id)
-                LOG.info('Deleted port %s with ID %s for amphora %s due to a '
-                         'revert.', port_name, port.id, amphora_id)
+            self.network_driver.delete_port(result[constants.ID])
+            LOG.info('Deleted port %s with ID %s for amphora %s due to a '
+                     'revert.', port_name, result[constants.ID], amphora_id)
         except Exception as e:
             LOG.error('Failed to delete port %s. Resources may still be in '
                       'use for a port intended for amphora %s due to error '

octavia/db/base_models.py

@@ -12,6 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from wsme import types as wtypes
+
 from oslo_db.sqlalchemy import models
 from oslo_utils import strutils
 from oslo_utils import uuidutils
@@ -19,6 +21,8 @@ import sqlalchemy as sa
 from sqlalchemy.orm import collections
 from sqlalchemy.orm import declarative_base
 
+from octavia.common import constants
+
 
 class OctaviaBase(models.ModelBase):
 
@@ -112,12 +116,20 @@ class OctaviaBase(models.ModelBase):
 
     @staticmethod
     def apply_filter(query, model, filters):
+        # Convert boolean filters to proper type
+        for key in filters:
+            attr = getattr(model.__v2_wsme__, key, None)
+            if isinstance(attr, wtypes.wsattr) and attr.datatype == bool:
+                filters[key] = strutils.bool_from_string(filters[key])
+        # Special case for 'enabled', it's 'admin_state_up' in the WSME class
+        # definition and the attribute has already been renamed to 'enabled' by
+        # a previous pagination filter
+        if constants.ENABLED in filters:
+            filters[constants.ENABLED] = strutils.bool_from_string(
+                filters[constants.ENABLED])
+
         translated_filters = {}
         child_map = {}
-        # Convert enabled to proper type
-        if 'enabled' in filters:
-            filters['enabled'] = strutils.bool_from_string(
-                filters['enabled'])
         for attr, name_map in model.__v2_wsme__._child_map.items():
             for k, v in name_map.items():
                 if attr in filters and k in filters[attr]:
@@ -143,29 +155,29 @@ class OctaviaBase(models.ModelBase):
         return f"{self.__class__.__name__}({params})"
 
 
-class LookupTableMixin(object):
+class LookupTableMixin:
     """Mixin to add to classes that are lookup tables."""
     name = sa.Column(sa.String(255), primary_key=True, nullable=False)
     description = sa.Column(sa.String(255), nullable=True)
 
 
-class IdMixin(object):
+class IdMixin:
     """Id mixin, add to subclasses that have an id."""
     id = sa.Column(sa.String(36), primary_key=True,
                    default=uuidutils.generate_uuid)
 
 
-class ProjectMixin(object):
+class ProjectMixin:
     """Tenant mixin, add to subclasses that have a project."""
     project_id = sa.Column(sa.String(36))
 
 
-class NameMixin(object):
+class NameMixin:
     """Name mixin to add to classes which need a name."""
     name = sa.Column(sa.String(255), nullable=True)
 
 
-class TagMixin(object):
+class TagMixin:
     """Tags mixin to add to classes which need tags.
 
     The class must realize the specified db relationship as well.

octavia/db/migration/alembic_migrations/versions/034756a182a2_amphora_add_image_id.py

@@ -30,6 +30,6 @@ down_revision = '10d38216ad34'
 
 def upgrade():
     op.add_column(
-        u'amphora',
-        sa.Column(u'image_id', sa.String(36), nullable=True)
+        'amphora',
+        sa.Column('image_id', sa.String(36), nullable=True)
     )

octavia/db/migration/alembic_migrations/versions/034b2dc2f3e0_modernize_l7policy_fields.py

@@ -33,33 +33,33 @@ down_revision = 'fac584114642'
 def upgrade():
     # Add timing data
     op.add_column(
-        u'l7policy',
-        sa.Column(u'created_at', sa.DateTime(), nullable=True)
+        'l7policy',
+        sa.Column('created_at', sa.DateTime(), nullable=True)
     )
     op.add_column(
-        u'l7policy',
-        sa.Column(u'updated_at', sa.DateTime(), nullable=True)
+        'l7policy',
+        sa.Column('updated_at', sa.DateTime(), nullable=True)
     )
 
     # Add project_id
     op.add_column(
-        u'l7policy',
-        sa.Column(u'project_id', sa.String(36), nullable=True)
+        'l7policy',
+        sa.Column('project_id', sa.String(36), nullable=True)
     )
 
     # Add new operating_status column, setting existing rows to ONLINE
     op.add_column(
-        u'l7policy',
-        sa.Column(u'operating_status', sa.String(16),
+        'l7policy',
+        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'l7policy', u'operating_status',
+    op.alter_column('l7policy', 'operating_status',
                     existing_type=sa.String(16), server_default=None)
     # Add the foreign key for operating_status_name
     op.create_foreign_key(
-        u'fk_l7policy_operating_status_name', u'l7policy',
-        u'operating_status', [u'operating_status'], [u'name']
+        'fk_l7policy_operating_status_name', 'l7policy',
+        'operating_status', ['operating_status'], ['name']
     )
 
     op.drop_constraint('fk_health_monitor_provisioning_status_name',
@@ -83,59 +83,59 @@ def upgrade():
                        type_='foreignkey')
 
     # provisioning_status was mistakenly added as nullable, the fix is similar
-    op.alter_column(u'l7policy', u'provisioning_status', nullable=False,
+    op.alter_column('l7policy', 'provisioning_status', nullable=False,
                     existing_type=sa.String(16),
                     server_default=constants.ACTIVE)
-    op.alter_column(u'l7policy', u'provisioning_status',
+    op.alter_column('l7policy', 'provisioning_status',
                     existing_type=sa.String(16), server_default=None)
 
     # Fix the rest of these that were also mistakenly set as nullable in:
     # 9b5473976d6d_add_provisioning_status_to_objects.py
-    op.alter_column(u'health_monitor', u'provisioning_status', nullable=False,
+    op.alter_column('health_monitor', 'provisioning_status', nullable=False,
                     existing_type=sa.String(16),
                     server_default=constants.ACTIVE)
-    op.alter_column(u'health_monitor', u'provisioning_status',
+    op.alter_column('health_monitor', 'provisioning_status',
                     existing_type=sa.String(16), server_default=None)
 
-    op.alter_column(u'member', u'provisioning_status', nullable=False,
+    op.alter_column('member', 'provisioning_status', nullable=False,
                     existing_type=sa.String(16),
                     server_default=constants.ACTIVE)
-    op.alter_column(u'member', u'provisioning_status',
+    op.alter_column('member', 'provisioning_status',
                     existing_type=sa.String(16), server_default=None)
 
-    op.alter_column(u'pool', u'provisioning_status', nullable=False,
+    op.alter_column('pool', 'provisioning_status', nullable=False,
                     existing_type=sa.String(16),
                     server_default=constants.ACTIVE)
-    op.alter_column(u'pool', u'provisioning_status',
+    op.alter_column('pool', 'provisioning_status',
                     existing_type=sa.String(16), server_default=None)
 
-    op.alter_column(u'l7rule', u'provisioning_status', nullable=False,
+    op.alter_column('l7rule', 'provisioning_status', nullable=False,
                     existing_type=sa.String(16),
                     server_default=constants.ACTIVE)
-    op.alter_column(u'l7rule', u'provisioning_status',
+    op.alter_column('l7rule', 'provisioning_status',
                     existing_type=sa.String(16), server_default=None)
 
     op.create_foreign_key(
-        u'fk_health_monitor_provisioning_status_name', u'health_monitor',
-        u'provisioning_status', [u'provisioning_status'], [u'name']
+        'fk_health_monitor_provisioning_status_name', 'health_monitor',
+        'provisioning_status', ['provisioning_status'], ['name']
     )
 
     op.create_foreign_key(
-        u'fk_l7policy_provisioning_status_name', u'l7policy',
-        u'provisioning_status', [u'provisioning_status'], [u'name']
+        'fk_l7policy_provisioning_status_name', 'l7policy',
+        'provisioning_status', ['provisioning_status'], ['name']
     )
 
     op.create_foreign_key(
-        u'fk_l7rule_provisioning_status_name', u'l7rule',
-        u'provisioning_status', [u'provisioning_status'], [u'name']
+        'fk_l7rule_provisioning_status_name', 'l7rule',
+        'provisioning_status', ['provisioning_status'], ['name']
     )
 
     op.create_foreign_key(
-        u'fk_member_provisioning_status_name', u'member',
-        u'provisioning_status', [u'provisioning_status'], [u'name']
+        'fk_member_provisioning_status_name', 'member',
+        'provisioning_status', ['provisioning_status'], ['name']
     )
 
     op.create_foreign_key(
-        u'fk_pool_provisioning_status_name', u'pool',
-        u'provisioning_status', [u'provisioning_status'], [u'name']
+        'fk_pool_provisioning_status_name', 'pool',
+        'provisioning_status', ['provisioning_status'], ['name']
     )

octavia/db/migration/alembic_migrations/versions/0f242cf02c74_add_provider_column.py

@@ -30,8 +30,8 @@ down_revision = '0fd2c131923f'
 
 def upgrade():
     op.add_column(
-        u'load_balancer',
-        sa.Column(u'provider', sa.String(64), nullable=True)
+        'load_balancer',
+        sa.Column('provider', sa.String(64), nullable=True)
     )
     op.execute("UPDATE load_balancer set provider='amphora' where provider "
                "is null")

octavia/db/migration/alembic_migrations/versions/10d38216ad34_add_timestamps_to_amphora.py

@@ -30,10 +30,10 @@ down_revision = '0aee2b450512'
 
 def upgrade():
     op.add_column(
-        u'amphora',
-        sa.Column(u'created_at', sa.DateTime(), nullable=True)
+        'amphora',
+        sa.Column('created_at', sa.DateTime(), nullable=True)
     )
     op.add_column(
-        u'amphora',
-        sa.Column(u'updated_at', sa.DateTime(), nullable=True)
+        'amphora',
+        sa.Column('updated_at', sa.DateTime(), nullable=True)
     )

octavia/db/migration/alembic_migrations/versions/11e4bb2bb8ef_fix_ipv6_vip.py

@@ -27,4 +27,4 @@ down_revision = '211982b05afc'
 
 
 def upgrade():
-    op.alter_column(u'vip', u'ip_address', type_=sa.String(64))
+    op.alter_column('vip', 'ip_address', type_=sa.String(64))

octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py

@@ -29,15 +29,15 @@ down_revision = '4c094013699a'
 
 
 def upgrade():
-    op.alter_column(u'provisioning_status', u'name',
+    op.alter_column('provisioning_status', 'name',
                     existing_type=sa.String(255))
-    op.alter_column(u'operating_status', u'name',
+    op.alter_column('operating_status', 'name',
                     existing_type=sa.String(255))
-    op.alter_column(u'health_monitor_type', u'name',
+    op.alter_column('health_monitor_type', 'name',
                     existing_type=sa.String(255))
-    op.alter_column(u'protocol', u'name',
+    op.alter_column('protocol', 'name',
                     existing_type=sa.String(255))
-    op.alter_column(u'algorithm', u'name',
+    op.alter_column('algorithm', 'name',
                     existing_type=sa.String(255))
-    op.alter_column(u'session_persistence_type', u'name',
+    op.alter_column('session_persistence_type', 'name',
                     existing_type=sa.String(255))

octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py

@@ -29,10 +29,10 @@ down_revision = '3a1e1cdb7b27'
 
 
 def upgrade():
-    with op.batch_alter_table(u'vip') as batch_op:
-        batch_op.alter_column(u'subnet_id', new_column_name=u'network_id',
+    with op.batch_alter_table('vip') as batch_op:
+        batch_op.alter_column('subnet_id', new_column_name='network_id',
                               existing_type=sa.String(36))
-        batch_op.alter_column(u'net_port_id', new_column_name=u'port_id',
+        batch_op.alter_column('net_port_id', new_column_name='port_id',
                               existing_type=sa.String(36))
-        batch_op.drop_column(u'floating_ip_id')
-        batch_op.drop_column(u'floating_ip_network_id')
+        batch_op.drop_column('floating_ip_id')
+        batch_op.drop_column('floating_ip_network_id')

octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py

@@ -30,5 +30,5 @@ down_revision = '458c9ee2a011'
 
 
 def upgrade():
-    op.add_column(u'load_balancer', sa.Column(u'server_group_id',
-                                              sa.String(36), nullable=True))
+    op.add_column('load_balancer', sa.Column('server_group_id',
+                                             sa.String(36), nullable=True))

octavia/db/migration/alembic_migrations/versions/1afc932f1ca2_l7rule_support_client_cert.py

@@ -36,9 +36,9 @@ new_fields = ['SSL_CONN_HAS_CERT', 'SSL_VERIFY_RESULT', 'SSL_DN_FIELD']
 def upgrade():
 
     insert_table = sql.table(
-        u'l7rule_type',
-        sql.column(u'name', sa.String),
-        sql.column(u'description', sa.String)
+        'l7rule_type',
+        sql.column('name', sa.String),
+        sql.column('description', sa.String)
     )
     cows = [{'name': field} for field in new_fields]
     op.bulk_insert(insert_table, cows)