x/stackalytics
Code Issues Proposed changes

Allow to query Gerrit behind corporate proxy

Browse Source 
Adds proxy_command configuration option to allow paramiko to communicate
with Gerrit behind corporate proxy.

Change-Id: I5418b31b15b83f55c2f78636ffa958755c55de8d
This commit is contained in:
Andrii Ostapenko
2019-03-05 14:14:44 -06:00
committed by Roman Gorshunov
parent 8cf7cd0950
commit ebeee06e8e
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
stackalytics/tests/unit/test_rcs.py
View File

@@ -16,10 +16,14 @@
import json
import mock
from oslo_config import cfg
import testtools
from stackalytics.processor import config
from stackalytics.processor import rcs
CONF = cfg.CONF
REVIEW_ONE = json.dumps(
{"project": "openstack/nova", "branch": "master", "topic": "bug/1494374",
"id": "Id741dfc769c02a5544691a7db49a7dbff6b11376", "number": "229382",
@@ -32,6 +36,10 @@ REVIEW_END_LINE = json.dumps(
class TestRcs(testtools.TestCase):
def setUp(self):
super(TestRcs, self).setUp()
CONF.register_opts(config.CONNECTION_OPTS + config.PROCESSOR_OPTS)
@mock.patch('paramiko.SSHClient')
def test_setup(self, mock_client_cons):
mock_client = mock.Mock()
@@ -45,7 +53,30 @@ class TestRcs(testtools.TestCase):
mock_connect.assert_called_once_with(
'review.openstack.org', port=rcs.DEFAULT_PORT, key_filename='key',
username='user')
username='user', sock=None)
@mock.patch('paramiko.ProxyCommand')
@mock.patch('paramiko.SSHClient')
def test_setup_with_proxy(self, mock_client_cons, mock_proxy_command):
mock_client = mock.Mock()
mock_client_cons.return_value = mock_client
mock_connect = mock.Mock()
mock_client.connect = mock_connect
mock_proxy = mock.Mock()
mock_proxy_command.return_value = mock_proxy
CONF.set_override('proxy_command', '%s:%s')
gerrit = rcs.Gerrit('gerrit://review.openstack.org')
gerrit.setup(username='user', key_filename='key')
mock_proxy_command.assert_called_once_with(
'review.openstack.org:%s' % rcs.DEFAULT_PORT)
mock_connect.assert_called_once_with(
'review.openstack.org', port=rcs.DEFAULT_PORT, key_filename='key',
username='user', sock=mock_proxy)
@mock.patch('paramiko.SSHClient')
def test_setup_error(self, mock_client_cons):
@@ -62,7 +93,7 @@ class TestRcs(testtools.TestCase):
mock_connect.assert_called_once_with(
'review.openstack.org', port=rcs.DEFAULT_PORT, key_filename='key',
username='user')
username='user', sock=None)
@mock.patch('paramiko.SSHClient')
@mock.patch('time.time')