From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 8 Jan 2021 10:49:00 +0000 (+0100)
Subject: mgr/cephadm: rename OSDQueue -> OSDRemovalQueue
X-Git-Tag: v15.2.9~53^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c6c91d409e886fcba479b185601309466dcea11;p=ceph.git

mgr/cephadm: rename OSDQueue -> OSDRemovalQueue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e0f9983b50444d53d6750f9bf1f04556510419eb)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 31e2fb84a2e..94367cb7bf5 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -44,7 +44,7 @@ from .services.cephadmservice import MonService, MgrService, MdsService, RgwServ
 from .services.container import CustomContainerService
 from .services.iscsi import IscsiService
 from .services.nfs import NFSService
-from .services.osd import RemoveUtil, OSDQueue, OSDService, OSD, NotFoundError
+from .services.osd import RemoveUtil, OSDRemovalQueue, OSDService, OSD, NotFoundError
 from .services.monitoring import GrafanaService, AlertmanagerService, PrometheusService, \
     NodeExporterService
 from .schedule import HostAssignment
@@ -354,7 +354,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         self.cache.load()
 
         self.rm_util = RemoveUtil(self)
-        self.to_remove_osds = OSDQueue()
+        self.to_remove_osds = OSDRemovalQueue()
         self.rm_util.load_from_store()
 
         self.spec_store = SpecStore(self)
diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py
index 8dd49c1e414..2f26a095b22 100644
--- a/src/pybind/mgr/cephadm/services/osd.py
+++ b/src/pybind/mgr/cephadm/services/osd.py
@@ -675,7 +675,7 @@ class OSD:
         return f"<OSD>(osd_id={self.osd_id}, draining={self.draining})"
 
 
-class OSDQueue(Set):
+class OSDRemovalQueue(Set):
 
     def __init__(self) -> None:
         super().__init__()
diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 6274c443796..2a26aa47c6d 100644
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -7,7 +7,7 @@ import pytest
 
 from ceph.deployment.drive_group import DriveGroupSpec, DeviceSelection
 from cephadm.serve import CephadmServe
-from cephadm.services.osd import OSD, OSDQueue
+from cephadm.services.osd import OSD, OSDRemovalQueue
 
 try:
     from typing import Any, List
@@ -508,7 +508,7 @@ class TestCephadm(object):
                                                       remove_util=cephadm_module.rm_util
                                                       ))
             cephadm_module.rm_util.process_removal_queue()
-            assert cephadm_module.to_remove_osds == OSDQueue()
+            assert cephadm_module.to_remove_osds == OSDRemovalQueue()
 
             c = cephadm_module.remove_osds_status()
             out = wait(cephadm_module, c)
diff --git a/src/pybind/mgr/cephadm/tests/test_osd_removal.py b/src/pybind/mgr/cephadm/tests/test_osd_removal.py
index c9cfe464f23..5ac4209ccff 100644
--- a/src/pybind/mgr/cephadm/tests/test_osd_removal.py
+++ b/src/pybind/mgr/cephadm/tests/test_osd_removal.py
@@ -1,6 +1,6 @@
 import json
 
-from cephadm.services.osd import RemoveUtil, OSDQueue, OSD
+from cephadm.services.osd import RemoveUtil, OSDRemovalQueue, OSD
 import pytest
 from .fixtures import rm_util, osd_obj, cephadm_module
 from tests import mock
@@ -92,7 +92,8 @@ class TestOSDRemoval:
         cephadm_module.set_store('osd_remove_queue', data)
         cephadm_module.rm_util.load_from_store()
 
-        assert repr(cephadm_module.to_remove_osds) == 'OSDQueue({<OSD>(osd_id=35, draining=True)})'
+        assert repr(
+            cephadm_module.to_remove_osds) == 'OSDRemovalQueue({<OSD>(osd_id=35, draining=True)})'
 
 
 class TestOSD:
@@ -213,10 +214,10 @@ class TestOSD:
         assert osd_obj.drain_status_human() == 'done, waiting for purge'
 
 
-class TestOSDQueue:
+class TestOSDRemovalQueue:
 
     def test_queue_size(self, osd_obj):
-        q = OSDQueue()
+        q = OSDRemovalQueue()
         assert q.queue_size() == 0
         q.add(osd_obj)
         assert q.queue_size() == 1
@@ -224,14 +225,14 @@ class TestOSDQueue:
     @mock.patch("cephadm.services.osd.OSD.start")
     @mock.patch("cephadm.services.osd.OSD.exists")
     def test_enqueue(self, exist, start, osd_obj):
-        q = OSDQueue()
+        q = OSDRemovalQueue()
         q.enqueue(osd_obj)
         osd_obj.start.assert_called_once()
 
     @mock.patch("cephadm.services.osd.OSD.stop")
     @mock.patch("cephadm.services.osd.OSD.exists")
     def test_rm_raise(self, exist, stop, osd_obj):
-        q = OSDQueue()
+        q = OSDRemovalQueue()
         with pytest.raises(KeyError):
             q.rm(osd_obj)
             osd_obj.stop.assert_called_once()
@@ -239,7 +240,7 @@ class TestOSDQueue:
     @mock.patch("cephadm.services.osd.OSD.stop")
     @mock.patch("cephadm.services.osd.OSD.exists")
     def test_rm(self, exist, stop, osd_obj):
-        q = OSDQueue()
+        q = OSDRemovalQueue()
         q.add(osd_obj)
         q.rm(osd_obj)
         osd_obj.stop.assert_called_once()
diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 2a66665bb63..0874c395eb5 100644
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -6,7 +6,7 @@ from cephadm.services.cephadmservice import MonService, MgrService, MdsService,
     RbdMirrorService, CrashService, CephadmService, AuthEntity
 from cephadm.services.iscsi import IscsiService
 from cephadm.services.nfs import NFSService
-from cephadm.services.osd import RemoveUtil, OSDQueue, OSDService, OSD, NotFoundError
+from cephadm.services.osd import RemoveUtil, OSDRemovalQueue, OSDService, OSD, NotFoundError
 from cephadm.services.monitoring import GrafanaService, AlertmanagerService, PrometheusService, \
     NodeExporterService