1
diff --git a/juju_verify/verifiers/ceph.py b/juju_verify/verifiers/ceph.py
2
index 28bca0a..32556cc 100644
3
--- a/juju_verify/verifiers/ceph.py
4
+++ b/juju_verify/verifiers/ceph.py
5
@@ -16,7 +16,7 @@
6
16
# this program. If not, see https://www.gnu.org/licenses/.
16
# this program. If not, see https://www.gnu.org/licenses/.
7
17
"""ceph-osd verification."""
17
"""ceph-osd verification."""
8
18
import logging
18
import logging
10
19
from typing import Set
19
from typing import Dict, Optional
11
20
20
12
21
from juju.unit import Unit
21
from juju.unit import Unit
13
22
22
14
@@ -62,34 +62,45 @@ class CephOsd(CephCommon):
15
62
62
16
63
    NAME = 'ceph-osd'
63
    NAME = 'ceph-osd'
17
64
64
24
65
    def get_ceph_mon_units(self) -> Set[Unit]:
65
    def _get_ceph_mon_unit(self, app_name: str) -> Optional[Unit]:
25
66
        """Get Ceph-mon units related to verified units.
66
        """Get first ceph-mon unit from relation."""
26
67
67
        try:
27
68
        1. get all distinct ceph-osd applications from provides units
68
            for relation in self.model.applications[app_name].relations:
28
69
        2. get all relationships based on found apps or ceph-mon
69
                if relation.matches(f"{app_name}:mon"):
29
70
        3. get the first unit from the application providing the relation
70
                    # selecting the first unit from the application provided by relation
30
71
                    return relation.provides.application.units[0]
31
72
        except (IndexError, KeyError) as error:
32
73
            logger.debug("Error to get ceph-mon unit from relations: %s", error)
33
74
34
75
        return None
35
76
36
77
    def get_ceph_mon_units(self) -> Dict[str, Unit]:
37
78
        """Get first ceph-mon units related to verified units.
38
79
39
80
        This function groups by distinct application names for verified units, and then
40
81
        finds the relation ("<application>:mon") between the application and ceph-mon.
41
82
        The first unit of ceph-mon will be obtained from this relation.
42
83
        :returns: Map between verified and ceph-mon units
43
71
        """
84
        """
44
72
        # get all affected ceph-osd applications
45
73
        applications = {unit.application for unit in self.units}
85
        applications = {unit.application for unit in self.units}
46
74
        logger.debug("affected applications %s", map(str, applications))
86
        logger.debug("affected applications %s", map(str, applications))
47
75
        applications.add("ceph-osd")
48
76
87
54
77
        # get all relation between ceph-osd and ceph-mon
88
        ceph_mon_app_map = {}
55
78
        relations = {relation for relation in self.model.relations
89
        for app_name in applications:
56
79
                     if any(relation.matches(f"{application}:mon")
90
            unit = self._get_ceph_mon_unit(app_name)
57
80
                            for application in applications)}
91
            if unit is not None:
58
81
        logger.debug("found relations %s", map(str, relations))
92
                ceph_mon_app_map[app_name] = unit
59
82
93
64
83
        # get first ceph-mon unit from relation
94
        logger.debug("found units %s", map(str, ceph_mon_app_map.values()))
61
84
        ceph_mon_units = {relation.provides.application.units[0]
62
85
                          for relation in relations}
63
86
        logger.debug("found units %s", map(str, ceph_mon_units))
65
87
95
67
88
        return ceph_mon_units
96
        return ceph_mon_app_map
68
89
97
69
90
    def verify_reboot(self) -> Result:
98
    def verify_reboot(self) -> Result:
70
91
        """Verify that it's safe to reboot selected ceph-osd units."""
99
        """Verify that it's safe to reboot selected ceph-osd units."""
72
92
        return aggregate_results(self.check_cluster_health(*self.get_ceph_mon_units()))
100
        ceph_mon_app_map = self.get_ceph_mon_units()
73
101
        # get unique ceph-mon units
