openstack/octavia
Code Issues Proposed changes

Merge "Health Monitor url_path requires leading slash"

Browse Source
This commit is contained in:
Zuul
2018-04-26 04:49:37 +00:00
committed by Gerrit Code Review
parent d31552336c 791f52309c
commit d4f9ee04e7
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/common/validate.py
View File

@@ -55,7 +55,8 @@ def url_path(url_path):
if (
p_url.scheme or p_url.userinfo or p_url.host or
p_url.port or
p_url.path is None
p_url.path is None or
not p_url.path.startswith('/')
):
raise exceptions.InvalidURLPath(url_path=url_path)
except Exception:

9
octavia/tests/unit/api/v2/types/test_health_monitors.py
View File

@@ -87,6 +87,15 @@ class TestHealthMonitor(object):
self.assertRaises(exc.InvalidInput, wsme_json.fromjson,
self._type, body)
def test_invalid_url_path_no_leading_slash(self):
body = {"delay": 1, "timeout": 1, "max_retries": 1,
"url_path": 'blah'}
if self._type is hm_type.HealthMonitorPOST:
body.update({"type": constants.PROTOCOL_HTTP,
"pool_id": uuidutils.generate_uuid()})
self.assertRaises(exc.InvalidInput, wsme_json.fromjson,
self._type, body)
def test_invalid_expected_codes(self):
body = {"delay": 1, "timeout": 1, "max_retries": 1,
"expected_codes": "lol"}