From: John Mulligan <jmulligan@redhat.com>
Date: Tue, 27 Sep 2022 18:50:44 +0000 (-0400)
Subject: cephadm: rename import from cd to _cephadm
X-Git-Tag: v18.1.0~1104^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6943ad7791abcb00a635cb7ff68c67f32aa723cd;p=ceph.git

cephadm: rename import from cd to _cephadm

The `cd` name is an abbreviation of an obsolete name for cephadm.
As this is not widely known it could be confusing or conflict with
other common terms like `cd` for "change dir" or "compact disc".
Therefore we rename it to something much clearer.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/tests/test_networks.py b/src/cephadm/tests/test_networks.py
index 8a4e74b40dea..7c0575046c94 100644
--- a/src/cephadm/tests/test_networks.py
+++ b/src/cephadm/tests/test_networks.py
@@ -6,7 +6,7 @@ import pytest
 
 from tests.fixtures import with_cephadm_ctx, cephadm_fs, import_cephadm
 
-cd = import_cephadm()
+_cephadm = import_cephadm()
 
 
 class TestCommandListNetworks:
@@ -69,7 +69,7 @@ class TestCommandListNetworks:
         ),
     ])
     def test_parse_ipv4_route(self, test_input, expected):
-        assert cd._parse_ipv4_route(test_input) == expected
+        assert _cephadm._parse_ipv4_route(test_input) == expected
 
     @pytest.mark.parametrize("test_routes, test_ips, expected", [
         (
@@ -222,12 +222,12 @@ class TestCommandListNetworks:
         ),
     ])
     def test_parse_ipv6_route(self, test_routes, test_ips, expected):
-        assert cd._parse_ipv6_route(test_routes, test_ips) == expected
+        assert _cephadm._parse_ipv6_route(test_routes, test_ips) == expected
 
-    @mock.patch.object(cd, 'call_throws', return_value=('10.4.0.1 dev tun0 proto kernel scope link src 10.4.0.2 metric 50\n', '', ''))
+    @mock.patch.object(_cephadm, 'call_throws', return_value=('10.4.0.1 dev tun0 proto kernel scope link src 10.4.0.2 metric 50\n', '', ''))
     def test_command_list_networks(self, cephadm_fs, capsys):
         with with_cephadm_ctx([]) as ctx:
-            cd.command_list_networks(ctx)
+            _cephadm.command_list_networks(ctx)
             assert json.loads(capsys.readouterr().out) == {
                 '10.4.0.1/32': {'tun0': ['10.4.0.2']}
             }