openstack/octavia
Code Issues Proposed changes

Fix active/standby under python3

Browse Source 
Changes in diskimage-builder switched the amphora image to use
python3.  The active/standby code was not python3 compatible.
This patch corrects that issue.

Change-Id: I81db0e52f1a21d1e3ceea6a4ec2467145f761e55
Closes-Bug: #1659116
This commit is contained in:
Michael Johnson 2017-01-24 13:07:32 -08:00
parent e8c2ea8d6c
commit eebd2d4e33
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/amphorae/backends/agent/api_server/keepalived.py
View File

@ -50,7 +50,7 @@ class Keepalived(object):
flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
# mode 00644 # mode 00644
mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
with os.fdopen(os.open(conf_file, flags, mode), 'w') as f: with os.fdopen(os.open(conf_file, flags, mode), 'wb') as f:
b = stream.read(BUFFER) b = stream.read(BUFFER)
while b: while b:
f.write(b) f.write(b)

4
octavia/cmd/haproxy_vrrp_check.py
View File

@ -29,8 +29,8 @@ def get_status(sock_address):
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
s.settimeout(SOCKET_TIMEOUT) s.settimeout(SOCKET_TIMEOUT)
s.connect(sock_address) s.connect(sock_address)
s.send('show stat -1 -1 -1\n') s.send(b'show stat -1 -1 -1\n')
data = '' data = b''
while True: while True:
x = s.recv(1024) x = s.recv(1024)
if not x: if not x:

2
octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py
View File

@ -1450,7 +1450,7 @@ class TestServerTestCase(base.TestCase):
mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
mock_open.assert_called_with(cfg_path, flags, mode) mock_open.assert_called_with(cfg_path, flags, mode)
mock_fdopen.assert_called_with(123, 'w') mock_fdopen.assert_called_with(123, 'wb')
self.assertEqual(200, rv.status_code) self.assertEqual(200, rv.status_code)
mock_exists.return_value = False mock_exists.return_value = False

2
octavia/tests/unit/cmd/test_haproxy_vrrp_check.py
View File

@ -28,7 +28,7 @@ class TestHAproxyVRRPCheckCMD(base.TestCase):
socket_mock = mock.MagicMock() socket_mock = mock.MagicMock()
mock_socket.return_value = socket_mock mock_socket.return_value = socket_mock
recv_mock = mock.MagicMock() recv_mock = mock.MagicMock()
recv_mock.side_effect = ['1', Exception('BREAK')] recv_mock.side_effect = [b'1', Exception('BREAK')]
socket_mock.recv = recv_mock socket_mock.recv = recv_mock
self.assertRaisesRegexp(Exception, 'BREAK', self.assertRaisesRegexp(Exception, 'BREAK',