pybind/mgr/orchestrator/module.py: NvmeofServiceSpec service_id

- make service_id better alligned with default/empty group
  (ceph@f6d552d)
- fix service_id in nvmeof daemon add

Signed-off-by: Alexander Indenbaum <[email protected]>

Author: Alexander Indenbaum

src/pybind/mgr/orchestrator/module.py

@@ -1548,7 +1548,7 @@ def _nvmeof_add(self,
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = NvmeofServiceSpec(
-            service_id='nvmeof',
+            service_id=f'{pool}.{group}' if group else pool,
             pool=pool,
             group=group,
             placement=PlacementSpec.from_string(placement),
@@ -1875,7 +1875,7 @@ def _apply_nvmeof(self,
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = NvmeofServiceSpec(
-            service_id=f'{pool}.{group}',
+            service_id=f'{pool}.{group}' if group else pool,
             pool=pool,
             group=group,
             placement=PlacementSpec.from_string(placement),