nvmeof: rearrange controllerserver

move setupDefaultListenersValues from controllerserver.go
to the right place - volume.go

Signed-off-by: gadi-didi <gadi.didi@ibm.com>

Author: gadididi

internal/nvmeof/controller/controllerserver.go

@@ -776,10 +776,11 @@ func (cs *Server) createNVMeoFResources(
 	}
 
 	// setup listeners (if provided, otherwise it will be set by gateway based on network mask)
-	err = setupDefaultListenersValues(params["listeners"], nvmeofData)
+	listeners, err := parseListeners(params["listeners"])
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to parse listeners: %w", err)
 	}
+	nvmeofData.SetListenersWithDefaults(listeners)
 
 	// If dhchapMode was explicitly provided and is not "none", and authenticationKMSID is empty,
 	// use a default KMS ID - RBD metadata KMS.
@@ -1321,29 +1322,3 @@ func connectGateway(ctx context.Context, config *nvmeof.GatewayConfig) (*nvmeof.
 
 	return gateway, nil
 }
-
-// setupDefaultListeners validates and sets up default values for NVMe-oF listeners.
-// if listeners are provided, it ensures they are fully populated with
-// default values if needed (port and address).
-func setupDefaultListenersValues(listenersJSON string, info *nvmeof.NVMeoFVolumeData) error {
-	// Parse listeners from JSON
-	listeners, err := parseListeners(listenersJSON)
-	if err != nil {
-		return fmt.Errorf("failed to parse listeners: %w", err)
-	}
-
-	// ensure listeners are fully populated with default values if needed (port and address)
-	// before storing in metadata and creating subsystem/listeners
-	for i := range listeners {
-		if listeners[i].Port == 0 {
-			listeners[i].Port = 4420
-		}
-		// if address is empty, set it to default 0.0.0.0
-		if listeners[i].Address == "" {
-			listeners[i].Address = "0.0.0.0"
-		}
-	}
-	info.ListenerInfo = listeners
-
-	return nil
-}

internal/nvmeof/volume.go

@@ -30,3 +30,18 @@ type NVMeoFSecurityConfig struct {
 	DhchapMode          string
 	AuthenticationKMSID string
 }
+
+// SetListenersWithDefaults sets the listeners with default values applied.
+// If port is 0, it defaults to 4420.
+// If address is empty, it defaults to 0.0.0.0.
+func (v *NVMeoFVolumeData) SetListenersWithDefaults(listeners []ListenerDetails) {
+	for i := range listeners {
+		if listeners[i].Port == 0 {
+			listeners[i].Port = 4420
+		}
+		if listeners[i].Address == "" {
+			listeners[i].Address = "0.0.0.0"
+		}
+	}
+	v.ListenerInfo = listeners
+}