From 97c99ca49fac1b1697f20d7fe5ea28ef66c69b19 Mon Sep 17 00:00:00 2001 From: Javier Santacruz Date: Mon, 17 Dec 2018 16:53:57 +0100 Subject: [PATCH] Check default socket path first at /var/lib instead of /var/snap Signed-off-by: Javier Santacruz --- pylxd/client.py | 14 ++++++-------- pylxd/tests/test_client.py | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pylxd/client.py b/pylxd/client.py index c1edf401..1e050c59 100644 --- a/pylxd/client.py +++ b/pylxd/client.py @@ -281,15 +281,13 @@ def __init__( endpoint, cert=cert, verify=verify, timeout=timeout) else: if 'LXD_DIR' in os.environ: - path = os.path.join( - os.environ.get('LXD_DIR'), 'unix.socket') + path = os.path.join(os.environ.get('LXD_DIR'), 'unix.socket') + elif os.path.exists('/var/lib/lxd/unix.socket'): + path = '/var/lib/lxd/unix.socket' else: - if os.path.exists('/var/snap/lxd/common/lxd/unix.socket'): - path = '/var/snap/lxd/common/lxd/unix.socket' - else: - path = '/var/lib/lxd/unix.socket' - self.api = _APINode('http+unix://{}'.format( - parse.quote(path, safe='')), timeout=timeout) + path = '/var/snap/lxd/common/lxd/unix.socket' + endpoint = 'http+unix://{}'.format(parse.quote(path, safe='')) + self.api = _APINode(endpoint, timeout=timeout) self.api = self.api[version] # Verify the connection is valid. diff --git a/pylxd/tests/test_client.py b/pylxd/tests/test_client.py index 46dd6f9a..979d1c38 100644 --- a/pylxd/tests/test_client.py +++ b/pylxd/tests/test_client.py @@ -51,7 +51,7 @@ def tearDown(self): @mock.patch('os.path.exists') def test_create(self, _path_exists): """Client creation sets default API endpoint.""" - _path_exists.return_value = False + _path_exists.return_value = True expected = 'http+unix://%2Fvar%2Flib%2Flxd%2Funix.socket/1.0' an_client = client.Client() @@ -62,7 +62,7 @@ def test_create(self, _path_exists): @mock.patch('os.environ') def test_create_with_snap_lxd(self, _environ, _path_exists): # """Client creation sets default API endpoint.""" - _path_exists.return_value = True + _path_exists.return_value = False expected = ('http+unix://%2Fvar%2Fsnap%2Flxd%2F' 'common%2Flxd%2Funix.socket/1.0')