From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Sun, 7 Jun 2020 16:24:30 +0000 (+0200)
Subject: mgr/orch: apply: Fix proper error when passed unknown type
X-Git-Tag: v15.2.5~173^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a27d35ed32c5456b6d4ec6afef61724a4fbf0bd2;p=ceph.git

mgr/orch: apply: Fix proper error when passed unknown type

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

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 7947cdb408c..db5c5ffd1bf 100644
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -1001,7 +1001,9 @@ Usage:
 
         else:
             placmentspec = PlacementSpec.from_string(placement)
-            assert service_type
+            if not service_type:
+                raise OrchestratorValidationError(f'Error: Empty service_type\n{usage}')
+
             specs = [ServiceSpec(service_type, placement=placmentspec, unmanaged=unmanaged)]
  
         completion = self.apply(specs)