74
102
        unique_ceph_mon_units = set(ceph_mon_app_map.values())
75
103
        return aggregate_results(self.check_cluster_health(*unique_ceph_mon_units))
76
93
104
77
94
    def verify_shutdown(self) -> Result:
105
    def verify_shutdown(self) -> Result:
78
95
        """Verify that it's safe to shutdown selected ceph-osd units."""
106
        """Verify that it's safe to shutdown selected ceph-osd units."""
79
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
80
index 42b4426..8a7b55a 100644
81
--- a/tests/unit/conftest.py
82
+++ b/tests/unit/conftest.py
83
@@ -56,7 +56,7 @@ def model(session_mocker, all_units):
84
56
    mock_model = Model()
56
    mock_model = Model()
85
57
    session_mocker.patch.object(Model, 'connect_current')
57
    session_mocker.patch.object(Model, 'connect_current')
86
58
    session_mocker.patch.object(Model, 'connect_model')
58
    session_mocker.patch.object(Model, 'connect_model')
88
59
    session_mocker.patch.object(Model, 'relations')
59
    session_mocker.patch.object(Model, 'applications')
89
60
    session_mocker.patch.object(Unit, 'data')
60
    session_mocker.patch.object(Unit, 'data')
90
61
    session_mocker.patch.object(Unit, 'machine')
61
    session_mocker.patch.object(Unit, 'machine')
91
62
    session_mocker.patch.object(Unit, 'run_action', new_callable=MagicMock)
62
    session_mocker.patch.object(Unit, 'run_action', new_callable=MagicMock)
92
diff --git a/tests/unit/verifiers/test_ceph.py b/tests/unit/verifiers/test_ceph.py
93
index 728a4cb..f5d16ad 100644
94
--- a/tests/unit/verifiers/test_ceph.py
95
+++ b/tests/unit/verifiers/test_ceph.py
96
@@ -74,25 +74,49 @@ def test_check_cluster_health_unknown_state(mock_run_action_on_units, model):
97
74
    assert result == Result(False, "Ceph cluster is in an unknown state")
74
    assert result == Result(False, "Ceph cluster is in an unknown state")
98
75
75
99
76
76
103
77
def test_get_ceph_mon_units(model):
77
def test_get_ceph_mon_unit(model):
104
78
    """Test function to get ceph-mon units related to verified units."""
78
    """Test get ceph-mon unit related to application."""
102
79
    ceph_osd_units = [model.units["ceph-osd/0"], model.units["ceph-osd/1"]]
105
80
    ceph_mon_units = [model.units["ceph-mon/0"], model.units["ceph-mon/1"],
79
    ceph_mon_units = [model.units["ceph-mon/0"], model.units["ceph-mon/1"],
106
81
                      model.units["ceph-mon/2"]]
80
                      model.units["ceph-mon/2"]]
107
82
    mock_relation = MagicMock()
81
    mock_relation = MagicMock()
108
83
    mock_relation.matches = {"ceph-osd:mon": True}.get
82
    mock_relation.matches = {"ceph-osd:mon": True}.get
109
84
    mock_relation.provides.application.units = ceph_mon_units
83
    mock_relation.provides.application.units = ceph_mon_units
111
85
    model.relations = [mock_relation]
84
    mock_relations = MagicMock()
112
85
    mock_relations.relations = [mock_relation]
113
86
    model.applications = {"ceph-osd": mock_relations}
114
87
115
88
    # return first ceph-mon unit in "ceph-osd:mon" relations
116
89
    unit = CephOsd([model.units["ceph-osd/0"]])._get_ceph_mon_unit("ceph-osd")
117
90
    assert unit == ceph_mon_units[0]
118
91
119
92
    # return none for non-existent application name
120
93
    model.applications = {"ceph-osd-cluster": mock_relations}
121
94
    unit = CephOsd([model.units["ceph-osd/0"]])._get_ceph_mon_unit("ceph-osd")
122
95
    assert unit is None
123
96
124
97
    # return none for application with no units
125
98
    mock_relation.provides.application.units = []
