]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orch: apply: Fix proper error when passed unknown type
authorSebastian Wagner <sebastian.wagner@suse.com>
Sun, 7 Jun 2020 16:24:30 +0000 (18:24 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 15 Jun 2020 10:42:17 +0000 (12:42 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 513f32aa5f4f2dbed57ed3e5aec59f7927fa7136)

src/pybind/mgr/orchestrator/module.py

index 7947cdb408c4ea019fb7280cf6421362c7e06eba..db5c5ffd1bf6e9812ad19987baf77275d1cbe160 100644 (file)
@@ -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)