Merge pull request ceph#59925 from baum/NvmeofServiceSpec-service_id

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

Author: baum

src/pybind/mgr/orchestrator/module.py

@@ -1560,7 +1560,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),
@@ -1887,7 +1887,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),