From 9777f1154e15207e9f369d1bea4d5dbe11241f7b Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Thu, 2 May 2019 12:22:45 -0600 Subject: [PATCH] Drop requirement on octavia-lib octavia-lib is only required to get a constant which actually should be in the octavia-tempest-plugin codebase like other protocols are. Change-Id: I269da85a9a7adabce340aa436d9457b12dee6e36 --- octavia_tempest_plugin/common/constants.py | 1 + .../tests/barbican_scenario/v2/test_tls_barbican.py | 4 +--- requirements.txt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/octavia_tempest_plugin/common/constants.py b/octavia_tempest_plugin/common/constants.py index 0122424e..5503b7fc 100644 --- a/octavia_tempest_plugin/common/constants.py +++ b/octavia_tempest_plugin/common/constants.py @@ -101,6 +101,7 @@ ACTIVE_STANDBY = 'ACTIVE_STANDBY' HTTP = 'HTTP' HTTPS = 'HTTPS' TCP = 'TCP' +TERMINATED_HTTPS = 'TERMINATED_HTTPS' # HTTP Methods GET = 'GET' diff --git a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py index 27663b22..25f741a3 100644 --- a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py +++ b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py @@ -25,8 +25,6 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from octavia_lib.common import constants as lib_consts - from octavia_tempest_plugin.common import barbican_client_mgr from octavia_tempest_plugin.common import cert_utils from octavia_tempest_plugin.common import constants as const @@ -222,7 +220,7 @@ class TLSWithBarbicanTest(test_base.LoadBalancerBaseTestWithCompute): listener_name = data_utils.rand_name("lb_member_listener1-tls") listener_kwargs = { const.NAME: listener_name, - const.PROTOCOL: lib_consts.PROTOCOL_TERMINATED_HTTPS, + const.PROTOCOL: const.TERMINATED_HTTPS, const.PROTOCOL_PORT: '443', const.LOADBALANCER_ID: self.lb_id, const.DEFAULT_POOL_ID: self.pool_id, diff --git a/requirements.txt b/requirements.txt index c9f839cc..3b78bc3d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,6 @@ cryptography>=2.1 # BSD/Apache-2.0 python-dateutil>=2.5.3 # BSD ipaddress>=1.0.17;python_version<'3.3' # PSF pbr!=2.1.0,>=2.0.0 # Apache-2.0 -octavia-lib>=1.0.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0