126
99
    model.applications = {"ceph-osd": mock_relations}
127
100
    unit = CephOsd([model.units["ceph-osd/0"]])._get_ceph_mon_unit("ceph-osd")
128
101
    assert unit is None
129
102
130
103
131
104
@mock.patch("juju_verify.verifiers.ceph.CephOsd._get_ceph_mon_unit")
132
105
def test_get_ceph_mon_units(mock_get_ceph_mon_unit, model):
133
106
    """Test function to get ceph-mon units related to verified units."""
134
107
    ceph_osd_units = [model.units["ceph-osd/0"], model.units["ceph-osd/1"]]
135
108
    mock_get_ceph_mon_unit.return_value = model.units["ceph-mon/0"]
136
86
109
137
87
    units = CephOsd(ceph_osd_units).get_ceph_mon_units()
110
    units = CephOsd(ceph_osd_units).get_ceph_mon_units()
139
88
    assert {ceph_mon_units[0]} == units
111
140
112
    assert units == {"ceph-osd": model.units["ceph-mon/0"]}
141
89
113
142
90
114
143
91
@mock.patch("juju_verify.verifiers.ceph.CephOsd.get_ceph_mon_units")
115
@mock.patch("juju_verify.verifiers.ceph.CephOsd.get_ceph_mon_units")
144
92
@mock.patch("juju_verify.verifiers.ceph.CephCommon.check_cluster_health")
116
@mock.patch("juju_verify.verifiers.ceph.CephCommon.check_cluster_health")
145
93
def test_verify_reboot(mock_check_cluster_health, mock_get_ceph_mon_units, model):
117
def test_verify_reboot(mock_check_cluster_health, mock_get_ceph_mon_units, model):
146
94
    """Test reboot verification on CephOsd."""
118
    """Test reboot verification on CephOsd."""
148
95
    mock_get_ceph_mon_units.return_value = [model.units["ceph-mon/0"]]
119
    mock_get_ceph_mon_units.return_value = {"ceph-osd": model.units["ceph-mon/0"]}
149
96
    mock_check_cluster_health.return_value = Result(True, "Ceph cluster is healthy")
120
    mock_check_cluster_health.return_value = Result(True, "Ceph cluster is healthy")
150
97
121
151
98
    result = CephOsd([model.units["ceph-osd/0"]]).verify_reboot()
122
    result = CephOsd([model.units["ceph-osd/0"]]).verify_reboot()
152
@@ -104,7 +128,7 @@ def test_verify_reboot(mock_check_cluster_health, mock_get_ceph_mon_units, model
153
104
@mock.patch("juju_verify.verifiers.ceph.CephCommon.check_cluster_health")
128
@mock.patch("juju_verify.verifiers.ceph.CephCommon.check_cluster_health")
154
105
def test_verify_shutdown(mock_check_cluster_health, mock_get_ceph_mon_units, model):
129
def test_verify_shutdown(mock_check_cluster_health, mock_get_ceph_mon_units, model):
155
106
    """Test shutdown verification on CephOsd."""
130
    """Test shutdown verification on CephOsd."""
157
107
    mock_get_ceph_mon_units.return_value = [model.units["ceph-mon/0"]]
131
    mock_get_ceph_mon_units.return_value = {"ceph-osd": model.units["ceph-mon/0"]}
158
108
    mock_check_cluster_health.return_value = Result(True, "Ceph cluster is healthy")
132
    mock_check_cluster_health.return_value = Result(True, "Ceph cluster is healthy")
159
109
133
160
110
    result = CephOsd([model.units["ceph-osd/0"]]).verify_shutdown()
134
    result = CephOsd([model.units["ceph-osd/0"]]).verify_shutdown()
Reviewer	Review Type	Date Requested	Status
🤖 prod-jenkaas-bootstack (community)	continuous-integration		Approve on 2021-03-19
Alvaro Uria (community)		2021-03-19	Approve on 2021-03-19
Canonical Solutions Engineering Team		2021-03-19	Pending
Review via email: mp+399911@code.launchpad.net