openstack/tempest
Code Issues Proposed changes

Merge "Use ssl conf settings for raw verify_tempest_config requests"

Browse Source
This commit is contained in:
Jenkins 2015-03-11 09:00:52 +00:00 committed by Gerrit Code Review
commit 7ff8f0e45a
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tempest/cmd/verify_tempest_config.py
View File

@ -28,7 +28,6 @@ from tempest import config
CONF = config.CONF
RAW_HTTP = httplib2.Http()
CONF_PARSER = None
@ -83,7 +82,11 @@ def _get_api_versions(os, service):
}
client_dict[service].skip_path()
endpoint = _get_unversioned_endpoint(client_dict[service].base_url)
__, body = RAW_HTTP.request(endpoint, 'GET')
dscv = CONF.identity.disable_ssl_certificate_validation
ca_certs = CONF.identity.ca_certificates_file
raw_http = httplib2.Http(disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs)
__, body = raw_http.request(endpoint, 'GET')
client_dict[service].reset_path()
body = json.loads(body)
if service == 'keystone':

35
tempest/tests/cmd/test_verify_tempest_config.py
View File

@ -49,9 +49,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': {'values': [{'id': 'v2.0'}, {'id': 'v3.0'}]}}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
versions = verify_tempest_config._get_api_versions(fake_os, 'keystone')
self.assertIn('v2.0', versions)
@ -63,9 +62,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': [{'id': 'v1.0'}, {'id': 'v2.0'}]}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
versions = verify_tempest_config._get_api_versions(fake_os, 'cinder')
self.assertIn('v1.0', versions)
@ -77,9 +75,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': [{'id': 'v2.0'}, {'id': 'v3.0'}]}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
versions = verify_tempest_config._get_api_versions(fake_os, 'nova')
self.assertIn('v2.0', versions)
@ -109,9 +106,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': {'values': [{'id': 'v2.0'}]}}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
with mock.patch.object(verify_tempest_config,
'print_and_or_update') as print_mock:
@ -126,9 +122,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': {'values': [{'id': 'v3.0'}]}}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
with mock.patch.object(verify_tempest_config,
'print_and_or_update') as print_mock:
@ -143,9 +138,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': [{'id': 'v1.0'}]}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
with mock.patch.object(verify_tempest_config,
'print_and_or_update') as print_mock:
@ -159,9 +153,8 @@ class TestDiscovery(base.TestCase):
return_value='http://fake_endpoint:5000'))
fake_resp = {'versions': [{'id': 'v2.0'}]}
fake_resp = json.dumps(fake_resp)
self.useFixture(mockpatch.PatchObject(
verify_tempest_config.RAW_HTTP, 'request',
return_value=(None, fake_resp)))
self.useFixture(mockpatch.Patch('httplib2.Http.request',
return_value=(None, fake_resp)))
fake_os = mock.MagicMock()
with mock.patch.object(verify_tempest_config,
'print_and_or_update') as print_mock: