openstack/rally-openstack
Code Issues Proposed changes

Add verify option to scale webhook request

Browse Source 
Add verify option to post request in scale_webhook method
to fix SSLError certificate verify failed.

Closes-bug: #1808179
Change-Id: I1a4a226b9dba9de246f5e94a473f8c4f3e37d379
This commit is contained in:
prazumovsky 2018-12-12 19:57:10 +04:00
parent 172542c0b7
commit ac0a3ce67c
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rally_openstack/scenarios/heat/utils.py
View File

@ -324,5 +324,9 @@ class HeatScenario(scenario.OpenStackScenario):
"No output key %(key)s found in stack %(id)s" % "No output key %(key)s found in stack %(id)s" %
{"key": output_key, "id": stack.id}) {"key": output_key, "id": stack.id})
platform_params = self.context["env"]["spec"]["existing@openstack"]
verify = (platform_params["https_cacert"]
if not platform_params["https_insecure"]
else False)
with atomic.ActionTimer(self, "heat.%s_webhook" % output_key): with atomic.ActionTimer(self, "heat.%s_webhook" % output_key):
requests.post(url).raise_for_status() requests.post(url, verify=verify).raise_for_status()

38
tests/unit/scenarios/heat/test_utils.py
View File

@ -223,13 +223,47 @@ class HeatScenarioTestCase(test.ScenarioTestCase):
@mock.patch("requests.post") @mock.patch("requests.post")
def test_stack_webhook(self, mock_post): def test_stack_webhook(self, mock_post):
scenario = utils.HeatScenario(self.context) env_context = {
"env": {
"spec": {
"existing@openstack": {
"https_cacert": "cacert.crt",
"https_insecure": False
}
}
}
}
env_context.update(self.context)
scenario = utils.HeatScenario(env_context)
stack = mock.Mock(outputs=[ stack = mock.Mock(outputs=[
{"output_key": "output1", "output_value": "url1"}, {"output_key": "output1", "output_value": "url1"},
{"output_key": "output2", "output_value": "url2"}]) {"output_key": "output2", "output_value": "url2"}])
scenario._stack_webhook(stack, "output1") scenario._stack_webhook(stack, "output1")
mock_post.assert_called_with("url1") mock_post.assert_called_with("url1", verify="cacert.crt")
self._test_atomic_action_timer(scenario.atomic_actions(),
"heat.output1_webhook")
@mock.patch("requests.post")
def test_stack_webhook_insecure(self, mock_post):
env_context = {
"env": {
"spec": {
"existing@openstack": {
"https_cacert": "cacert.crt",
"https_insecure": True
}
}
}
}
env_context.update(self.context)
scenario = utils.HeatScenario(env_context)
stack = mock.Mock(outputs=[
{"output_key": "output1", "output_value": "url1"},
{"output_key": "output2", "output_value": "url2"}])
scenario._stack_webhook(stack, "output1")
mock_post.assert_called_with("url1", verify=False)
self._test_atomic_action_timer(scenario.atomic_actions(), self._test_atomic_action_timer(scenario.atomic_actions(),
"heat.output1_webhook") "heat.output1_webhook")