Merge "Drop requirement on octavia-lib"

This commit is contained in:
Zuul 2019-05-07 14:43:41 +00:00 committed by Gerrit Code Review
commit 52edc5ee11
3 changed files with 2 additions and 4 deletions

View File

@ -101,6 +101,7 @@ ACTIVE_STANDBY = 'ACTIVE_STANDBY'
HTTP = 'HTTP'
HTTPS = 'HTTPS'
TCP = 'TCP'
TERMINATED_HTTPS = 'TERMINATED_HTTPS'
# HTTP Methods
GET = 'GET'

View File

@ -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,

View File

@ -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