1
diff --git a/src/lib/lib_juju_controller.py b/src/lib/lib_juju_controller.py
2
index 6432c3c..08eb0b7 100644
3
--- a/src/lib/lib_juju_controller.py
4
+++ b/src/lib/lib_juju_controller.py
5
@@ -11,6 +11,7 @@ import yaml
6
11
AGENTDIRGLOB = "/var/lib/juju/agents/machine-*"
11
AGENTDIRGLOB = "/var/lib/juju/agents/machine-*"
7
12
CACERTPATH = "/run/juju-controller-ca.crt"
12
CACERTPATH = "/run/juju-controller-ca.crt"
8
13
PUBAGENTCONFPATH = "/run/juju-controller-public-agent.conf"
13
PUBAGENTCONFPATH = "/run/juju-controller-public-agent.conf"
9
14
SNAP_JUJU_DB_SVC = "/etc/systemd/system/snap.juju-db.daemon.service"
10
14
15
11
15
16
12
16
class JujuControllerHelper:
17
class JujuControllerHelper:
13
@@ -55,7 +56,10 @@ class JujuControllerHelper:
14
55
    @property
56
    @property
15
56
    def services(self):
57
    def services(self):
16
57
        """Return the list of juju services on this machine."""
58
        """Return the list of juju services on this machine."""
18
58
        return ["juju-db", "jujud-machine-{}".format(self._machine_id())]
59
        return [
19
60
            "snap.juju-db.daemon" if os.path.exists(SNAP_JUJU_DB_SVC) else "juju-db",
20
61
            "jujud-machine-{}".format(self._machine_id()),
21
62
        ]
22
59
63
23
60
    @property
64
    @property
24
61
    def agent_conf_path(self):
65
    def agent_conf_path(self):
25
diff --git a/src/tests/unit/test_lib_juju_controller.py b/src/tests/unit/test_lib_juju_controller.py
26
index 03bae5b..a40ddd0 100644
27
--- a/src/tests/unit/test_lib_juju_controller.py
28
+++ b/src/tests/unit/test_lib_juju_controller.py
29
@@ -1,6 +1,8 @@
30
1
#!/usr/bin/python3
1
#!/usr/bin/python3
31
2
"""Pytest test cases for lib_juju_controller.py."""
2
"""Pytest test cases for lib_juju_controller.py."""
32
3
3
33
4
import mock
34
5
35
4
EXPECTED = {
6
EXPECTED = {
36
5
    "machine-id": "99",
7
    "machine-id": "99",
37
6
    "services": ["juju-db", "jujud-machine-99"],
8
    "services": ["juju-db", "jujud-machine-99"],
38
@@ -44,9 +46,20 @@ class TestJujuControllerLib:
39
44
        """Test parsing the machine id."""
46
        """Test parsing the machine id."""
40
45
        assert jujucontroller._machine_id() == EXPECTED["machine-id"]
47
        assert jujucontroller._machine_id() == EXPECTED["machine-id"]
41
46
48
43
47
    def test_services(self, jujucontroller):
49
    def test_services_snap(self, jujucontroller):
44
50
        """Test collecting all juju services."""
45
51
        with mock.patch("os.path.exists", autospec=True) as path_exists:
46
52
            path_exists.return_value = True
47
53
            expected = list(EXPECTED["services"])
48
54
            expected.remove("juju-db")
49
55
            expected.insert(0, "snap.juju-db.daemon")
50
56
            assert jujucontroller.services == expected
51
57
52
58
    def test_services_apt(self, jujucontroller):
53
48
        """Test collecting all juju services."""
59
        """Test collecting all juju services."""
55
49
        assert jujucontroller.services == EXPECTED["services"]
60
        with mock.patch("os.path.exists", autospec=True) as path_exists:
56
61
            path_exists.return_value = False
57
62
            assert jujucontroller.services == EXPECTED["services"]
58
50
63
59
51
    def test_version(self, jujucontroller):
64
    def test_version(self, jujucontroller):
60
52
        """Test reporting the controller version."""
65
        """Test reporting the controller version."""
Reviewer	Review Type	Date Requested	Status
Xav Paice (community)		2021-07-27	Approve on 2021-07-28
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2021-07-28
Paul Goins		2021-07-27	Approve on 2021-07-27
Review via email: mp+406258@code.launchpad.net