Revert "mgr/orchestrator: require "group" field for nvmeof specs"

This reverts commit f6d552d.

It was decided by the nvmeof team to stick with defaulting to
an empty string rather than forcing the users onto other
non-empty names when they upgrade

Signed-off-by: Adam King <[email protected]>

Author: adk3798

src/pybind/mgr/orchestrator/module.py

@@ -1866,7 +1866,6 @@ def _apply_oauth2_proxy(self,
     @_cli_write_command('orch apply nvmeof')
     def _apply_nvmeof(self,
                       pool: str,
-                      group: str,
                       placement: Optional[str] = None,
                       unmanaged: bool = False,
                       dry_run: bool = False,
@@ -1878,9 +1877,8 @@ def _apply_nvmeof(self,
             raise OrchestratorValidationError('unrecognized command -i; -h or --help for usage')
 
         spec = NvmeofServiceSpec(
-            service_id=f'{pool}.{group}',
+            service_id=pool,
             pool=pool,
-            group=group,
             placement=PlacementSpec.from_string(placement),
             unmanaged=unmanaged,
             preview_only=dry_run

src/python-common/ceph/deployment/service_spec.py

@@ -1382,7 +1382,7 @@ def __init__(self,
         #: ``name`` name of the nvmeof gateway
         self.name = name
         #: ``group`` name of the nvmeof gateway
-        self.group = group
+        self.group = group or ''
         #: ``enable_auth`` enables user authentication on nvmeof gateway
         self.enable_auth = enable_auth
         #: ``state_update_notify`` enables automatic update from OMAP in nvmeof gateway
@@ -1472,9 +1472,6 @@ def validate(self) -> None:
         if not self.pool:
             raise SpecValidationError('Cannot add NVMEOF: No Pool specified')
 
-        if not self.group:
-            raise SpecValidationError('Cannot add NVMEOF: No group specified')
-
         if self.enable_auth:
             if not all([self.server_key, self.server_cert, self.client_key,
                         self.client_cert, self.root_ca_cert]):