Sync charm-helpers
Change-Id: I69e67d237a7e3e95c3b56256b25752b847969366
This commit is contained in:
parent
892666557c
commit
cf46ca3cd6
@ -92,7 +92,7 @@ class OpenStackAmuletUtils(AmuletUtils):
|
|||||||
return 'endpoint not found'
|
return 'endpoint not found'
|
||||||
|
|
||||||
def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port,
|
def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port,
|
||||||
public_port, expected):
|
public_port, expected, expected_num_eps=3):
|
||||||
"""Validate keystone v3 endpoint data.
|
"""Validate keystone v3 endpoint data.
|
||||||
|
|
||||||
Validate the v3 endpoint data which has changed from v2. The
|
Validate the v3 endpoint data which has changed from v2. The
|
||||||
@ -138,7 +138,7 @@ class OpenStackAmuletUtils(AmuletUtils):
|
|||||||
if ret:
|
if ret:
|
||||||
return 'unexpected endpoint data - {}'.format(ret)
|
return 'unexpected endpoint data - {}'.format(ret)
|
||||||
|
|
||||||
if len(found) != 3:
|
if len(found) != expected_num_eps:
|
||||||
return 'Unexpected number of endpoints found'
|
return 'Unexpected number of endpoints found'
|
||||||
|
|
||||||
def validate_svc_catalog_endpoint_data(self, expected, actual):
|
def validate_svc_catalog_endpoint_data(self, expected, actual):
|
||||||
|
@ -92,7 +92,7 @@ class OpenStackAmuletUtils(AmuletUtils):
|
|||||||
return 'endpoint not found'
|
return 'endpoint not found'
|
||||||
|
|
||||||
def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port,
|
def validate_v3_endpoint_data(self, endpoints, admin_port, internal_port,
|
||||||
public_port, expected):
|
public_port, expected, expected_num_eps=3):
|
||||||
"""Validate keystone v3 endpoint data.
|
"""Validate keystone v3 endpoint data.
|
||||||
|
|
||||||
Validate the v3 endpoint data which has changed from v2. The
|
Validate the v3 endpoint data which has changed from v2. The
|
||||||
@ -138,7 +138,7 @@ class OpenStackAmuletUtils(AmuletUtils):
|
|||||||
if ret:
|
if ret:
|
||||||
return 'unexpected endpoint data - {}'.format(ret)
|
return 'unexpected endpoint data - {}'.format(ret)
|
||||||
|
|
||||||
if len(found) != 3:
|
if len(found) != expected_num_eps:
|
||||||
return 'Unexpected number of endpoints found'
|
return 'Unexpected number of endpoints found'
|
||||||
|
|
||||||
def validate_svc_catalog_endpoint_data(self, expected, actual):
|
def validate_svc_catalog_endpoint_data(self, expected, actual):
|
||||||
|
2
tox.ini
2
tox.ini
@ -9,7 +9,7 @@ skipsdist = True
|
|||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONHASHSEED=0
|
PYTHONHASHSEED=0
|
||||||
CHARM_DIR={envdir}
|
CHARM_DIR={envdir}
|
||||||
AMULET_SETUP_TIMEOUT=2700
|
AMULET_SETUP_TIMEOUT=5400
|
||||||
install_command =
|
install_command =
|
||||||
pip install --allow-unverified python-apt {opts} {packages}
|
pip install --allow-unverified python-apt {opts} {packages}
|
||||||
commands = ostestr {posargs}
|
commands = ostestr {posargs}
|
||||||
|
Loading…
Reference in New Issue
Block a user