diff --git a/octavia/common/data_models.py b/octavia/common/data_models.py index 8d79ec84fc..4a64d5e85d 100644 --- a/octavia/common/data_models.py +++ b/octavia/common/data_models.py @@ -192,4 +192,4 @@ class Amphora(BaseDataModel): self.load_balancer_id = load_balancer_id self.host_id = host_id self.status = status - self.load_balancer = load_balancer \ No newline at end of file + self.load_balancer = load_balancer diff --git a/octavia/db/migration/alembic_migrations/README.rst b/octavia/db/migration/alembic_migrations/README.rst index 7f2c4d8fbb..595830168f 100644 --- a/octavia/db/migration/alembic_migrations/README.rst +++ b/octavia/db/migration/alembic_migrations/README.rst @@ -1,6 +1,6 @@ The migrations in the alembic/versions contain the migrations. -Before runnign this migration ensure that the database ocatavia exists. +Before running this migration ensure that the database octavia exists. Currently the database connection string is in octavia/db/migration/alembic.ini but this should eventually be pulled out into an octavia configuration file. @@ -13,4 +13,4 @@ To migrate to the most current version run: $ alembic upgrade head To downgrade one migration run: -$ alembic downgrade -1 \ No newline at end of file +$ alembic downgrade -1 diff --git a/octavia/db/migration/alembic_migrations/env.py b/octavia/db/migration/alembic_migrations/env.py index e0846c9ba1..cddcb7764f 100644 --- a/octavia/db/migration/alembic_migrations/env.py +++ b/octavia/db/migration/alembic_migrations/env.py @@ -81,4 +81,4 @@ def run_migrations_online(): if context.is_offline_mode(): run_migrations_offline() else: - run_migrations_online() \ No newline at end of file + run_migrations_online() diff --git a/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py b/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py index d4c63a4709..45471eefed 100644 --- a/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py +++ b/octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py @@ -369,4 +369,4 @@ def downgrade(): op.drop_table(u'session_persistence_type') op.drop_table(u'algorithm') op.drop_table(u'protocol') - op.drop_table(u'health_monitor_type') \ No newline at end of file + op.drop_table(u'health_monitor_type') diff --git a/octavia/db/models.py b/octavia/db/models.py index 6d98ba4d1f..dbfa1de42e 100644 --- a/octavia/db/models.py +++ b/octavia/db/models.py @@ -324,4 +324,4 @@ class Amphora(base_models.BASE): status = sa.Column( sa.String(36), sa.ForeignKey("provisioning_status.name", - name="fk_container_provisioning_status_name")) \ No newline at end of file + name="fk_container_provisioning_status_name")) diff --git a/octavia/openstack/common/cache/cache.py b/octavia/openstack/common/cache/cache.py index 3f3f77f59e..4206a8edbc 100644 --- a/octavia/openstack/common/cache/cache.py +++ b/octavia/openstack/common/cache/cache.py @@ -71,7 +71,8 @@ def get_cache(url='memory://'): parameters = parse.parse_qsl(query) kwargs = {'options': dict(parameters)} - mgr = driver.DriverManager('octavia.openstack.common.cache.backends', backend, + mgr = driver.DriverManager('octavia.openstack.common.cache.backends', + backend, invoke_on_load=True, invoke_args=[parsed], invoke_kwds=kwargs) diff --git a/octavia/openstack/common/middleware/sizelimit.py b/octavia/openstack/common/middleware/sizelimit.py index c7741214f2..35ae6594d3 100644 --- a/octavia/openstack/common/middleware/sizelimit.py +++ b/octavia/openstack/common/middleware/sizelimit.py @@ -67,8 +67,9 @@ class LimitingReader(object): return result -@versionutils.deprecated(as_of=versionutils.deprecated.JUNO, - in_favor_of='octavia.middleware.RequestBodySizeLimiter') +@versionutils.deprecated( + as_of=versionutils.deprecated.JUNO, + in_favor_of='octavia.middleware.RequestBodySizeLimiter') class RequestBodySizeLimiter(base.Middleware): """Limit the size of incoming requests.""" diff --git a/octavia/tests/unit/db/base.py b/octavia/tests/unit/db/base.py index 4f67c87665..ca28cd8dd9 100644 --- a/octavia/tests/unit/db/base.py +++ b/octavia/tests/unit/db/base.py @@ -64,4 +64,4 @@ class OctaviaDBTestBase(test_base.DbTestCase): for name in name_list: with session.begin(): model = model_cls(name=name) - session.add(model) \ No newline at end of file + session.add(model)