x/vmware-nsx
Code Issues Proposed changes

Merge "Fix re-creation of the pool directory"

Browse Source
This commit is contained in:
Jenkins 2014-06-30 08:52:22 +00:00 committed by Gerrit Code Review
commit 4e1ff7bba2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
View File

@ -146,7 +146,7 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
namespace = get_ns_name(pool_id)
root_ns = ip_lib.IPWrapper(self.root_helper)
socket_path = self._get_state_file_path(pool_id, 'sock')
socket_path = self._get_state_file_path(pool_id, 'sock', False)
if root_ns.netns.exists(namespace) and os.path.exists(socket_path):
try:
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@ -157,7 +157,7 @@ class HaproxyNSDriver(agent_device_driver.AgentDeviceDriver):
return False
def get_stats(self, pool_id):
socket_path = self._get_state_file_path(pool_id, 'sock')
socket_path = self._get_state_file_path(pool_id, 'sock', False)
TYPE_BACKEND_REQUEST = 2
TYPE_SERVER_REQUEST = 4
if os.path.exists(socket_path):

4
neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py
View File

@ -163,7 +163,7 @@ class TestHaproxyNSDriver(base.BaseTestCase):
mock.patch('socket.socket'),
mock.patch('os.path.exists'),
) as (gsp, ip_wrap, socket, path_exists):
gsp.side_effect = lambda x, y: '/pool/' + y
gsp.side_effect = lambda x, y, z: '/pool/' + y
ip_wrap.return_value.netns.exists.return_value = True
path_exists.return_value = True
@ -210,7 +210,7 @@ class TestHaproxyNSDriver(base.BaseTestCase):
mock.patch('socket.socket'),
mock.patch('os.path.exists'),
) as (gsp, socket, path_exists):
gsp.side_effect = lambda x, y: '/pool/' + y
gsp.side_effect = lambda x, y, z: '/pool/' + y
path_exists.return_value = True
socket.return_value = socket
socket.recv.return_value = raw_stats