feat(frontend): remove tcp trid parameters

Signed-off-by: Artsiom Koltun <[email protected]>
opiproject · Oct 2, 2023 · 4ae797d · 4ae797d
1 parent c7cd781
commit 4ae797d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 50 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -64,13 +64,11 @@ func main() {
 	var busesStr string
 	flag.StringVar(&busesStr, "buses", "", "QEMU PCI buses IDs separated by `:` to attach Nvme/virtio-blk devices on. e.g. \"pci.opi.0:pci.opi.1\". Valid only with -kvm option")
 
-	var tcpTransportListenAddr string
-	flag.StringVar(&tcpTransportListenAddr, "tcp_trid", "127.0.0.1:4420", "ipv4 address:port (aka traddr:trsvcid) or ipv6 [address]:port tuple (aka [traddr]:trsvcid) to listen on for Nvme/TCP transport")
-	flag.Parse()
-
 	var tlsFiles string
 	flag.StringVar(&tlsFiles, "tls", "", "TLS files in server_cert:server_key:ca_cert format.")
 
+	flag.Parse()
+
 	// Create KV store for persistence
 	options := gomap.DefaultOptions
 	options.Codec = utils.ProtoCodec{}
@@ -84,10 +82,10 @@ func main() {
 	}(store)
 
 	go runGatewayServer(grpcPort, httpPort)
-	runGrpcServer(grpcPort, useKvm, store, spdkAddress, qmpAddress, ctrlrDir, busesStr, tcpTransportListenAddr, tlsFiles)
+	runGrpcServer(grpcPort, useKvm, store, spdkAddress, qmpAddress, ctrlrDir, busesStr, tlsFiles)
 }
 
-func runGrpcServer(grpcPort int, useKvm bool, store gokv.Store, spdkAddress, qmpAddress, ctrlrDir, busesStr, tcpTransportListenAddr, tlsFiles string) {
+func runGrpcServer(grpcPort int, useKvm bool, store gokv.Store, spdkAddress, qmpAddress, ctrlrDir, busesStr, tlsFiles string) {
 	buses := splitBusesBySeparator(busesStr)
 
 	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", grpcPort))
@@ -142,7 +140,7 @@ func runGrpcServer(grpcPort int, useKvm bool, store gokv.Store, spdkAddress, qmp
 	} else {
 		frontendServer := frontend.NewCustomizedServer(jsonRPC,
 			store,
-			frontend.NewNvmeTCPTransport(tcpTransportListenAddr),
+			frontend.NewNvmeTCPTransport(),
 			frontend.NewVhostUserBlkTransport(),
 		)
 		pb.RegisterFrontendNvmeServiceServer(s, frontendServer)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -66,7 +66,7 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-    command: sh -c "/opi-spdk-bridge -grpc_port=50051 -http_port=8082 -spdk_addr=/var/tmp/spdk.sock -tcp_trid=$$(getent hosts spdk | awk '{ print $$1 }'):7777"
+    command: sh -c "/opi-spdk-bridge -grpc_port=50051 -http_port=8082 -spdk_addr=/var/tmp/spdk.sock"
     healthcheck:
       test: grpcurl -plaintext localhost:50051 list || exit 1
 

diff --git a/pkg/frontend/frontend.go b/pkg/frontend/frontend.go
@@ -59,7 +59,7 @@ func NewServer(jsonRPC spdk.JSONRPC, store gokv.Store) *Server {
 			Subsystems:  make(map[string]*pb.NvmeSubsystem),
 			Controllers: make(map[string]*pb.NvmeController),
 			Namespaces:  make(map[string]*pb.NvmeNamespace),
-			transport:   NewNvmeTCPTransport("127.0.0.1:4420"),
+			transport:   NewNvmeTCPTransport(),
 		},
 		Virt: VirtioParameters{
 			BlkCtrls:  make(map[string]*pb.VirtioBlk),

diff --git a/pkg/frontend/transport.go b/pkg/frontend/transport.go
@@ -7,7 +7,6 @@ package frontend
 
 import (
 	"log"
-	"net"
 	"path"
 
 	"github.com/opiproject/gospdk/spdk"
@@ -27,55 +26,21 @@ type VirtioBlkTransport interface {
 	DeleteParams(virtioBlk *pb.VirtioBlk) (any, error)
 }
 
-const (
-	ipv4NvmeTCPProtocol = "ipv4"
-	ipv6NvmeTCPProtocol = "ipv6"
-)
-
-// TODO: consider using https://pkg.go.dev/net#TCPAddr
-type nvmeTCPTransport struct {
-	listenAddr net.IP
-	listenPort string
-	protocol   string
-}
+type nvmeTCPTransport struct{}
 
 // NewNvmeTCPTransport creates a new instance of nvmeTcpTransport
-func NewNvmeTCPTransport(listenAddr string) NvmeTransport {
-	host, port, err := net.SplitHostPort(listenAddr)
-	if err != nil {
-		log.Panicf("Invalid ip:port tuple: %v", listenAddr)
-	}
-
-	parsedAddr := net.ParseIP(host)
-	if parsedAddr == nil {
-		log.Panicf("Invalid ip address: %v", host)
-	}
-
-	var protocol string
-	switch {
-	case parsedAddr.To4() != nil:
-		protocol = ipv4NvmeTCPProtocol
-	case parsedAddr.To16() != nil:
-		protocol = ipv6NvmeTCPProtocol
-	default:
-		log.Panicf("Not supported protocol for: %v", listenAddr)
-	}
-
-	return &nvmeTCPTransport{
-		listenAddr: parsedAddr,
-		listenPort: port,
-		protocol:   protocol,
-	}
+func NewNvmeTCPTransport() NvmeTransport {
+	return &nvmeTCPTransport{}
 }
 
 func (c *nvmeTCPTransport) Params(_ *pb.NvmeController, nqn string) (spdk.NvmfSubsystemAddListenerParams, error) {
 	result := spdk.NvmfSubsystemAddListenerParams{}
 	result.Nqn = nqn
 	result.SecureChannel = false
 	result.ListenAddress.Trtype = "tcp"
-	result.ListenAddress.Traddr = c.listenAddr.String()
-	result.ListenAddress.Trsvcid = c.listenPort
-	result.ListenAddress.Adrfam = c.protocol
+	result.ListenAddress.Traddr = ""
+	result.ListenAddress.Trsvcid = ""
+	result.ListenAddress.Adrfam = ""
 
 	return result, nil
 }