import quincy beta 17.1.0

[ceph.git] / ceph / src / pybind / mgr / cephadm / tests / test_upgrade.py

diff --git a/ceph/src/pybind/mgr/cephadm/tests/test_upgrade.py b/ceph/src/pybind/mgr/cephadm/tests/test_upgrade.py
index df1cd3b563e796d5a0476729491afca22400c52f..32aacf263f39f3b762b5313dbe99b302b7085c5b 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/tests/test_upgrade.py
+++ b/ceph/src/pybind/mgr/cephadm/tests/test_upgrade.py
@@ -6,30 +6,30 @@ import pytest
 from ceph.deployment.service_spec import PlacementSpec, ServiceSpec
 from cephadm import CephadmOrchestrator
 from cephadm.upgrade import CephadmUpgrade
-from cephadm.serve import CephadmServe
 from orchestrator import OrchestratorError, DaemonDescription
-from .fixtures import _run_cephadm, wait, with_host, with_service
+from .fixtures import _run_cephadm, wait, with_host, with_service, \
+    receive_agent_metadata
 
 
 @mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
 def test_upgrade_start(cephadm_module: CephadmOrchestrator):
     with with_host(cephadm_module, 'test'):
         with with_host(cephadm_module, 'test2'):
-            with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(count=2))):
+            with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(count=2)), status_running=True):
                 assert wait(cephadm_module, cephadm_module.upgrade_start(
-                    'image_id', None)) == 'Initiating upgrade to docker.io/image_id'
+                    'image_id', None)) == 'Initiating upgrade to image_id'
 
                 assert wait(cephadm_module, cephadm_module.upgrade_status()
-                            ).target_image == 'docker.io/image_id'
+                            ).target_image == 'image_id'
 
                 assert wait(cephadm_module, cephadm_module.upgrade_pause()
-                            ) == 'Paused upgrade to docker.io/image_id'
+                            ) == 'Paused upgrade to image_id'
 
                 assert wait(cephadm_module, cephadm_module.upgrade_resume()
-                            ) == 'Resumed upgrade to docker.io/image_id'
+                            ) == 'Resumed upgrade to image_id'
 
                 assert wait(cephadm_module, cephadm_module.upgrade_stop()
-                            ) == 'Stopped upgrade to docker.io/image_id'
+                            ) == 'Stopped upgrade to image_id'
 
 
 @mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}'))
@@ -43,7 +43,8 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator):
         with with_host(cephadm_module, 'host2'):
             cephadm_module.set_container_image('global', 'from_image')
             cephadm_module.use_repo_digest = use_repo_digest
-            with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(host_pattern='*', count=2)), CephadmOrchestrator.apply_mgr, ''),\
+            with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(host_pattern='*', count=2)),
+                              CephadmOrchestrator.apply_mgr, '', status_running=True),\
                 mock.patch("cephadm.module.CephadmOrchestrator.lookup_release_name",
                            return_value='foo'),\
                 mock.patch("cephadm.module.CephadmOrchestrator.version",
@@ -56,10 +57,10 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator):
                            }):
                 version_mock.return_value = 'ceph version 18.2.1 (somehash)'
                 assert wait(cephadm_module, cephadm_module.upgrade_start(
-                    'to_image', None)) == 'Initiating upgrade to docker.io/to_image'
+                    'to_image', None)) == 'Initiating upgrade to to_image'
 
                 assert wait(cephadm_module, cephadm_module.upgrade_status()
-                            ).target_image == 'docker.io/to_image'
+                            ).target_image == 'to_image'
 
                 def _versions_mock(cmd):
                     return json.dumps({
@@ -95,7 +96,8 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator):
                         )
                     ])
                 )):
-                    CephadmServe(cephadm_module)._refresh_hosts_and_daemons()
+                    receive_agent_metadata(cephadm_module, 'host1', ['ls'])
+                    receive_agent_metadata(cephadm_module, 'host2', ['ls'])
 
                 with mock.patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm(json.dumps({
                     'image_id': 'image_id',
@@ -112,7 +114,7 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator):
                 if use_repo_digest:
                     assert image == 'to_image@repo_digest'
                 else:
-                    assert image == 'docker.io/to_image'
+                    assert image == 'to_image'
 
 
 def test_upgrade_state_null(cephadm_module: CephadmOrchestrator):